From owner-p4-projects@FreeBSD.ORG Sun May 9 00:18:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 639BB1065670; Sun, 9 May 2010 00:18:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27E9E106566B for ; Sun, 9 May 2010 00:18:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1532F8FC13 for ; Sun, 9 May 2010 00:18: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 o490IH2t085860 for ; Sun, 9 May 2010 00:18:17 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o490IHn1085858 for perforce@freebsd.org; Sun, 9 May 2010 00:18:17 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 00:18:17 GMT Message-Id: <201005090018.o490IHn1085858@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 177984 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, 09 May 2010 00:18:18 -0000 http://p4web.freebsd.org/@@177984?ac=10 Change 177984 by gcooper@gcooper-bayonetta on 2010/05/09 00:17:23 Checkpoint work to convert pkg_create over to archive_write(3). Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#5 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#5 (text+ko) ==== @@ -21,14 +21,20 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.85 2010/04/23 11:07:43 flz Exp $"); +#include +#include +#include #include +#include #include #include #include #include +#include #include #include +#include #include #include "create.h" @@ -73,10 +79,8 @@ } if (Zipper == BZIP2) { suf = "tbz"; - setenv("BZIP2", "--best", 0); } else if (Zipper == GZIP) { suf = "tgz"; - setenv("GZIP", "-9", 0); } else suf = "tar"; @@ -339,7 +343,7 @@ return TRUE; /* Success */ } -#define EXTRACT_ARCHIVE_FLAGS (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \ +#define COMPRESS_ARCHIVE_FLAGS (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \ ARCHIVE_EXTRACT_TIME |ARCHIVE_EXTRACT_ACL | \ ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR) @@ -347,17 +351,57 @@ make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) { -#ifdef NOTYET +#define ADD_FILE(src_file, dest_file) \ + if (error == NULL) { \ + if ((archive_entry_fd = open(src_file, \ + archive_entry_fd)) == -1 || \ + fstat(archive_entry_fd, sb) == -1) { \ + error = strerror(errno); \ + } else if ((archive_entry_map_addr = mmap(NULL, \ + PROT_READ, sb->st_size, MAP_SHARED, \ + archive_entry_fd, 0)) == NULL) { \ + error = strerror(errno); \ + } else { \ + if ((entry = archive_entry_new()) == NULL) \ + error = archive_error_string(archive); \ + else { \ + archive_entry_copy_stat(entry, sb); \ + if (archive_write_header(archive, \ + entry) != ARCHIVE_OK) \ + error = archive_error_string(archive); \ + else if (archive_write_data(archive, \ + archive_entry_map_addr, \ + sb->st_size) != ARCHIVE_OK) \ + error = archive_error_string(archive); \ + (void) munmap(archive_entry_map_addr, \ + sb->st_size); \ + archive_entry_free(entry); \ + } \ + } \ + if (0 <= archive_entry_fd) \ + close(archive_entry_fd); \ + } + +#if NOTYET PackingList p; #endif + struct stat *sb; struct archive *archive = NULL; + struct archive_entry *entry = NULL; char tball[PATH_MAX]; -#ifdef NOTYET +#if NOTYET char *prefix = NULL; #endif + char *starting_point = NULL; + const char *cname = NULL; const char *error = NULL; - int archive_fd = -1, open_flags; + int archive_fd = -1; + int archive_open_flags; + int archive_entry_fd = -1; + int archive_entry_open_flags; + void *archive_entry_map_addr; + Boolean passed = FALSE; if (*pkg == '/') @@ -365,132 +409,135 @@ else snprintf(tball, sizeof(tball), "%s/%s.%s", homedir, pkg, suff); - open_flags = O_WRONLY; + archive_entry_open_flags = O_RDONLY; + + if (Dereference == FALSE) + archive_entry_open_flags |= O_NOFOLLOW; + + archive_open_flags = O_WRONLY; if (Regenerate == FALSE) - open_flags |= O_CREAT; + archive_open_flags |= O_CREAT; + if ((starting_point = getwd(NULL)) == NULL) + warn("%s: failed to determine current directory", __func__); /* * If the package tarball exists already, and we are running in * `no clobber' mode, skip this package. */ - if ((archive_fd = open(tball, open_flags)) == -1) { + else if ((archive_fd = open(tball, archive_open_flags)) == -1) { if (Verbose) warn("Skipping package creation for: '%s'", tball); - } else { + } + else if ((archive = archive_write_new()) == NULL) + error = archive_error_string(archive); + else if (archive_write_set_format_ustar(archive) != ARCHIVE_OK) + error = archive_error_string(archive); + else { - if ((archive = archive_write_new()) == NULL) { - error = archive_error_string(archive); - warnx("%s: unable to create the package '%s': %s", - __func__, tball, error); - } else { + switch(Zipper) { + case BZIP2: + cname = "bzipp"; + if (archive_write_set_compression_bzip2(archive) != + ARCHIVE_OK) + error = archive_error_string(archive); + else if (archive_write_set_compressor_options(archive, + "compression-level=9") != ARCHIVE_OK) + error = archive_error_string(archive); + break; + case GZIP: + cname = "gzipp"; + if (archive_write_set_compression_gzip(archive) != + ARCHIVE_OK) + error = archive_error_string(archive); + else if (archive_write_set_compressor_options(archive, + "compression-level=9") != ARCHIVE_OK) + error = archive_error_string(archive); + break; + default: + cname = "uncompress"; + if (archive_write_set_compression_none(archive) != + ARCHIVE_OK) + error = archive_error_string(archive); + } - if (archive_write_set_format_ustar(archive) != - ARCHIVE_OK) { - error = archive_error_string(archive); - } else if (strncmp(suff, "tbz", 3) == 0) { - if (archive_write_set_compression_bzip2(archive) - == ARCHIVE_OK) - cname = "bzipp"; - else - error = archive_error_string(archive); - } else if (strncmp(suff, "tgz", 3) == 0) { - if (archive_write_set_compression_gzip(archive) - == ARCHIVE_OK) - cname = "gzipp"; - else - error = archive_error_string(archive); - } else { - if (archive_write_set_compression_none(archive) - == ARCHIVE_OK) - cname = "uncompress"; - else - error = archive_error_string(archive); - } + } - if (error != NULL) { + if (error != NULL) + if (archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK) + error = archive_error_string(archive); + if (error != NULL) { - /* XXX (gcooper): fill this stuff in. */ #ifdef NOTYET - if (Dereference == TRUE) ; + /* + * XXX (gcooper): Need to fill bits for the exclude + * stuff + */ + if (ExcludeFrom != NULL) ; +#endif - if (ExcludeFrom != NULL) ; + if (Verbose) + printf("Creating %sed tar ball in '%s'\n", + cname, tball); - if (Verbose) - printf("Creating %sed tar ball in '%s'\n", cname, tball); + ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME); + ADD_FILE(COMMENT_FNAME, COMMENT_FNAME); + ADD_FILE(DESC_FNAME, DESC_FNAME); - //fprintf(totar, "%s\n", CONTENTS_FNAME); - //fprintf(totar, "%s\n", COMMENT_FNAME); - //fprintf(totar, "%s\n", DESC_FNAME); + if (Install) + ADD_FILE(INSTALL_FNAME, INSTALL_FNAME); + if (PostInstall) + ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME); + if (DeInstall) + ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME); + if (PostDeInstall) + ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME); + if (Require) + ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME); + if (Display) + ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME); + if (Mtree) + ADD_FILE(MTREE_FNAME, MTREE_FNAME); - if (Install) ; - //fprintf(totar, "%s\n", INSTALL_FNAME); - if (PostInstall) ; - //fprintf(totar, "%s\n", POST_INSTALL_FNAME); - if (DeInstall) ; - //fprintf(totar, "%s\n", DEINSTALL_FNAME); - if (PostDeInstall) ; - //fprintf(totar, "%s\n", POST_DEINSTALL_FNAME); - if (Require) ; - //fprintf(totar, "%s\n", REQUIRE_FNAME); - if (Display) ; - //fprintf(totar, "%s\n", DISPLAY_FNAME); - if (Mtree) ; - //fprintf(totar, "%s\n", MTREE_FNAME); + passed = TRUE; - passed = TRUE; - - for (p = plist->head; p != NULL; p = p->next) { - - switch(p->type) { - case PLIST_FILE: - /* Add p->name to archive. */ - break; - case PLIST_CWD: - - if (p->name != NULL) { - /* - * Add /<@cwd dir> - * to archive. - */ - if (BaseDir != NULL && - p->name[0] == '/') ; - /* else, - * chdir() . */ - - if (prefix == NULL) - prefix = p->name; - - } - - /* FALLTHROUGH */ - case PLIST_SRC: - /* - * 1. chdir(). - * 2. Add the - * /<@cwd-dir>. - */ - break; - default: - /* - * Catch-all for the rest of - * the cases. - */ - break; - } - +#if NOTYET + /* + * XXX (gcooper): Fix style(9) for for-loop after changes have + * stabilized. + */ + for (p = plist->head; p != NULL; p = p->next) { + switch(p->type) { + case PLIST_FILE: + /* Add p->name to archive. */ + break; + case PLIST_CWD: + if (p->name != NULL) { /* - * if the file operation is invalid, - * set passed to FALSE . + * Add /<@cwd dir> + * to archive. */ + if (BaseDir != NULL && + p->name[0] == '/') ; + /* else, chdir() . */ + if (prefix == NULL) + prefix = p->name; } -#endif - + /* FALLTHROUGH */ + case PLIST_SRC: + /* + * 1. chdir(). + * 2. Add the /<@cwd-dir>. + */ + break; + default: + /* Catch-all for the rest of the cases. */ + break; } - } +#endif } @@ -501,11 +548,14 @@ warnx("%s: unable to create the package '%s': %s", __func__, tball, error); } - if (0 <= archive_fd) + if (0 <= archive_fd) { close(archive_fd); - if (passed == FALSE && unlink(tball) == -1) - warn("%s: failed to remove incomplete package - '%s'", - __func__, tball); + if (passed == FALSE && unlink(tball) == -1) + warn("%s: failed to remove incomplete package - '%s'", + __func__, tball); + } + if (starting_point != NULL) + free(starting_point); } From owner-p4-projects@FreeBSD.ORG Sun May 9 00:25:26 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2BED1065677; Sun, 9 May 2010 00:25:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8EEE31065670 for ; Sun, 9 May 2010 00:25:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 74B398FC19 for ; Sun, 9 May 2010 00:25:25 +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 o490PPln086485 for ; Sun, 9 May 2010 00:25:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o490PP7S086483 for perforce@freebsd.org; Sun, 9 May 2010 00:25:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 00:25:25 GMT Message-Id: <201005090025.o490PP7S086483@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 177985 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, 09 May 2010 00:25:26 -0000 http://p4web.freebsd.org/@@177985?ac=10 Change 177985 by gcooper@gcooper-bayonetta on 2010/05/09 00:24:45 - Convert trailing hard tabs in ADD_FILE to spaces for readability in diffs. - Remove an unused constant. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#6 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#6 (text+ko) ==== @@ -343,43 +343,39 @@ return TRUE; /* Success */ } -#define COMPRESS_ARCHIVE_FLAGS (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \ - ARCHIVE_EXTRACT_TIME |ARCHIVE_EXTRACT_ACL | \ - ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR) - static void make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) { -#define ADD_FILE(src_file, dest_file) \ - if (error == NULL) { \ - if ((archive_entry_fd = open(src_file, \ - archive_entry_fd)) == -1 || \ - fstat(archive_entry_fd, sb) == -1) { \ - error = strerror(errno); \ - } else if ((archive_entry_map_addr = mmap(NULL, \ - PROT_READ, sb->st_size, MAP_SHARED, \ - archive_entry_fd, 0)) == NULL) { \ - error = strerror(errno); \ - } else { \ - if ((entry = archive_entry_new()) == NULL) \ - error = archive_error_string(archive); \ - else { \ - archive_entry_copy_stat(entry, sb); \ - if (archive_write_header(archive, \ - entry) != ARCHIVE_OK) \ - error = archive_error_string(archive); \ - else if (archive_write_data(archive, \ - archive_entry_map_addr, \ - sb->st_size) != ARCHIVE_OK) \ - error = archive_error_string(archive); \ - (void) munmap(archive_entry_map_addr, \ - sb->st_size); \ - archive_entry_free(entry); \ - } \ - } \ - if (0 <= archive_entry_fd) \ - close(archive_entry_fd); \ +#define ADD_FILE(src_file, dest_file) \ + if (error == NULL) { \ + if ((archive_entry_fd = open(src_file, \ + archive_entry_fd)) == -1 || \ + fstat(archive_entry_fd, sb) == -1) { \ + error = strerror(errno); \ + } else if ((archive_entry_map_addr = mmap(NULL, \ + PROT_READ, sb->st_size, MAP_SHARED, \ + archive_entry_fd, 0)) == NULL) { \ + error = strerror(errno); \ + } else { \ + if ((entry = archive_entry_new()) == NULL) \ + error = archive_error_string(archive); \ + else { \ + archive_entry_copy_stat(entry, sb); \ + if (archive_write_header(archive, \ + entry) != ARCHIVE_OK) \ + error = archive_error_string(archive);\ + else if (archive_write_data(archive, \ + archive_entry_map_addr, \ + sb->st_size) != ARCHIVE_OK) \ + error = archive_error_string(archive);\ + (void) munmap(archive_entry_map_addr, \ + sb->st_size); \ + archive_entry_free(entry); \ + } \ + } \ + if (0 <= archive_entry_fd) \ + close(archive_entry_fd); \ } #if NOTYET From owner-p4-projects@FreeBSD.ORG Sun May 9 00:37:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DFF3106566B; Sun, 9 May 2010 00:37:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12BAD1065673 for ; Sun, 9 May 2010 00:37:38 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 00DDD8FC0C for ; Sun, 9 May 2010 00:37: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 o490bbZA087466 for ; Sun, 9 May 2010 00:37:37 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o490bbUn087464 for perforce@freebsd.org; Sun, 9 May 2010 00:37:37 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 00:37:37 GMT Message-Id: <201005090037.o490bbUn087464@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 177987 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, 09 May 2010 00:37:38 -0000 http://p4web.freebsd.org/@@177987?ac=10 Change 177987 by gcooper@gcooper-bayonetta on 2010/05/09 00:36:39 1. Add a comment about missing acl / xattr support. 2. Pass in appropriate flags to open(2) for following paths for all pkg_install control files. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#7 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#7 (text+ko) ==== @@ -347,7 +347,8 @@ make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) { -#define ADD_FILE(src_file, dest_file) \ + /* XXX (gcooper): add acl and xattr support? */ +#define ADD_FILE(src_file, dest_file, archive_entry_open_flags) \ if (error == NULL) { \ if ((archive_entry_fd = open(src_file, \ archive_entry_fd)) == -1 || \ @@ -476,24 +477,34 @@ printf("Creating %sed tar ball in '%s'\n", cname, tball); - ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME); - ADD_FILE(COMMENT_FNAME, COMMENT_FNAME); - ADD_FILE(DESC_FNAME, DESC_FNAME); + ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(COMMENT_FNAME, COMMENT_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(DESC_FNAME, DESC_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Install) - ADD_FILE(INSTALL_FNAME, INSTALL_FNAME); + ADD_FILE(INSTALL_FNAME, INSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (PostInstall) - ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME); + ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (DeInstall) - ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME); + ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (PostDeInstall) - ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME); + ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Require) - ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME); + ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Display) - ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME); + ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); if (Mtree) - ADD_FILE(MTREE_FNAME, MTREE_FNAME); + ADD_FILE(MTREE_FNAME, MTREE_FNAME, + archive_entry_open_flags ^ O_NOFOLLOW); passed = TRUE; From owner-p4-projects@FreeBSD.ORG Sun May 9 07:29:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C915E1065676; Sun, 9 May 2010 07:29:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AFAF1065674 for ; Sun, 9 May 2010 07:29:31 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4FC068FC08 for ; Sun, 9 May 2010 07:29: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 o497TVM7046215 for ; Sun, 9 May 2010 07:29:31 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o497TVeA046213 for perforce@freebsd.org; Sun, 9 May 2010 07:29:31 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 07:29:31 GMT Message-Id: <201005090729.o497TVeA046213@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 177990 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, 09 May 2010 07:29:32 -0000 http://p4web.freebsd.org/@@177990?ac=10 Change 177990 by gcooper@gcooper-bayonetta on 2010/05/09 07:28:42 Resolve the full path to all path related arguments so that we won't need to use copy_file. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#5 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#5 (text+ko) ==== @@ -12,9 +12,11 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.48 2010/04/23 11:07:43 flz Exp $"); +#include #include #include #include +#include #include #include "create.h" @@ -68,6 +70,12 @@ { NULL, 0, NULL, 0 }, }; +#define RESOLVE_PATH(v, path) \ + do { \ + if ((v = malloc(PATH_MAX)) == NULL || realpath(path, v) == NULL)\ + err(EXIT_FAILURE, "couldn't resolve path for %s", path);\ + } while (0) + int main(int argc, char **argv) { @@ -110,7 +118,7 @@ break; case 'p': - Prefix = optarg; + RESOLVE_PATH(Prefix, optarg); break; case 's': @@ -122,7 +130,7 @@ break; case 'f': - Contents = optarg; + RESOLVE_PATH(Contents, optarg); break; case 'C': @@ -130,39 +138,40 @@ break; case 'c': - Comment = optarg; + RESOLVE_PATH(Comment, optarg); break; case 'd': - Desc = optarg; + RESOLVE_PATH(Desc, optarg); break; case 'i': - Install = optarg; + RESOLVE_PATH(Install, optarg); break; case 'I': - PostInstall = optarg; + RESOLVE_PATH(PostInstall, optarg); break; case 'k': - DeInstall = optarg; + RESOLVE_PATH(DeInstall, optarg); break; case 'K': - PostDeInstall = optarg; + RESOLVE_PATH(PostDeInstall, optarg); break; case 'r': - Require = optarg; + RESOLVE_PATH(Require, optarg); break; case 't': - strlcpy(PlayPen, optarg, sizeof(PlayPen)); + if (strlcpy(PlayPen, optarg, sizeof(PlayPen)) > sizeof(PlayPen)) + errx(EXIT_FAILURE, "Playpen template specified invalid"); break; case 'X': - ExcludeFrom = optarg; + RESOLVE_PATH(ExcludeFrom, optarg); break; case 'h': @@ -170,11 +179,11 @@ break; case 'D': - Display = optarg; + RESOLVE_PATH(Display, optarg); break; case 'm': - Mtree = optarg; + RESOLVE_PATH(Mtree, optarg); break; case 'P': From owner-p4-projects@FreeBSD.ORG Sun May 9 07:32:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96EF1065675; Sun, 9 May 2010 07:32:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E0C71065672 for ; Sun, 9 May 2010 07:32:34 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C7748FC15 for ; Sun, 9 May 2010 07:32:34 +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 o497WYdT046448 for ; Sun, 9 May 2010 07:32:34 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o497WYDn046446 for perforce@freebsd.org; Sun, 9 May 2010 07:32:34 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 9 May 2010 07:32:34 GMT Message-Id: <201005090732.o497WYDn046446@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 177991 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, 09 May 2010 07:32:35 -0000 http://p4web.freebsd.org/@@177991?ac=10 Change 177991 by gcooper@gcooper-bayonetta on 2010/05/09 07:32:31 Comment and Desc won't necessarily exist yet. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#6 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#6 (text+ko) ==== @@ -138,11 +138,11 @@ break; case 'c': - RESOLVE_PATH(Comment, optarg); + Comment = optarg; break; case 'd': - RESOLVE_PATH(Desc, optarg); + Desc = optarg; break; case 'i': From owner-p4-projects@FreeBSD.ORG Sun May 9 11:53:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA6D1065675; Sun, 9 May 2010 11:53:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 51DBF1065673 for ; Sun, 9 May 2010 11:53:56 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F9028FC16 for ; Sun, 9 May 2010 11:53: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 o49Bru38081856 for ; Sun, 9 May 2010 11:53:56 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o49Brukn081854 for perforce@freebsd.org; Sun, 9 May 2010 11:53:56 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 9 May 2010 11:53:56 GMT Message-Id: <201005091153.o49Brukn081854@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177995 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, 09 May 2010 11:53:56 -0000 http://p4web.freebsd.org/@@177995?ac=10 Change 177995 by ivoras@betelgeuse on 2010/05/09 11:52:55 Skeleton for future work. Compilable as standalone outside the src tree. Affected files ... .. //depot/projects/soc2010/pkg_patch/src/Makefile#2 edit .. //depot/projects/soc2010/pkg_patch/src/Makefile.inc#2 edit .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#1 add .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#1 add .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.1#1 add Differences ... ==== //depot/projects/soc2010/pkg_patch/src/Makefile#2 (text+ko) ==== @@ -2,7 +2,7 @@ .include -SUBDIR= add create delete info updating version +SUBDIR= add create delete info updating version patch .include ==== //depot/projects/soc2010/pkg_patch/src/Makefile.inc#2 (text+ko) ==== @@ -9,4 +9,4 @@ LDADD+= -lpkg # Inherit BINDIR from one level up. -.include "../Makefile.inc" +#.include "../Makefile.inc" From owner-p4-projects@FreeBSD.ORG Sun May 9 12:41:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7E1E1065678; Sun, 9 May 2010 12:41:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8C1AD1065672 for ; Sun, 9 May 2010 12:41:44 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7957B8FC13 for ; Sun, 9 May 2010 12:41: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 o49CfiAE086325 for ; Sun, 9 May 2010 12:41:44 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o49CfihP086323 for perforce@freebsd.org; Sun, 9 May 2010 12:41:44 GMT (envelope-from lz@FreeBSD.org) Date: Sun, 9 May 2010 12:41:44 GMT Message-Id: <201005091241.o49CfihP086323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177996 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, 09 May 2010 12:41:45 -0000 http://p4web.freebsd.org/@@177996?ac=10 Change 177996 by lz@gnehzuil-freebsd on 2010/05/09 12:40:52 Now it will allocate a new block from reservation window when cylinder group has some free blocks. When a cylinder group is full, Finding another cylinder group's algorithm will be implemented. There are some bugs which need to test and debug. * Add some related functions * Find a block in reservation when cylinder group has some blocks * When reservation window is empty or bpref is not in reservation window, it will try to find a new space Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#5 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#5 (text+ko) ==== @@ -61,12 +61,13 @@ static daddr_t ext2_nodealloccg(struct inode *, int, daddr_t, int); static daddr_t ext2_mapsearch(struct m_ext2fs *, char *, daddr_t); -static void ext2_rsv_win_remove(struct m_ext2fs *, struct ext2_rsv_win *); -static int ext2_in_rsv(struct ext2_rsv_win *, int32_t); -static u_long ext2_try_alloc_rsv(struct ext2_rsv_win *rwp, struct inode *, int, int32_t, int, - daddr_t (*allocator)(struct inode *, int, daddr_t, int)); -static daddr_t ext2_alloccg_rsv(struct inode *, int, daddr_t, int); -static int ext2_alloc_new_rsv(struct ext2_rsv_win *, struct m_ext2fs *, int, int32_t); +static void ext2_rsv_win_remove(struct m_ext2fs *, struct ext2_rsv_win *); +static int ext2_in_rsv(struct ext2_rsv_win *, int32_t); +static daddr_t ext2_alloccg_rsv(struct inode *, int, daddr_t, int); +static int ext2_alloc_new_rsv(struct inode *, struct m_ext2fs *, int, int32_t, int); +static int ext2_search_rsv_win(struct inode *, struct m_ext2fs *, int, int32_t, int); +static u_long ext2_bmap_search_free_block(struct m_ext2fs *, char *, daddr_t); +static void ext2_rsv_win_add(struct m_ext2fs *, struct ext2_rsv_win *); RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp); @@ -131,6 +132,14 @@ } /* + * Add a ext2_rsv_win struct to RB tree. + */ +static void ext2_rsv_win_add(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp) +{ + RB_INSERT(ext2_rsv_win_tree, &sbp->e2fs_tree, rwp); +} + +/* * Remove a ext2_rsv_win structure from RB tree. */ static void @@ -148,8 +157,7 @@ static int ext2_in_rsv(struct ext2_rsv_win *rwp, int32_t bpref) { - if (bpref < rwp->rw_start || - bpref > rwp->rw_end) + if (bpref < rwp->rw_start || bpref > rwp->rw_end) return 0; return 1; @@ -214,23 +222,172 @@ } /* - * Allocate a block in reservation window. + * Search a free block from bpref. + */ +static u_long ext2_bmap_search_free_block(struct m_ext2fs *sbp, char *bbp, daddr_t bpref) +{ + daddr_t bno; + int start, len, loc, i, map; + + /* + * find the fragment by searching through the free block + * map for an appropriate bit pattern + */ + if (bpref) + start = dtogd(sbp, bpref) / NBBY; + else + start = 0; + len = howmany(sbp->e2fs->e2fs_fpg, NBBY) - start; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) { + len = start + 1; + start = 0; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) { + printf("start = %d, len = %d, fs = %s\n", + start, len, sbp->e2fs_fsmnt); + panic("ext2fs_alloccg: map corrupted"); + /* NOTREACHED */ + } + } + i = start + len - loc; + map = bbp[i]; + bno = i * NBBY; + for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { + if ((map & i) == 0) + return 1; + } + return 0; +} + +/* + * Find a reservation window which includes bpref. */ -static u_long -ext2_try_alloc_rsv(struct ext2_rsv_win *rwp, struct inode *ip, int cg, int32_t bpref, int size, - daddr_t (*allocator)(struct inode *, int, daddr_t, int)) +static int +ext2_search_rsv_win(struct inode *ip, struct m_ext2fs *sbp, int cg, int32_t bpref, int size) { - mtx_assert(EXT2_MTX(ip->i_ump), MA_OWNED); - return (*allocator)(ip, cg, bpref, size); + struct buf *bp; + struct ext2mount *ump; + struct ext2_rsv_win *rwp; + int error; + char *bbp; + + ump = ip->i_ump; + if (sbp->e2fs_gd[cg].ext2bgd_nbfree == 0) + return (0); + EXT2_UNLOCK(ump); + error = bread(ip->i_devvp, fsbtodb(sbp, + sbp->e2fs_gd[cg].ext2bgd_b_bitmap), + (int)sbp->e2fs_bsize, NOCRED, &bp); + if (error) { + brelse(bp); + EXT2_LOCK(ump); + return (0); + } + + bbp = (char *)bp->b_data; + + mtx_lock_spin(&sbp->e2fs_rsv_win_lock); + + /* If RB tree is empty, then it just need to search a free block and allocate it. + * else we need to traverse tree to find a space. + */ + if (RB_EMPTY(&sbp->e2fs_tree)) { + if (!ext2_bmap_search_free_block(sbp, bbp, bpref)) + goto failed; + + rwp = &ip->i_rsv_winp->rwi_entry; + rwp->rw_start = bpref; + rwp->rw_end = bpref + rwp->rw_goal_size - 1; + ext2_rsv_win_add(sbp, rwp); + + goto success; + } else { + int32_t curr; + struct ext2_rsv_win *search; + struct ext2_rsv_win *prev; + + search = RB_ROOT(&sbp->e2fs_tree); + do { + prev = search; + if (bpref < search->rw_start) + search = RB_LEFT(search, rw_link); + else if (bpref > search->rw_end) + search = RB_RIGHT(search, rw_link); + else + break; + } while (search); + + /* get bpref's previous reservation window */ + if (search == NULL) + search = prev; + + curr = bpref; + while (1) { + if (curr <= search->rw_end) + curr = search->rw_end + 1; + + if (curr > sbp->e2fs->e2fs_first_dblock + + cg * EXT2_BLOCKS_PER_GROUP(sbp)) + goto failed; + + search = RB_NEXT(ext2_rsv_win_tree, &sbp->e2fs_tree, search); + + /* reach the last reservation window */ + if (search == NULL) + break; + + /* found a space */ + if (curr + size < search->rw_start) + break; + } + + if (!ext2_bmap_search_free_block(sbp, bbp, bpref)) + goto failed; + + rwp = &ip->i_rsv_winp->rwi_entry; + rwp->rw_start = bpref; + rwp->rw_end = bpref + rwp->rw_goal_size - 1; + ext2_rsv_win_add(sbp, rwp); + + goto success; + } + +success: + mtx_unlock_spin(&sbp->e2fs_rsv_win_lock); + EXT2_LOCK(ump); + return 1; + +failed: + mtx_unlock_spin(&sbp->e2fs_rsv_win_lock); + EXT2_LOCK(ump); + return 0; } /* * Allocate a new reservation window. */ static int -ext2_alloc_new_rsv(struct ext2_rsv_win *rwp, struct m_ext2fs *sbp, int cg, int32_t bpref) +ext2_alloc_new_rsv(struct inode *ip, struct m_ext2fs *sbp, int cg, int32_t bpref, int size) { - return -1; + struct ext2_rsv_win *rwp; + + rwp = &ip->i_rsv_winp->rwi_entry; + + /* delete old reservation window */ + if (rwp->rw_end != EXT2_RWI_NOT_ALLOCATED) { + mtx_lock_spin(&sbp->e2fs_rsv_win_lock); + ext2_rsv_win_remove(sbp, &ip->i_rsv_winp->rwi_entry); + mtx_unlock_spin(&sbp->e2fs_rsv_win_lock); + } + + /* try to allocate a new reservation window in cg's group */ + if (ext2_search_rsv_win(ip, sbp, cg, bpref, size)) + return 1; + + /* XXX: force to allocate a new reservation window in next group */ + + return 0; } /* @@ -244,7 +401,7 @@ struct ext2mount *ump; struct ext2_rsv_win_info *rwip; int32_t bno; - int cg, ret; + int cg; *bnp = 0; fs = ip->i_e2fs; @@ -269,27 +426,26 @@ * Otherwise, try to allocate a new reservation window. */ if (rwip->rwi_entry.rw_end == EXT2_RWI_NOT_ALLOCATED || - !ext2_in_rsv(&rwip->rwi_entry, bpref)) { - ret = ext2_alloc_new_rsv(&rwip->rwi_entry, fs, cg, bpref); - } else { - bno = ext2_try_alloc_rsv(&rwip->rwi_entry, - ip, cg, bpref, size, ext2_alloccg_rsv); - } + !ext2_in_rsv(&rwip->rwi_entry, bpref)) + if (!ext2_alloc_new_rsv(ip, fs, cg, bpref, size)) + goto nospace; + + bno = ext2_alloccg_rsv(ip, cg, bpref, size); - bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, - ext2_alloccg); if (bno > 0) { ip->i_blocks += btodb(fs->e2fs_bsize); ip->i_flag |= IN_CHANGE | IN_UPDATE; *bnp = bno; return (0); } + nospace: EXT2_UNLOCK(ump); ext2_fserr(fs, cred->cr_uid, "file system full"); uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt); return (ENOSPC); } + /* * Allocate a block in the file system. * From owner-p4-projects@FreeBSD.ORG Mon May 10 02:43:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C5031065674; Mon, 10 May 2010 02:43:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C542F106564A for ; Mon, 10 May 2010 02:43:48 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B3AC38FC12 for ; Mon, 10 May 2010 02:43:48 +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 o4A2hmM8008687 for ; Mon, 10 May 2010 02:43:48 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A2hmYb008685 for perforce@freebsd.org; Mon, 10 May 2010 02:43:48 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 02:43:48 GMT Message-Id: <201005100243.o4A2hmYb008685@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 178020 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, 10 May 2010 02:43:49 -0000 http://p4web.freebsd.org/@@178020?ac=10 Change 178020 by gcooper@gcooper-bayonetta on 2010/05/10 02:43:39 Add sanity checks for -s and -S to avoid ENAMETOOLONG errors later on. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#7 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#7 (text+ko) ==== @@ -14,8 +14,10 @@ #include #include +#include #include #include +#include #include #include @@ -122,10 +124,16 @@ break; case 's': + if (strlen(SrcDir) > PATH_MAX) + errx(EXIT_FAILURE, "-s argument invalid: %s", + strerror(ENAMETOOLONG)); SrcDir = optarg; break; case 'S': + if (strlen(BaseDir) > PATH_MAX) + errx(EXIT_FAILURE, "-s argument invalid: %s", + strerror(ENAMETOOLONG)); BaseDir = optarg; break; From owner-p4-projects@FreeBSD.ORG Mon May 10 03:10:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9921A10656AE; Mon, 10 May 2010 03:10:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 58CCC1065698 for ; Mon, 10 May 2010 03:10:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 45DE38FC17 for ; Mon, 10 May 2010 03:10:15 +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 o4A3AFuV011780 for ; Mon, 10 May 2010 03:10:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A3AFGd011778 for perforce@freebsd.org; Mon, 10 May 2010 03:10:15 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 10 May 2010 03:10:15 GMT Message-Id: <201005100310.o4A3AFGd011778@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 178021 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, 10 May 2010 03:10:15 -0000 http://p4web.freebsd.org/@@178021?ac=10 Change 178021 by rene@rene_eee on 2010/05/10 03:09:53 IFC (at BSDCan 2010) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#45 integrate .. //depot/projects/docproj_nl/share/pgpkeys/decke.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/dougb.key#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#37 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#34 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#17 integrate .. //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/projects/projects.sgml#3 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -131,7 +131,7 @@ key issue in the decisions. - Because of some unfortunate design limitations with the RCS file + Because of some unfortunate design limitations with the RCS file format and the use of vendor branches, minor, trivial and/or cosmetic changes are strongly discouraged on files that are still tracking the vendor branch. Spelling @@ -167,7 +167,7 @@ The important thing here is that the src/contrib/file directory is created according to the rules: it is supposed to contain the sources as distributed (on a - proper vendor-branch and without RCS keyword expansion) with as few + proper vendor-branch and without RCS keyword expansion) with as few FreeBSD-specific changes as possible. If there are any doubts on how to go about it, it is imperative that you ask first and not blunder ahead and hope it works out. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#36 (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.505 2010/04/21 07:19:51 randi Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.506 2010/05/09 23:19:56 dougb Exp $ --> aaron@FreeBSD.org"> @@ -300,7 +300,7 @@ dmlb@FreeBSD.org"> -DougB@FreeBSD.org"> +dougb@FreeBSD.org"> dryice@FreeBSD.org"> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#6 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -13,7 +13,7 @@ ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#37 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -406,6 +406,11 @@ &pgpkey.petef; + + &a.decke; + &pgpkey.decke; + + &a.billf; &pgpkey.billf; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#34 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -76,6 +76,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#17 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.108 2010/04/11 18:23:02 jkois Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.109 2010/05/06 14:12:54 ru Exp $ @@ -2102,10 +2102,6 @@ - cvsup4.ua.FreeBSD.org - - - cvsup5.ua.FreeBSD.org ==== //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2009 +

Copyright 1994-2010 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2009 +

Copyright 1992-2010 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_nl/www/en/projects/projects.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -36,10 +36,7 @@
  • Device drivers
  • Architecture
  • Misc
    • -
  • Google Summer of Code 2008
    • -
  • Google Summer of Code 2007
    • -
  • Google Summer of Code 2006
    • -
  • Google Summer of Code 2005
    • +
  • Google Summer of Code
    • From owner-p4-projects@FreeBSD.ORG Mon May 10 04:01:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1EE81065673; Mon, 10 May 2010 04:01:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 970F9106566C for ; Mon, 10 May 2010 04:01:06 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 830128FC14 for ; Mon, 10 May 2010 04:01:06 +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 o4A416Li015775 for ; Mon, 10 May 2010 04:01:06 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A416bY015772 for perforce@freebsd.org; Mon, 10 May 2010 04:01:06 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 04:01:06 GMT Message-Id: <201005100401.o4A416bY015772@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 178022 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, 10 May 2010 04:01:07 -0000 http://p4web.freebsd.org/@@178022?ac=10 Change 178022 by gcooper@gcooper-bayonetta on 2010/05/10 04:00:45 1. Fix indentation for RESOLVE_PATH. 2. Tighten down -s use to reject relative paths from -p (that will only lead to wackiness and confusing use). 3. Fix BaseDir checks, and tack on `/' if needed. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#8 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#8 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/main.c#8 (text+ko) ==== @@ -72,10 +72,12 @@ { NULL, 0, NULL, 0 }, }; -#define RESOLVE_PATH(v, path) \ - do { \ - if ((v = malloc(PATH_MAX)) == NULL || realpath(path, v) == NULL)\ - err(EXIT_FAILURE, "couldn't resolve path for %s", path);\ +#define RESOLVE_PATH(v, path) \ + do { \ + if ((v = malloc(PATH_MAX)) == NULL || \ + realpath(path, v) == NULL) \ + err(EXIT_FAILURE, "couldn't resolve path for %s",\ + path); \ } while (0) int @@ -83,6 +85,7 @@ { int ch; char **pkgs, **start, *tmp; + size_t basedir_len; pkg_wrap(PKG_INSTALL_VERSION, argv); @@ -124,17 +127,32 @@ break; case 's': - if (strlen(SrcDir) > PATH_MAX) - errx(EXIT_FAILURE, "-s argument invalid: %s", - strerror(ENAMETOOLONG)); - SrcDir = optarg; + RESOLVE_PATH(SrcDir, optarg); break; case 'S': - if (strlen(BaseDir) > PATH_MAX) + + /* + * Copy down BaseDir so we can realloc(3) the memory later if need + * be. + */ + if ((BaseDir = strdup(optarg)) == NULL) + err(EXIT_FAILURE, "couldn't copy -s argument"); + + basedir_len = strlen(BaseDir); + + if (basedir_len > PATH_MAX) errx(EXIT_FAILURE, "-s argument invalid: %s", strerror(ENAMETOOLONG)); - BaseDir = optarg; + /* No trailing '/' -- add one on. */ + else if (*(BaseDir+basedir_len-1) != '/') { + basedir_len++; + if ((BaseDir = realloc(BaseDir, basedir_len)) == NULL) + err(EXIT_FAILURE, "couldn't copy -s argument"); + if (strlcat(BaseDir, "/", PATH_MAX) > PATH_MAX) + errx(EXIT_FAILURE, "-s argument invalid: %s", + strerror(ENAMETOOLONG)); + } break; case 'f': ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#8 (text+ko) ==== @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,10 @@ if (Verbose && !PlistOnly) printf("Creating package %s\n", pkg); - /* chop suffix off if already specified, remembering if we want to compress */ + /* + * chop suffix off if already specified, remembering if we want to + * compress. + */ len = strlen(pkg); if (len > 4) { if (!strcmp(&pkg[len - 4], ".tbz")) { @@ -153,10 +157,8 @@ if (ndeps != 0) { /* Create easy to use NULL-terminated list */ deps = alloca(sizeof(*deps) * ndeps + 1); - if (deps == NULL) { + if (deps == NULL) errx(2, "%s: alloca() failed", __func__); - /* Not reached */ - } for (i = 0; Pkgdeps;) { cp = strsep(&Pkgdeps, " \t\n"); if (*cp) { @@ -211,12 +213,9 @@ read_plist(&plist, pkg_in); /* Prefix should add an @cwd to the packing list */ - if (Prefix) { - char resolved_prefix[PATH_MAX]; - if (realpath(Prefix, resolved_prefix) == NULL) - err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", Prefix); - add_plist_top(&plist, PLIST_CWD, resolved_prefix); - } + if (Prefix) + add_plist_top(&plist, PLIST_CWD, Prefix); + /* Add the origin if asked, at the top */ if (Origin) @@ -261,9 +260,9 @@ /* mark_plist(&plist); */ /* Now put the release specific items in */ - if (!Prefix) { + if (!Prefix) add_plist(&plist, PLIST_CWD, "."); - } + write_file(COMMENT_FNAME, Comment); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, COMMENT_FNAME); @@ -274,44 +273,37 @@ add_cksum(&plist, plist.tail, DESC_FNAME); if (Install) { - copy_file(home, Install, INSTALL_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, INSTALL_FNAME); add_cksum(&plist, plist.tail, INSTALL_FNAME); } if (PostInstall) { - copy_file(home, PostInstall, POST_INSTALL_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME); add_cksum(&plist, plist.tail, POST_INSTALL_FNAME); } if (DeInstall) { - copy_file(home, DeInstall, DEINSTALL_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME); add_cksum(&plist, plist.tail, DEINSTALL_FNAME); } if (PostDeInstall) { - copy_file(home, PostDeInstall, POST_DEINSTALL_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME); add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME); } if (Require) { - copy_file(home, Require, REQUIRE_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, REQUIRE_FNAME); add_cksum(&plist, plist.tail, REQUIRE_FNAME); } if (Display) { - copy_file(home, Display, DISPLAY_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, DISPLAY_FNAME); add_cksum(&plist, plist.tail, DISPLAY_FNAME); add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME); } if (Mtree) { - copy_file(home, Mtree, MTREE_FNAME); add_plist(&plist, PLIST_IGNORE, NULL); add_plist(&plist, PLIST_FILE, MTREE_FNAME); add_cksum(&plist, plist.tail, MTREE_FNAME); @@ -322,14 +314,13 @@ fp = fopen(CONTENTS_FNAME, "w"); if (!fp) { cleanup(0); - errx(2, "%s: can't open file %s for writing", - __func__, CONTENTS_FNAME); + errx(2, "%s: can't open file %s for writing", __func__, + CONTENTS_FNAME); } write_plist(&plist, fp); if (fclose(fp)) { cleanup(0); - errx(2, "%s: error while closing %s", - __func__, CONTENTS_FNAME); + errx(2, "%s: error while closing %s", __func__, CONTENTS_FNAME); } /* And stick it into a tar ball */ @@ -348,10 +339,10 @@ { /* XXX (gcooper): add acl and xattr support? */ -#define ADD_FILE(src_file, dest_file, archive_entry_open_flags) \ +#define ADD_FILE(srcfile, destfile, archive_entry_open_flags) \ if (error == NULL) { \ - if ((archive_entry_fd = open(src_file, \ - archive_entry_fd)) == -1 || \ + if ((archive_entry_fd = open(srcfile, \ + archive_entry_open_flags)) == -1 || \ fstat(archive_entry_fd, sb) == -1) { \ error = strerror(errno); \ } else if ((archive_entry_map_addr = mmap(NULL, \ @@ -363,6 +354,7 @@ error = archive_error_string(archive); \ else { \ archive_entry_copy_stat(entry, sb); \ + archive_entry_copy_pathname(entry, destfile); \ if (archive_write_header(archive, \ entry) != ARCHIVE_OK) \ error = archive_error_string(archive);\ @@ -379,17 +371,16 @@ close(archive_entry_fd); \ } -#if NOTYET PackingList p; -#endif struct stat *sb; struct archive *archive = NULL; struct archive_entry *entry = NULL; + char *destbase = NULL; + char *destfile = NULL; + char *prefix = NULL; + char *srcbase = NULL; + char *srcfile = NULL; char tball[PATH_MAX]; -#if NOTYET - char *prefix = NULL; -#endif - char *starting_point = NULL; const char *cname = NULL; const char *error = NULL; @@ -397,16 +388,16 @@ int archive_open_flags; int archive_entry_fd = -1; int archive_entry_open_flags; + int archive_metadata_open_flags; + int destbase_len, srcbase_len; void *archive_entry_map_addr; - Boolean passed = FALSE; - if (*pkg == '/') snprintf(tball, sizeof(tball), "%s.%s", pkg, suff); else snprintf(tball, sizeof(tball), "%s/%s.%s", homedir, pkg, suff); - archive_entry_open_flags = O_RDONLY; + archive_entry_open_flags = archive_metadata_open_flags = O_RDONLY; if (Dereference == FALSE) archive_entry_open_flags |= O_NOFOLLOW; @@ -416,8 +407,12 @@ if (Regenerate == FALSE) archive_open_flags |= O_CREAT; - if ((starting_point = getwd(NULL)) == NULL) - warn("%s: failed to determine current directory", __func__); + if ((destfile = calloc(PATH_MAX, sizeof(char))) == NULL || + (destbase = calloc(PATH_MAX, sizeof(char))) == NULL || + (prefix = calloc(PATH_MAX, sizeof(char))) == NULL || + (srcbase = calloc(PATH_MAX, sizeof(char))) == NULL || + (srcfile = calloc(PATH_MAX, sizeof(char))) == NULL) + error = strerror(errno); /* * If the package tarball exists already, and we are running in * `no clobber' mode, skip this package. @@ -460,9 +455,9 @@ } - if (error != NULL) - if (archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK) - error = archive_error_string(archive); + if (error != NULL && + archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK) + error = archive_error_string(archive); if (error != NULL) { #ifdef NOTYET @@ -478,91 +473,194 @@ cname, tball); ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + archive_metadata_open_flags); ADD_FILE(COMMENT_FNAME, COMMENT_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + archive_metadata_open_flags); ADD_FILE(DESC_FNAME, DESC_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + archive_metadata_open_flags); if (Install) - ADD_FILE(INSTALL_FNAME, INSTALL_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(Install, INSTALL_FNAME, + archive_metadata_open_flags); if (PostInstall) - ADD_FILE(POST_INSTALL_FNAME, POST_INSTALL_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(PostInstall, POST_INSTALL_FNAME, + archive_metadata_open_flags); if (DeInstall) - ADD_FILE(DEINSTALL_FNAME, DEINSTALL_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(DeInstall, DEINSTALL_FNAME, + archive_metadata_open_flags); if (PostDeInstall) - ADD_FILE(POST_DEINSTALL_FNAME, POST_DEINSTALL_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(PostDeInstall, POST_DEINSTALL_FNAME, + archive_metadata_open_flags); if (Require) - ADD_FILE(REQUIRE_FNAME, REQUIRE_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(Require, REQUIRE_FNAME, + archive_metadata_open_flags); if (Display) - ADD_FILE(DISPLAY_FNAME, DISPLAY_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(Display, DISPLAY_FNAME, + archive_metadata_open_flags); if (Mtree) - ADD_FILE(MTREE_FNAME, MTREE_FNAME, - archive_entry_open_flags ^ O_NOFOLLOW); + ADD_FILE(Mtree, MTREE_FNAME, + archive_metadata_open_flags); + + } + + for (p = plist->head; error == NULL && p != NULL; p = p->next) + switch(p->type) { + case PLIST_FILE: + + /* Add a file to the archive. */ + + /* XXX: plist bug -- empty line */ + assert (p->name != NULL); + + destfile[0] = srcfile[0] = '\0'; + + if (destbase != NULL) + if (strlcat(destfile, destbase, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + if (error != NULL) + if (strlcat(destfile, p->name, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + if (srcbase != NULL) + if (strlcat(srcfile, srcbase, + PATH_MAX) > PATH_MAX) + error = strerror(ENAMETOOLONG); + + if (error != NULL) + if (strlcat(srcfile, p->name, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); - passed = TRUE; + ADD_FILE(srcfile, destfile, archive_entry_open_flags); -#if NOTYET - /* - * XXX (gcooper): Fix style(9) for for-loop after changes have - * stabilized. - */ - for (p = plist->head; p != NULL; p = p->next) { - switch(p->type) { - case PLIST_FILE: - /* Add p->name to archive. */ - break; - case PLIST_CWD: - if (p->name != NULL) { - /* - * Add /<@cwd dir> - * to archive. - */ - if (BaseDir != NULL && - p->name[0] == '/') ; - /* else, chdir() . */ - if (prefix == NULL) - prefix = p->name; + break; - } + case PLIST_CWD: - /* FALLTHROUGH */ - case PLIST_SRC: + if (p->name == NULL) { /* - * 1. chdir(). - * 2. Add the /<@cwd-dir>. + * Broken plist; prefix must be defined before + * calling `@cwd' with variable following + * whitespace. */ - break; - default: - /* Catch-all for the rest of the cases. */ - break; + assert(prefix != NULL); + + /* Reset destbase */ + if (strlcpy(destbase, prefix, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + /* Reset srcbase */ + if (strlcpy(srcbase, BaseDir, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + else if (strlcpy(srcbase, prefix, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + } else { + + /* Tack BaseDir on the front if defined. */ + if (BaseDir != NULL) { + if (strlcpy(srcbase, BaseDir, + PATH_MAX) > PATH_MAX) + error = strerror(ENAMETOOLONG); + } else + srcbase[0] = '\0'; + + if (strlcat(destbase, p->name, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + else if (strlcat(srcbase, p->name, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + /* First @cwd statement. */ + if (prefix == NULL) + prefix = p->name; + + } + + /* + * Tack on '/' if necessary. It's easier to do it + * once here instead of n times above when adding the + * data to file prefixes. + */ + if (error == NULL) { + +#define ADD_TRAILING_SLASH(v, v_len) \ + do { \ + v_len = strlen(v); \ + if (v[v_len-1] != '/') { \ + if (v_len >= PATH_MAX) \ + error = strerror(ENAMETOOLONG); \ + else { \ + v[v_len] = '/'; \ + v[v_len+1] = '\0'; \ + } \ + } \ + } while (0) + + ADD_TRAILING_SLASH(destbase, destbase_len); + ADD_TRAILING_SLASH(srcbase, srcbase_len); + } + + break; + + case PLIST_SRC: + + /* + * plist bug, i.e. `@srcdir' (or any trailing + * whitespace variants of that. + * + * XXX (gcooper): the check should be moved to + * libpkg/plist.c . + */ + assert(p->name != NULL); + + /* + * Set the appropriate prefix for the next file to + * install (only for @srcdir). + * + * Reset to '' + */ + if (strlcpy(srcbase, p->name, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + break; + + default: + /* Catch-all for the rest of the cases. */ + break; } -#endif - - } if (archive != NULL) archive_write_finish(archive); - if (error != NULL) { - passed = FALSE; + if (error != NULL) warnx("%s: unable to create the package '%s': %s", __func__, tball, error); - } if (0 <= archive_fd) { close(archive_fd); - if (passed == FALSE && unlink(tball) == -1) + if (error != NULL && unlink(tball) == -1) warn("%s: failed to remove incomplete package - '%s'", __func__, tball); } - if (starting_point != NULL) - free(starting_point); + if (destbase != NULL) + free(destbase); + if (destfile != NULL) + free(destfile); + if (srcbase != NULL) + free(srcbase); + if (srcfile != NULL) + free(srcfile); + if (destfile != NULL) + free(destfile); } From owner-p4-projects@FreeBSD.ORG Mon May 10 04:05:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F951065670; Mon, 10 May 2010 04:05:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C9A1C1065675 for ; Mon, 10 May 2010 04:05:10 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B70668FC08 for ; Mon, 10 May 2010 04:05:10 +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 o4A45ATr017027 for ; Mon, 10 May 2010 04:05:10 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A45AYE017025 for perforce@freebsd.org; Mon, 10 May 2010 04:05:10 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 04:05:10 GMT Message-Id: <201005100405.o4A45AYE017025@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 178023 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, 10 May 2010 04:05:11 -0000 http://p4web.freebsd.org/@@178023?ac=10 Change 178023 by gcooper@gcooper-bayonetta on 2010/05/10 04:04:21 Previous commit included WiP code with pkg_perform to get the archive bits in the proper place. Well, that cat's out of the bag... Oh yeah, and provide actionable data if and when fopen or fclose fails for +CONTENTS. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#9 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#9 (text+ko) ==== @@ -314,13 +314,12 @@ fp = fopen(CONTENTS_FNAME, "w"); if (!fp) { cleanup(0); - errx(2, "%s: can't open file %s for writing", __func__, - CONTENTS_FNAME); + err(2, "%s: can't open file %s for writing", __func__, CONTENTS_FNAME); } write_plist(&plist, fp); if (fclose(fp)) { cleanup(0); - errx(2, "%s: error while closing %s", __func__, CONTENTS_FNAME); + err(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME); } /* And stick it into a tar ball */ From owner-p4-projects@FreeBSD.ORG Mon May 10 04:27:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A5791065670; Mon, 10 May 2010 04:27:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4EAFD106564A for ; Mon, 10 May 2010 04:27:33 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3AEBE8FC23 for ; Mon, 10 May 2010 04:27: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 o4A4RX3V018820 for ; Mon, 10 May 2010 04:27:33 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A4RX3J018818 for perforce@freebsd.org; Mon, 10 May 2010 04:27:33 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 10 May 2010 04:27:33 GMT Message-Id: <201005100427.o4A4RX3J018818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178024 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, 10 May 2010 04:27:33 -0000 http://p4web.freebsd.org/@@178024?ac=10 Change 178024 by lz@gnehzuil-freebsd on 2010/05/10 04:26:50 Improved the code style. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#6 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#4 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#6 (text+ko) ==== @@ -61,13 +61,14 @@ static daddr_t ext2_nodealloccg(struct inode *, int, daddr_t, int); static daddr_t ext2_mapsearch(struct m_ext2fs *, char *, daddr_t); -static void ext2_rsv_win_remove(struct m_ext2fs *, struct ext2_rsv_win *); +/* For reservation window */ +static void ext2_add_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); +static int ext2_alloc_new_rsv(struct inode *, struct m_ext2fs *, int, int32_t, int); +static daddr_t ext2_alloccg_rsv(struct inode *, int, daddr_t, int); +static u_long ext2_mapsearch_rsv(struct m_ext2fs *, char *, daddr_t); static int ext2_in_rsv(struct ext2_rsv_win *, int32_t); -static daddr_t ext2_alloccg_rsv(struct inode *, int, daddr_t, int); -static int ext2_alloc_new_rsv(struct inode *, struct m_ext2fs *, int, int32_t, int); +static void ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *); static int ext2_search_rsv_win(struct inode *, struct m_ext2fs *, int, int32_t, int); -static u_long ext2_bmap_search_free_block(struct m_ext2fs *, char *, daddr_t); -static void ext2_rsv_win_add(struct m_ext2fs *, struct ext2_rsv_win *); RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp); @@ -127,14 +128,14 @@ mtx_lock_spin(&ip->i_e2fs->e2fs_rsv_win_lock); if (rwp->rw_end != EXT2_RWI_NOT_ALLOCATED) - ext2_rsv_win_remove(ip->i_e2fs, rwp); + ext2_remove_rsv_win(ip->i_e2fs, rwp); mtx_unlock_spin(&ip->i_e2fs->e2fs_rsv_win_lock); } /* * Add a ext2_rsv_win struct to RB tree. */ -static void ext2_rsv_win_add(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp) +static void ext2_add_rsv_win(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp) { RB_INSERT(ext2_rsv_win_tree, &sbp->e2fs_tree, rwp); } @@ -143,7 +144,7 @@ * Remove a ext2_rsv_win structure from RB tree. */ static void -ext2_rsv_win_remove(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp) +ext2_remove_rsv_win(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp) { rwp->rw_start = EXT2_RWI_NOT_ALLOCATED; rwp->rw_end = EXT2_RWI_NOT_ALLOCATED; @@ -164,103 +165,6 @@ } /* - * Determine whether a block can be allocated. - * - * Check to see if a block of the appropriate size is available, - * and if it is, allocate it. - */ -static daddr_t -ext2_alloccg_rsv(struct inode *ip, int cg, daddr_t bpref, int size) -{ - struct m_ext2fs *fs; - struct buf *bp; - struct ext2mount *ump; - int error, bno; - char *bbp; - - fs = ip->i_e2fs; - ump = ip->i_ump; - if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0) - return (0); - EXT2_UNLOCK(ump); - error = bread(ip->i_devvp, fsbtodb(fs, - fs->e2fs_gd[cg].ext2bgd_b_bitmap), - (int)fs->e2fs_bsize, NOCRED, &bp); - if (error) { - brelse(bp); - EXT2_LOCK(ump); - return (0); - } - bbp = (char *)bp->b_data; - - if (dtog(fs, bpref) != cg) - bpref = 0; - if (bpref != 0) { - bpref = dtogd(fs, bpref); - /* - * if the requested block is available, use it - */ - if (isclr(bbp, bpref)) { - bno = bpref; - goto gotit; - } - } - - brelse(bp); - EXT2_LOCK(ump); - return (0); - -gotit: - setbit(bbp, (daddr_t)bno); - EXT2_LOCK(ump); - fs->e2fs->e2fs_fbcount--; - fs->e2fs_gd[cg].ext2bgd_nbfree--; - fs->e2fs_fmod = 1; - EXT2_UNLOCK(ump); - bdwrite(bp); - return (cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bno); -} - -/* - * Search a free block from bpref. - */ -static u_long ext2_bmap_search_free_block(struct m_ext2fs *sbp, char *bbp, daddr_t bpref) -{ - daddr_t bno; - int start, len, loc, i, map; - - /* - * find the fragment by searching through the free block - * map for an appropriate bit pattern - */ - if (bpref) - start = dtogd(sbp, bpref) / NBBY; - else - start = 0; - len = howmany(sbp->e2fs->e2fs_fpg, NBBY) - start; - loc = skpc(0xff, len, &bbp[start]); - if (loc == 0) { - len = start + 1; - start = 0; - loc = skpc(0xff, len, &bbp[start]); - if (loc == 0) { - printf("start = %d, len = %d, fs = %s\n", - start, len, sbp->e2fs_fsmnt); - panic("ext2fs_alloccg: map corrupted"); - /* NOTREACHED */ - } - } - i = start + len - loc; - map = bbp[i]; - bno = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { - if ((map & i) == 0) - return 1; - } - return 0; -} - -/* * Find a reservation window which includes bpref. */ static int @@ -293,13 +197,13 @@ * else we need to traverse tree to find a space. */ if (RB_EMPTY(&sbp->e2fs_tree)) { - if (!ext2_bmap_search_free_block(sbp, bbp, bpref)) + if (!ext2_mapsearch_rsv(sbp, bbp, bpref)) goto failed; rwp = &ip->i_rsv_winp->rwi_entry; rwp->rw_start = bpref; rwp->rw_end = bpref + rwp->rw_goal_size - 1; - ext2_rsv_win_add(sbp, rwp); + ext2_add_rsv_win(sbp, rwp); goto success; } else { @@ -342,13 +246,13 @@ break; } - if (!ext2_bmap_search_free_block(sbp, bbp, bpref)) + if (!ext2_mapsearch_rsv(sbp, bbp, bpref)) goto failed; rwp = &ip->i_rsv_winp->rwi_entry; rwp->rw_start = bpref; rwp->rw_end = bpref + rwp->rw_goal_size - 1; - ext2_rsv_win_add(sbp, rwp); + ext2_add_rsv_win(sbp, rwp); goto success; } @@ -377,7 +281,7 @@ /* delete old reservation window */ if (rwp->rw_end != EXT2_RWI_NOT_ALLOCATED) { mtx_lock_spin(&sbp->e2fs_rsv_win_lock); - ext2_rsv_win_remove(sbp, &ip->i_rsv_winp->rwi_entry); + ext2_remove_rsv_win(sbp, &ip->i_rsv_winp->rwi_entry); mtx_unlock_spin(&sbp->e2fs_rsv_win_lock); } @@ -385,13 +289,15 @@ if (ext2_search_rsv_win(ip, sbp, cg, bpref, size)) return 1; - /* XXX: force to allocate a new reservation window in next group */ + /* TODO: force to allocate a new reservation window in next group */ return 0; } /* * Allocate a block using reservation window in ext2 file system. + * + * NOTE: This function will replace the ext2_alloc() function. */ int ext2_alloc_rsv(struct inode *ip, int32_t lbn, int32_t bpref, @@ -1019,6 +925,66 @@ * * Check to see if a block of the appropriate size is available, * and if it is, allocate it. + * + * NOTE: This function will replace the ext2_alloccg() function. + */ +static daddr_t +ext2_alloccg_rsv(struct inode *ip, int cg, daddr_t bpref, int size) +{ + struct m_ext2fs *fs; + struct buf *bp; + struct ext2mount *ump; + int error, bno; + char *bbp; + + fs = ip->i_e2fs; + ump = ip->i_ump; + if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0) + return (0); + EXT2_UNLOCK(ump); + error = bread(ip->i_devvp, fsbtodb(fs, + fs->e2fs_gd[cg].ext2bgd_b_bitmap), + (int)fs->e2fs_bsize, NOCRED, &bp); + if (error) { + brelse(bp); + EXT2_LOCK(ump); + return (0); + } + bbp = (char *)bp->b_data; + + if (dtog(fs, bpref) != cg) + bpref = 0; + if (bpref != 0) { + bpref = dtogd(fs, bpref); + /* + * if the requested block is available, use it + */ + if (isclr(bbp, bpref)) { + bno = bpref; + goto gotit; + } + } + + brelse(bp); + EXT2_LOCK(ump); + return (0); + +gotit: + setbit(bbp, (daddr_t)bno); + EXT2_LOCK(ump); + fs->e2fs->e2fs_fbcount--; + fs->e2fs_gd[cg].ext2bgd_nbfree--; + fs->e2fs_fmod = 1; + EXT2_UNLOCK(ump); + bdwrite(bp); + return (cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bno); +} + +/* + * Determine whether a block can be allocated. + * + * Check to see if a block of the appropriate size is available, + * and if it is, allocate it. */ static daddr_t ext2_alloccg(struct inode *ip, int cg, daddr_t bpref, int size) @@ -1288,6 +1254,47 @@ } /* + * Search a free block from bpref. + * + * NOTE: This function will replace the ext2_mapsearch() function. + */ +static u_long ext2_mapsearch_rsv(struct m_ext2fs *sbp, char *bbp, daddr_t bpref) +{ + daddr_t bno; + int start, len, loc, i, map; + + /* + * find the fragment by searching through the free block + * map for an appropriate bit pattern + */ + if (bpref) + start = dtogd(sbp, bpref) / NBBY; + else + start = 0; + len = howmany(sbp->e2fs->e2fs_fpg, NBBY) - start; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) { + len = start + 1; + start = 0; + loc = skpc(0xff, len, &bbp[start]); + if (loc == 0) { + printf("start = %d, len = %d, fs = %s\n", + start, len, sbp->e2fs_fsmnt); + panic("ext2fs_alloccg: map corrupted"); + /* NOTREACHED */ + } + } + i = start + len - loc; + map = bbp[i]; + bno = i * NBBY; + for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { + if ((map & i) == 0) + return 1; + } + return 0; +} + +/* * Find a block in the specified cylinder group. * * It is a panic if a request is made to find a block if none are ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#4 (text+ko) ==== @@ -74,7 +74,7 @@ #endif }; -/* ext2_allo.c */ +/* ext2_alloc.c */ struct inode; void ext2_init_rsv_win_info(struct inode *ip); void ext2_discard_rsv_win(struct inode *ip); From owner-p4-projects@FreeBSD.ORG Mon May 10 04:56:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBE29106566B; Mon, 10 May 2010 04:56:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 809A2106567A for ; Mon, 10 May 2010 04:56:24 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-yx0-f175.google.com (mail-yx0-f175.google.com [209.85.210.175]) by mx1.freebsd.org (Postfix) with ESMTP id 249F18FC0A for ; Mon, 10 May 2010 04:56:23 +0000 (UTC) Received: by yxe5 with SMTP id 5so1528906yxe.3 for ; Sun, 09 May 2010 21:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=HjGCSvJlOhzytyS0l80HEc/swsbqfbkA0ueV5ZhchVk=; b=wc5RBASOBvxH260zUD0txl3YExHekX3b4fSHtTtv5vLLh8IaQIpeMQ8M37DGeWtGDs p4WYVYu1EChedmlJU8/iGGcWjrHbQQTKb9toTJEkojO5/Xy0ftFYMfTM+ov9sdLpu+MH p/6URqUlKHtQNtbkXhGp0GikISYvlQsIn18dI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=r1SXDnE71rrOUO1YjOMF0Qr8XQ1KHVBXQXEMzvfZNheE6vwEdneXSPvXm0/giAJWiC D7a7aGvsfGoyzIkSCsI6qyMzasX3oaVhwxDD1qsxgcW/DGk+SVdsLncDVzwMcFQ4y84N 7Hxc3nqx13rBfbrE563My1msNMLzEDyUHVh4Q= MIME-Version: 1.0 Received: by 10.231.60.17 with SMTP id n17mr2269304ibh.24.1273467383159; Sun, 09 May 2010 21:56:23 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.190.82 with HTTP; Sun, 9 May 2010 21:56:23 -0700 (PDT) In-Reply-To: <201005100427.o4A4RX3J018818@repoman.freebsd.org> References: <201005100427.o4A4RX3J018818@repoman.freebsd.org> Date: Sun, 9 May 2010 21:56:23 -0700 X-Google-Sender-Auth: 1a5c5ad121e91ce0 Message-ID: From: Garrett Cooper To: Zheng Liu Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 178024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2010 04:56:25 -0000 On Sun, May 9, 2010 at 9:27 PM, Zheng Liu wrote: > http://p4web.freebsd.org/@@178024?ac=3D10 > > Change 178024 by lz@gnehzuil-freebsd on 2010/05/10 04:26:50 > > =A0 =A0 =A0 =A0Improved the code style. > > Affected files ... > > .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#6 edit > .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#4 edit > > Differences ... This code still doesn't conform to style(9) though -- in particular dealing with function headers, and if my Gmail interface is correct -- the tabs aren't 8-character tabs. Thanks, -Garrett From owner-p4-projects@FreeBSD.ORG Mon May 10 05:29:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1ABB71065673; Mon, 10 May 2010 05:29:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB1D0106566C for ; Mon, 10 May 2010 05:29:35 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8E8A68FC19 for ; Mon, 10 May 2010 05:29:35 +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 o4A5TZHY034890 for ; Mon, 10 May 2010 05:29:35 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A5TZ3x034888 for perforce@freebsd.org; Mon, 10 May 2010 05:29:35 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Mon, 10 May 2010 05:29:35 GMT Message-Id: <201005100529.o4A5TZ3x034888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178025 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, 10 May 2010 05:29:36 -0000 http://p4web.freebsd.org/@@178025?ac=10 Change 178025 by jlaffaye@gsoc on 2010/05/10 05:28:45 Add empty Milestones file. Affected files ... .. //depot/projects/soc2010/pkg_complete/Milestones#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 10 07:20:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E23CB1065677; Mon, 10 May 2010 07:20:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A64501065674 for ; Mon, 10 May 2010 07:20:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8A4D58FC21 for ; Mon, 10 May 2010 07:20: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 o4A7KQsL046668 for ; Mon, 10 May 2010 07:20:26 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4A7KQiO046666 for perforce@freebsd.org; Mon, 10 May 2010 07:20:26 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 07:20:26 GMT Message-Id: <201005100720.o4A7KQiO046666@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 178027 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, 10 May 2010 07:20:27 -0000 http://p4web.freebsd.org/@@178027?ac=10 Change 178027 by gcooper@gcooper-bayonetta on 2010/05/10 07:20:24 Update some comments, group the prefix == NULL functionality together better, convert some callocs to mallocs, and fix @srcdir. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#10 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#10 (text+ko) ==== @@ -406,11 +406,15 @@ if (Regenerate == FALSE) archive_open_flags |= O_CREAT; - if ((destfile = calloc(PATH_MAX, sizeof(char))) == NULL || + /* + * NOTE (gcooper): No sense in calloc'ing destfile or srcfile as the + * first byte is zeroed out below in the archive add loop. + */ + if ((destfile = malloc(PATH_MAX, sizeof(char))) == NULL || (destbase = calloc(PATH_MAX, sizeof(char))) == NULL || (prefix = calloc(PATH_MAX, sizeof(char))) == NULL || (srcbase = calloc(PATH_MAX, sizeof(char))) == NULL || - (srcfile = calloc(PATH_MAX, sizeof(char))) == NULL) + (srcfile = malloc(PATH_MAX, sizeof(char))) == NULL) error = strerror(errno); /* * If the package tarball exists already, and we are running in @@ -513,6 +517,10 @@ destfile[0] = srcfile[0] = '\0'; + /* + * File is based off the current working directory if + * NULL. + */ if (destbase != NULL) if (strlcat(destfile, destbase, PATH_MAX) > PATH_MAX) @@ -539,6 +547,7 @@ case PLIST_CWD: + /* Reset to / */ if (p->name == NULL) { /* * Broken plist; prefix must be defined before @@ -553,22 +562,39 @@ error = strerror(ENAMETOOLONG); /* Reset srcbase */ - if (strlcpy(srcbase, BaseDir, PATH_MAX) > - PATH_MAX) - error = strerror(ENAMETOOLONG); - else if (strlcpy(srcbase, prefix, PATH_MAX) > - PATH_MAX) - error = strerror(ENAMETOOLONG); - - } else { - /* Tack BaseDir on the front if defined. */ if (BaseDir != NULL) { if (strlcpy(srcbase, BaseDir, PATH_MAX) > PATH_MAX) error = strerror(ENAMETOOLONG); - } else - srcbase[0] = '\0'; + if (strlcpy(srcbase, prefix, PATH_MAX) > + PATH_MAX) + error = strerror(ENAMETOOLONG); + + } + /* + * 1. Accumulate the directory argument. or + * 2. Set the prefix as this is the first @cwd. + */ + else { + + /* First @cwd -- wewt! */ + if (prefix == NULL) { + + prefix = p->name; + + /* + * Tack BaseDir on the front if + * defined and this is the first run. + */ + if (BaseDir != NULL) { + if (strlcpy(srcbase, BaseDir, + PATH_MAX) > PATH_MAX) + error = strerror(ENAMETOOLONG); + } else + srcbase[0] = '\0'; + + } if (strlcat(destbase, p->name, PATH_MAX) > PATH_MAX) @@ -578,10 +604,6 @@ PATH_MAX) error = strerror(ENAMETOOLONG); - /* First @cwd statement. */ - if (prefix == NULL) - prefix = p->name; - } /* @@ -623,12 +645,10 @@ assert(p->name != NULL); /* - * Set the appropriate prefix for the next file to - * install (only for @srcdir). - * - * Reset to '' + * Set the appropriate prefix for the next `@cwd' + * call. */ - if (strlcpy(srcbase, p->name, PATH_MAX) > + if (strlcpy(prefix, p->name, PATH_MAX) > PATH_MAX) error = strerror(ENAMETOOLONG); From owner-p4-projects@FreeBSD.ORG Mon May 10 11:44:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AE1D1065673; Mon, 10 May 2010 11:44:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3870106564A for ; Mon, 10 May 2010 11:44:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E14A58FC18 for ; Mon, 10 May 2010 11:44: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 o4ABioIl080562 for ; Mon, 10 May 2010 11:44:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ABioVt080560 for perforce@freebsd.org; Mon, 10 May 2010 11:44:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 10 May 2010 11:44:50 GMT Message-Id: <201005101144.o4ABioVt080560@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 178031 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, 10 May 2010 11:44:51 -0000 http://p4web.freebsd.org/@@178031?ac=10 Change 178031 by hselasky@hselasky_laptop001 on 2010/05/10 11:44:12 IFC @ 177760 (more) Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#4 integrate Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#32 (text+ko) ==== @@ -89,7 +89,7 @@ #define AT9100_DCI_PC2SC(pc) \ AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int at91dcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#44 (text+ko) ==== @@ -81,7 +81,7 @@ #define ATMEGA_PC2SC(pc) \ ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int atmegadci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#17 (text+ko) ==== @@ -81,7 +81,7 @@ #define AVR32_PC2SC(pc) \ AVR32_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int avr32dci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/sys/dev/usb/wlan/if_rumfw.h 188942 2009-02-23 18:31:00Z thompsa $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_rumfw.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ /*- * Copyright (c) 2005-2006, Ralink Technology, Corp. From owner-p4-projects@FreeBSD.ORG Mon May 10 11:57:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E001065673; Mon, 10 May 2010 11:57:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 91AF31065670 for ; Mon, 10 May 2010 11:57:03 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 766A08FC17 for ; Mon, 10 May 2010 11:57: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 o4ABv30b081680 for ; Mon, 10 May 2010 11:57:03 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ABv3Nc081677 for perforce@freebsd.org; Mon, 10 May 2010 11:57:03 GMT (envelope-from gpf@FreeBSD.org) Date: Mon, 10 May 2010 11:57:03 GMT Message-Id: <201005101157.o4ABv3Nc081677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178033 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, 10 May 2010 11:57:04 -0000 http://p4web.freebsd.org/@@178033?ac=10 Change 178033 by gpf@gpf_desktop on 2010/05/10 11:56:53 * log the credentials of the user that initiated the nfs rpc instead of the nfsd thread's root credentials. There is a slight problem: If a user with user_id X does not exist in the server, we just audit the user_id without providing a username which is fine. But it's the same as with doing a `ps -aux` outside of a jail and having user foo inside the jail executing something. If user foo has the same user_id with user bar, who is outside the jail, ps will show that user bar is executing something. Same goes for group ids. It's not a bug, it's a feature. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#3 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.h#3 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#3 (text+ko) ==== @@ -352,7 +352,7 @@ } nfsrvstats.srvrpccnt[nd.nd_procnum]++; - AUDIT_NFS_ENTER(procnum, td); + AUDIT_NFS_ENTER(procnum, nd.nd_cr, td); error = proc(&nd, NULL, &mrep); AUDIT_NFS_EXIT(error, td); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#4 (text) ==== @@ -730,8 +730,8 @@ * audit_new() will fill in basic thread/credential properties. */ void -audit_nfs_enter(unsigned int proc, struct thread *td) -{ +audit_nfs_enter(unsigned int proc, struct ucred *user_cr, struct thread *td) +{ struct au_mask *aumask; au_class_t class; au_event_t event; @@ -740,7 +740,8 @@ KASSERT(td->td_ar == NULL, ("audit_nfs_enter: td->td_ar != NULL")); KASSERT((td->td_pflags & TDP_AUDITREC) == 0, ("audit_nfs_enter: TDP_AUDITREC set")); - + KASSERT(user_cr != NULL, ("audit_nfs_enter: user_cr == NULL")); + /* XXXgpf: perhaps log a failure to match a rpc to an audit event? */ audit_nfs_proc_to_event(proc, &event); @@ -780,16 +781,38 @@ priv_check(td, PRIV_AUDIT_FAILSTOP) != 0) { cv_wait(&audit_fail_cv, &audit_mtx); panic("audit_failing_stop: thread continued"); - } - td->td_ar = audit_new(event, td); + } + td->td_ar = audit_new(event, td); if (td->td_ar != NULL) td->td_pflags |= TDP_AUDITREC; - } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) { + } else if (audit_pipe_preselect(auid, event, class, AU_PRS_BOTH, 0)) { td->td_ar = audit_new(event, td); if (td->td_ar != NULL) td->td_pflags |= TDP_AUDITREC; } else td->td_ar = NULL; + + /* + * Write over the credentials that audit_record_ctor() exported. + * These are the credentials of the user that initiated the NFS RPC. + */ + /* XXXgpf: seems better than having to use another uma_zone_t with a + * different contructor. + * + * I also tried temporarily replacing td's ucred with + * user_cr just before the call to audit_new() like this, but it + * results in bogus behaviour (no nfs events in my log): + * orig_cr = td->td_ucred; + * td->td_ucred = user_cr; + * td->ar = audit_new(...); + * td->td_ucred = orig_cr; + */ + if (td->td_ar != NULL) { + cru2x(user_cr, &td->td_ar->k_ar.ar_subj_cred); + td->td_ar->k_ar.ar_subj_ruid = user_cr->cr_ruid; + td->td_ar->k_ar.ar_subj_rgid = user_cr->cr_rgid; + td->td_ar->k_ar.ar_subj_egid = user_cr->cr_groups[0]; + } } /* ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.h#3 (text) ==== @@ -59,7 +59,7 @@ void audit_syscall_enter(unsigned short code, struct thread *td); void audit_syscall_exit(int error, struct thread *td); -void audit_nfs_enter(unsigned int proc, struct thread *td); +void audit_nfs_enter(unsigned int proc, struct ucred *user_cr, struct thread *td); void audit_nfs_exit(int error, struct thread *td); /* @@ -314,9 +314,9 @@ audit_syscall_exit(error, td); \ } while (0) -#define AUDIT_NFS_ENTER(proc, td) do { \ +#define AUDIT_NFS_ENTER(proc, user_cr, td) do { \ if (audit_enabled) { \ - audit_nfs_enter(proc, td); \ + audit_nfs_enter(proc, user_cr, td); \ } \ } while (0) From owner-p4-projects@FreeBSD.ORG Mon May 10 12:11:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26A2B1065679; Mon, 10 May 2010 12:11:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF2711065672 for ; Mon, 10 May 2010 12:11:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD36A8FC16 for ; Mon, 10 May 2010 12:11:17 +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 o4ACBHOv084163 for ; Mon, 10 May 2010 12:11:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ACBHoP084161 for perforce@freebsd.org; Mon, 10 May 2010 12:11:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 10 May 2010 12:11:17 GMT Message-Id: <201005101211.o4ACBHoP084161@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 178034 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, 10 May 2010 12:11:18 -0000 http://p4web.freebsd.org/@@178034?ac=10 Change 178034 by hselasky@hselasky_laptop001 on 2010/05/10 12:11:10 USB CORE: - add missing #if's - patch by: HPS @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#41 (text+ko) ==== @@ -234,11 +234,12 @@ USB_BUS_UNLOCK(bus); +#if USB_HAVE_POWERD /* * First update the USB power state! */ usb_bus_powerd(bus); - +#endif /* Explore the Root USB HUB. */ (udev->hub->explore) (udev); USB_BUS_LOCK(bus); @@ -301,11 +302,13 @@ usb_proc_rewakeup(&bus->explore_proc); /* recover from DDB */ #endif +#if USB_HAVE_POWERD USB_BUS_UNLOCK(bus); usb_bus_power_update(bus); USB_BUS_LOCK(bus); +#endif } /*------------------------------------------------------------------------* From owner-p4-projects@FreeBSD.ORG Mon May 10 14:09:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D383106567A; Mon, 10 May 2010 14:09:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 394C31065675 for ; Mon, 10 May 2010 14:09:16 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 26DB18FC15 for ; Mon, 10 May 2010 14:09: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 o4AE9GGU006008 for ; Mon, 10 May 2010 14:09:16 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AE9FWJ006006 for perforce@freebsd.org; Mon, 10 May 2010 14:09:15 GMT (envelope-from gpf@FreeBSD.org) Date: Mon, 10 May 2010 14:09:15 GMT Message-Id: <201005101409.o4AE9FWJ006006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178037 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, 10 May 2010 14:09:16 -0000 http://p4web.freebsd.org/@@178037?ac=10 Change 178037 by gpf@gpf_desktop on 2010/05/10 14:08:55 Keeping track of nfs rpc user credentials without knowing where the rpc came from is somewhat useless. I added the AUDIT_ARG_SOCKADDR_IN interface and now the "ip_addr:port" string is saved in the text field of the audit record. I do believe that in the case of nfs rpcs this information must be in the same td_ar as the rpc, and not a different one. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.h#4 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_arg.c#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#6 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_srvkrpc.c#4 (text+ko) ==== @@ -294,7 +294,7 @@ nd.nd_nam2 = rqst->rq_addr; nd.nd_procnum = procnum; nd.nd_cr = NULL; - nd.nd_flag = flag; + nd.nd_flag = flag; if (nfs_privport) { /* Check if source port is privileged */ @@ -353,6 +353,7 @@ nfsrvstats.srvrpccnt[nd.nd_procnum]++; AUDIT_NFS_ENTER(procnum, nd.nd_cr, td); + AUDIT_ARG_SOCKADDR_IN((struct sockaddr_in *)nd.nd_nam); error = proc(&nd, NULL, &mrep); AUDIT_NFS_EXIT(error, td); ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.h#4 (text) ==== @@ -70,6 +70,7 @@ #ifdef AUDIT struct ipc_perm; struct sockaddr; +struct sockaddr_in; union auditon_udata; void audit_arg_addr(void * addr); void audit_arg_exit(int status, int retval); @@ -99,6 +100,7 @@ void audit_arg_signum(u_int signum); void audit_arg_socket(int sodomain, int sotype, int soprotocol); void audit_arg_sockaddr(struct thread *td, struct sockaddr *sa); +void audit_arg_sockaddr_in(struct sockaddr_in *sin); void audit_arg_auid(uid_t auid); void audit_arg_auditinfo(struct auditinfo *au_info); void audit_arg_auditinfo_addr(struct auditinfo_addr *au_info); @@ -258,6 +260,11 @@ audit_arg_socket((sodomain), (sotype), (soprotocol)); \ } while (0) +#define AUDIT_ARG_SOCKADDR_IN(sin) do { \ + if (AUDITING_TD(curthread)) \ + audit_arg_sockaddr_in((sin)); \ +} while (0) + #define AUDIT_ARG_SUID(suid) do { \ if (AUDITING_TD(curthread)) \ audit_arg_suid((suid)); \ ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_arg.c#2 (text) ==== @@ -471,6 +471,24 @@ } void +audit_arg_sockaddr_in(struct sockaddr_in *sin) +{ + char text[MAXPATHLEN]; + struct kaudit_record *ar; + u_short port; + + KASSERT(sin != NULL, ("audit_arg_sockaddr_in: sin == NULL")); + + ar = currecord(); + if (ar == NULL) + return; + + port = ntohs(sin->sin_port); + snprintf(text, sizeof(text), "%s:%d", inet_ntoa(sin->sin_addr), port); + AUDIT_ARG_TEXT(text); +} + +void audit_arg_auid(uid_t auid) { struct kaudit_record *ar; ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#6 (text) ==== @@ -1596,21 +1596,28 @@ if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(3, "mode", ar->ar_arg_mode); kau_write(rec, tok); + } + UPATH1_VNODE1_TOKENS; + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); } - - UPATH1_VNODE1_TOKENS; break; case AUE_NFS_SYMLINK: + UPATH1_VNODE1_TOKENS; if (ARG_IS_VALID(kar, ARG_TEXT)) { tok = au_to_text(ar->ar_arg_text); kau_write(rec, tok); } - UPATH1_VNODE1_TOKENS; break; case AUE_NFS_NOOP: case AUE_NFS_NULL: + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); + } break; case AUE_NFS_LINK: @@ -1619,8 +1626,12 @@ if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(3, "mode", ar->ar_arg_mode); kau_write(rec, tok); - } + } UPATH2_TOKENS; + if (ARG_IS_VALID(kar, ARG_TEXT)) { + tok = au_to_text(ar->ar_arg_text); + kau_write(rec, tok); + } break; case AUE_WAIT4: From owner-p4-projects@FreeBSD.ORG Mon May 10 15:24:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF9571065677; Mon, 10 May 2010 15:24:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A36CE1065679 for ; Mon, 10 May 2010 15:24:31 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 90B978FC14 for ; Mon, 10 May 2010 15:24: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 o4AFOVjb013019 for ; Mon, 10 May 2010 15:24:31 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AFOVBU013017 for perforce@freebsd.org; Mon, 10 May 2010 15:24:31 GMT (envelope-from gpf@FreeBSD.org) Date: Mon, 10 May 2010 15:24:31 GMT Message-Id: <201005101524.o4AFOVBU013017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178039 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, 10 May 2010 15:24:32 -0000 http://p4web.freebsd.org/@@178039?ac=10 Change 178039 by gpf@gpf_desktop on 2010/05/10 15:23:55 * altered nfsrv_symlink() so that upath2 is used instead of the text field which is now reserved for "ip_addr:port" * support for two more nfs rpcs: (commit, mknod) procedures serviced: 19/23 Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#6 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#7 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#6 (text+ko) ==== @@ -1746,6 +1746,7 @@ enum vtype vtyp; struct mbuf *mb, *mreq; struct vnode *vp, *dirp = NULL; + struct vnode *AUDIT_vp = NULL, *AUDIT_dvp = NULL; nfsfh_t nfh; fhandle_t *fhp; struct mount *mp = NULL; @@ -1782,6 +1783,9 @@ error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, FALSE); + + AUDIT_dvp = nd.ni_dvp; + vfslocked = nfsrv_lockedpair_nd(vfslocked, &nd); if (error) { nfsm_reply(NFSX_WCCDATA(1)); @@ -1818,6 +1822,9 @@ vrele(nd.ni_startdir); nd.ni_startdir = NULL; error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); + + AUDIT_vp = nd.ni_vp; + if (error) NDFREE(&nd, NDF_ONLY_PNBUF); } else { @@ -1825,6 +1832,9 @@ PRIV_VFS_MKNOD_DEV, 0))) goto out; error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); + + AUDIT_vp = nd.ni_vp; + if (error) { NDFREE(&nd, NDF_ONLY_PNBUF); goto out; @@ -1860,7 +1870,8 @@ * send response, cleanup, return. */ out: - vp = nd.ni_vp; + vp = nd.ni_vp; + if (!error) { bzero((caddr_t)fhp, sizeof(nfh)); fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid; @@ -1901,6 +1912,43 @@ } vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + AUDIT_ARG_VNODE1(AUDIT_vp); + } + + if (AUDIT_dvp != NULL) { + char path[PATH_MAX]; + struct thread *td = curthread; + char *fullpath, *freepath; + + freepath = NULL; + if (AUDIT_vp != NULL) + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + strlcpy(path, fullpath, sizeof(path)); + free(freepath, M_TEMP); + } + /* if we fail to acquire a path from the new vnode, use the directory vnode instead */ + else if (nd.ni_cnd.cn_pnbuf != NULL) { + + vn_fullpath_global(td, AUDIT_dvp, &fullpath, &freepath); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, nd.ni_cnd.cn_pnbuf); + free(freepath, M_TEMP); + } + /* last resort: just save the name of the new file */ + else { + strlcpy(path, nd.ni_cnd.cn_pnbuf, sizeof(path)); + } + } + + AUDIT_ARG_UPATH1(td, path); + } + } + return (0); nfsmout: if (nd.ni_dvp) { @@ -1918,7 +1966,42 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); - + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + AUDIT_ARG_VNODE1(AUDIT_vp); + } + + if (AUDIT_dvp != NULL) { + char path[PATH_MAX]; + struct thread *td = curthread; + char *fullpath, *freepath; + + freepath = NULL; + if (AUDIT_vp != NULL) + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + strlcpy(path, fullpath, sizeof(path)); + free(freepath, M_TEMP); + } + /* if we fail to acquire a path from the new vnode, use the directory vnode instead */ + else if (nd.ni_cnd.cn_pnbuf != NULL) { + vn_fullpath_global(td, AUDIT_dvp, &fullpath, &freepath); + if (freepath != NULL) { + snprintf(path, sizeof(path), "%s/%s", fullpath, nd.ni_cnd.cn_pnbuf); + free(freepath, M_TEMP); + } + /* last resort: just save the name of the new file */ + else { + strlcpy(path, nd.ni_cnd.cn_pnbuf, sizeof(path)); + } + } + + AUDIT_ARG_UPATH1(td, path); + } + } + return (error); } @@ -2609,7 +2692,7 @@ } if (pathcp != NULL) - AUDIT_ARG_TEXT(pathcp); + AUDIT_ARG_UPATH2(curthread, pathcp); /* * issue symlink op. SAVESTART is set so the underlying path component @@ -3819,6 +3902,7 @@ struct ucred *cred = nfsd->nd_cr; struct vattr bfor, aft; struct vnode *vp = NULL; + struct vnode *AUDIT_vp = NULL; nfsfh_t nfh; fhandle_t *fhp; u_int32_t *tl; @@ -3855,6 +3939,9 @@ cnt = fxdr_unsigned(int, *tl); error = nfsrv_fhtovp(fhp, 1, &vp, &tvfslocked, nfsd, slp, nam, &rdonly, TRUE); + + AUDIT_vp = vp; + vfslocked = nfsrv_lockedpair(vfslocked, tvfslocked); if (error) { nfsm_reply(2 * NFSX_UNSIGNED); @@ -3966,6 +4053,24 @@ vput(vp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + struct thread *td = curthread; + char *fullpath, *freepath; + + AUDIT_ARG_VNODE1(AUDIT_vp); + + freepath = NULL; + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + AUDIT_ARG_UPATH1(td, fullpath); + free(freepath, M_TEMP); + } + } + } + return(error); } ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#7 (text) ==== @@ -1593,6 +1593,8 @@ case AUE_NFS_SETATTR: case AUE_NFS_ACCESS: case AUE_NFS_LOOKUP: + case AUE_NFS_MKNODE: + case AUE_NFS_COMMIT: if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(3, "mode", ar->ar_arg_mode); kau_write(rec, tok); @@ -1604,14 +1606,6 @@ } break; - case AUE_NFS_SYMLINK: - UPATH1_VNODE1_TOKENS; - if (ARG_IS_VALID(kar, ARG_TEXT)) { - tok = au_to_text(ar->ar_arg_text); - kau_write(rec, tok); - } - break; - case AUE_NFS_NOOP: case AUE_NFS_NULL: if (ARG_IS_VALID(kar, ARG_TEXT)) { @@ -1619,7 +1613,8 @@ kau_write(rec, tok); } break; - + + case AUE_NFS_SYMLINK: case AUE_NFS_LINK: case AUE_NFS_RENAME: UPATH1_VNODE1_TOKENS; From owner-p4-projects@FreeBSD.ORG Mon May 10 16:17:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2159C1065675; Mon, 10 May 2010 16:17:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D987B1065672 for ; Mon, 10 May 2010 16:17:24 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C63E28FC17 for ; Mon, 10 May 2010 16:17:24 +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 o4AGHOP3018194 for ; Mon, 10 May 2010 16:17:24 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AGHO9O018192 for perforce@freebsd.org; Mon, 10 May 2010 16:17:24 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 10 May 2010 16:17:24 GMT Message-Id: <201005101617.o4AGHO9O018192@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 178043 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, 10 May 2010 16:17:25 -0000 http://p4web.freebsd.org/@@178043?ac=10 Change 178043 by anchie@anchie_malimis on 2010/05/10 16:16:32 Getting the SEND userland app ready to pack into ports/packages. The old functionality is preserved in sendd/os-freebsd-netgraph. In case of the old code (SEND through netgraph), SND_OS_freebsd code won't be triggered, SND_OS_freebsd-netgraph code will be triggered instead. New functionality related to SEND app through the native SEND API and native SEND socket is in sendd/os-freebsd, and in the rest of the code that is triggered depending on SND_OS_freebsd variable. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#3 edit .. //depot/projects/soc2009/anchie_send/send_0.2/cgatool/cgatool.c#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#28 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/addr.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/netgraph.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/os_defines.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/sendd#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/snd_freebsd.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd-netgraph/snd_freebsd.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#3 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/netgraph.c#3 delete .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.c#4 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.h#3 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto.c#13 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd.c#12 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd_local.h#5 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#3 (text+ko) ==== @@ -5,6 +5,7 @@ # Uncomment the line for your OS #OS=linux +#OS=freebsd-netgraph OS=freebsd # Linux only: Where is your linux kernel source? ==== //depot/projects/soc2009/anchie_send/send_0.2/cgatool/cgatool.c#2 (text+ko) ==== @@ -902,7 +902,7 @@ } static int -do_select(int cfd) +do_select_cgatool(int cfd) { fd_set fds[1]; @@ -1243,7 +1243,7 @@ return (1); } - c = do_select(0); + c = do_select_cgatool(0); #endif exit(c); } ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#28 (text+ko) ==== @@ -60,7 +60,9 @@ #include static int icmp6sock = -1; +#ifdef SND_OS_freebsd static int sndsock = -1; +#endif #ifdef DEBUG static struct dlog_desc dbg = { @@ -70,6 +72,7 @@ static char abuf[INET6_ADDRSTRLEN]; #endif +#ifdef SND_OS_freebsd /* Per-interface info */ struct snd_ifinfo { struct list_head list; @@ -82,14 +85,12 @@ /* Data packet meta data */ struct snd_packet_info { struct snd_ifinfo *ifinfo; - u_char rtm_version; - u_char rtm_type; - int rtm_seq; int in; int ifidx; }; void snd_sock_read(struct snd_ifinfo *p); +#endif /* TODO: dynamically size according to MTU */ struct sbuff * @@ -97,14 +98,14 @@ { struct sbuff *b; - /* 2048 + rt_msghdr */ - if ((b = sbuff_alloc(SND_MAX_PKT + sizeof(struct rt_msghdr))) == NULL) { + if ((b = sbuff_alloc(SND_MAX_PKT)) == NULL) { APPLOG_NOMEM(); return (NULL); } return (b); } +#ifdef SND_MAX_PKT void snd_dispatch_fds(fd_set *fds) { @@ -143,7 +144,6 @@ snd_deliver_pkt(void *p, struct sbuff *b, int drop, int changed) { struct snd_packet_info *pi; - struct rt_msghdr *rtm; struct snd_hdr *snd_hdr; if (drop) { @@ -152,40 +152,6 @@ } pi = (struct snd_packet_info *)(b->head); - -#if 0 - DBG(&dbg_snd, "Direction, %s", (pi->rtm_seq == RTM_SND_OUT) ? "SND_OUT" : "SND_IN"); - - /* buffer starts with IPv6 hdr, roll back to include rtm header */ - b->data -= sizeof (struct rt_msghdr); - b->len += sizeof (struct rt_msghdr); - //b->data -= sizeof (struct if_announcemsghdr); - //b->len += sizeof (struct if_announcemsghdr); - - DBG(&dbg_snd, "%d bytes on %s", b->len, pi->ifinfo->name); - - rtm = sbuff_data(b); - - /* reusing RTM header received from kernel */ - rtm->rtm_msglen = b->len; - rtm->rtm_version = pi->rtm_version; - rtm->rtm_type = pi->rtm_type; - rtm->rtm_index = pi->ifinfo->ifidx; - rtm->rtm_seq = pi->rtm_seq; - rtm->rtm_pid = getpid(); - rtm->rtm_addrs = 0; - - if (rtm->rtm_flags & M_MCAST) - DBG(&dbg_snd, "M_MCAST!"); - - if (send(sndsock, b->data, b->len, 0) < 0) { - DBG(&dbg_snd, "Failed to send routing message back to kernel."); - perror("Failed"); - snd_put_buf(b); - return; - } -#endif - b->data -= SEND_HDR_LEN; b->len += SEND_HDR_LEN; snd_hdr = sbuff_data(b); @@ -204,6 +170,7 @@ return; } + void snd_add_fds(fd_set *fds, int *maxfd, int sock) { @@ -215,6 +182,7 @@ FD_SET(p->snds, fds); } } +#endif int freebsd_snd_init(void) @@ -269,13 +237,12 @@ return (0); } +#ifdef SND_OS_freebsd void snd_sock_read(struct snd_ifinfo *p) { struct snd_hdr *snd_hdr; int direction; - struct rt_msghdr *rtm; - struct if_announcemsghdr *ifan; struct sbuff *b; struct snd_packet_info *pi; int n; @@ -315,60 +282,11 @@ applog(LOG_ERR, "Unknown SEND pkt header: unknown direction."); } -#if 0 - rtm = sbuff_data(b); - if (rtm->rtm_version != RTM_VERSION) { - applog(LOG_ERR, "%s: Unsupported routing message version.", __FUNCTION__); - goto done; - } - - switch (rtm->rtm_type) { - case RTM_IFANNOUNCE: - /* XXX: Do we need this? */ - DBG(&dbg_snd, "RTM_IFANNOUNCE"); - break; - case RTM_SND: - ifan = (struct if_announcemsghdr *)rtm; - pi->rtm_version = ifan->ifan_version; - pi->rtm_type = ifan->ifan_type; - pi->rtm_seq = ifan->ifan_what; - - switch (ifan->ifan_what) { - case RTM_SND_IN: - applog(LOG_ERR, "RTM_SND_IN"); - /* n = RTM hdr + SEND message */ - if (sbuff_pull(b, sizeof (struct if_announcemsghdr)) == NULL) { - DBG(&dbg_snd, "invalid pkt (not enough for rtm hedaer"); - goto done; - } - pi->ifinfo = p; - pi->in = 1; - snd_recv_pkt(b, p->ifidx, SND_IN, pi); - break; - - case RTM_SND_OUT: - applog(LOG_ERR, "RTM_SND_OUT"); - /* n = RTM hdr + ip6_hdr + icmp6len */ - if (sbuff_pull(b, sizeof (struct if_announcemsghdr)) == NULL) { - DBG(&dbg_snd, "invalid pkt (not enough for rtm header"); - goto done; - } - pi->ifinfo = p; - pi->in = 0; - snd_recv_pkt(b, p->ifidx, SND_OUT, pi); - break; - } - break; - default: - applog(LOG_ERR, "%s: Unsupported routing message type.", __FUNCTION__); - goto done; - } -#endif - done: /* ToDo: Free memory! */ snd_put_buf(b); } +#endif /* * TODO: Linux is not yet up-to-date with rfc3542, specifically in that @@ -429,9 +347,13 @@ } int +#ifdef SND_OS_freebsd snd_net_init(int *icmp6socket, int *sndsocket) +#else +snd_net_init(void) +#endif { - int v, off; + int v; struct icmp6_filter filter; #ifdef DEBUG struct dlog_desc *dbgs[] = { @@ -443,8 +365,11 @@ return (-1); } #endif +#ifdef SND_OS_freebsd #define IPPROTO_SEND 259 +#endif +#ifdef SND_OS_freebsd if ((*sndsocket = socket(PF_INET, SOCK_RAW, IPPROTO_SEND)) < 0) { applog(LOG_ERR, "%s: socket: %s", __FUNCTION__, strerror(errno)); @@ -452,25 +377,16 @@ } else { applog(LOG_ERR, "%s: SEND socket created.", __FUNCTION__); } - +#endif if ((*icmp6socket = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) { applog(LOG_ERR, "%s: socket: %s", __FUNCTION__, strerror(errno)); return (-1); } -#if 0 - if ((*sndsocket = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) { - applog(LOG_ERR, "%s: socket: %s", __FUNCTION__, - strerror(errno)); - return(-1); - } else { - applog(LOG_ERR, "%s: routing socket created.", __FUNCTION__); - } -#endif - +#ifdef SND_OS_freebsd icmp6sock = *icmp6socket; sndsock = *sndsocket; - +#endif v = 255; if (setsockopt(icmp6sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &v, sizeof (v)) < 0) { @@ -486,14 +402,6 @@ return (-1); } - /* Tell the kernel to not send us back our own rt messages. */ - off = 0; - if (setsockopt(sndsock, SOL_SOCKET, SO_USELOOPBACK, &off, sizeof(off)) < 0) { - applog(LOG_ERR, "%s: setsock(sndsock, SO_USELOOPBACK, off) " - "failed: %s.", __func__, strerror(errno)); - return(-1); - } - ICMP6_FILTER_SETBLOCKALL(&filter); ICMP6_FILTER_SETPASS(ICMP6_SND_CPS, &filter); ICMP6_FILTER_SETPASS(ICMP6_SND_CPA, &filter); @@ -506,5 +414,9 @@ return (-1); } +#ifdef SND_OS_freebsd return (0); +#else + return(icmp6sock); +#endif } ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#3 (text+ko) ==== @@ -1,8 +1,8 @@ -OBJS += os/addr.o os/snd_freebsd.o os/netgraph.o os-linux/rand.o +OBJS += os/addr.o os/snd_freebsd.o os-linux/rand.o CPPFLAGS += -I/usr/local/include -OSLIBS= -lnetgraph -L/usr/local/lib -l$(DNET) +OSLIBS= -L/usr/local/lib -l$(DNET) OSEXTRA= os/sendd EXTRAINSTALL= /etc/rc.d/sendd ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.c#4 (text+ko) ==== @@ -44,9 +44,6 @@ os_specific_init(void) { if (linux_rand_init() < 0 || freebsd_snd_init() < 0) { -#if 0 - freebsd_netgraph_init() < 0) { -#endif return (-1); } return (0); @@ -55,8 +52,5 @@ void os_specific_fini(void) { -#if 0 - freebsd_netgraph_fini(); -#endif linux_rand_fini(); } ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.h#3 (text+ko) ==== @@ -37,7 +37,5 @@ extern char *freebsd_get_ifs_buf(int *); extern int freebsd_ifs_init(int (*cb)(const char *, int)); -extern void freebsd_netgraph_fini(void); -extern int freebsd_netgraph_init(void); #endif /* _SND_FREEBSD_H */ ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto.c#13 (text+ko) ==== @@ -383,10 +383,12 @@ DBG(&dbg, "%s pkt (%d bytes)", drop ? "dropping" : "delivering", pi->b->len); -#if 0 + +#ifdef SND_OS_freebsd + snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); +#else os_specific_deliver_pkt(pi->os_pkt, pi->b, drop, 1); #endif - snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); free(pi); } @@ -431,10 +433,11 @@ snd_put_cga_params(pi->params); if (sig) free(sig); pi->b->data = pi->start; -#if 0 +#ifdef SND_OS_freebsd + snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); +#else os_specific_deliver_pkt(pi->os_pkt, pi->b, drop, 1); #endif - snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); free(pi); } @@ -576,7 +579,7 @@ pi->cga = &pi->iph->ip6_src; break; case ND_ROUTER_ADVERT: -#if 0 +#ifndef SND_OS_freebsd if (!IN6_IS_ADDR_LINKLOCAL(&pi->iph->ip6_src)) { DBG(&dbg_snd, "RA src addr is not link local"); return (0); @@ -659,18 +662,18 @@ DBG(&dbg, "%s pkt (%d bytes)", drop ? "dropping" : "delivering", pi->b->len); -#if 0 + +#ifdef SND_OS_freebsd + snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); +#else os_specific_deliver_pkt(pi->os_pkt, pi->b, drop, 1); #endif - snd_deliver_pkt(pi->os_pkt, pi->b, drop, 1); + free(pi); } void snd_recv_pkt(struct sbuff *b, int ifidx, int in, void *pkt) -#if 0 -snd_recv_pkt(struct sbuff *b, int ifidx, int in) -#endif { int tlen, drop = 0; int changed = 0; @@ -686,7 +689,7 @@ DBG(&dbg_snd, "pi->ifinfo->ifidx = %d", ifidx); -#if 0 +#ifndef SND_OS_freebsd if (!in) if (sbuff_pull(b, sizeof (struct ether_header)) == NULL) { DBG(&dbg_snd, "invalid pkt (not enough for ether header"); @@ -694,7 +697,6 @@ } } #endif - start = sbuff_data(b); DBG(&dbg, "%s", in ? "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" : @@ -717,7 +719,6 @@ DBG(&dbg_snd, "pkt too small (ip6 hdr)"); goto drop; } - pi->icmp = sbuff_data(b); if (b->len < sizeof (*(pi->icmp))) { DBG(&dbg_snd, "pkt too small (icmp6 hdr)"); @@ -753,7 +754,6 @@ drop = 0; goto done; } - if (snd_parse_opts(&pi->ndopts, sbuff_data(b), b->len) < 0) { goto drop; } @@ -793,12 +793,11 @@ drop = 1; done: b->data = start; - /* - * ToDo: The packet is here sent through netgraph. Will be sent back - * to kernel through the input hook. - */ - /* os_specific_deliver_pkt(pkt, b, drop, changed); */ +#ifdef SND_OS_freebsd snd_deliver_pkt(pkt, b, drop, changed); +#else + os_specific_deliver_pkt(pkt, b, drop, changed); +#endif } int @@ -814,8 +813,6 @@ return (-1); } #endif - applog(LOG_ERR, "snd_proto_init"); - if (snd_proto_nonce_init() < 0 || snd_proto_timestamp_init() < 0) { return (-1); ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd.c#12 (text+ko) ==== @@ -78,7 +78,11 @@ } static int +#ifdef SND_OS_freebsd do_select(int icmps, int snds, int ctlfd) +#else +do_select(int icmps, int ctlfd) +#endif { fd_set fds[1]; int maxfd = -1; @@ -87,16 +91,19 @@ if (cfd != -1) maxfd = cfd; maxfd = sendd_max(icmps, maxfd); maxfd = sendd_max(ctlfd, maxfd); +#ifdef SND_OS_freebsd maxfd = sendd_max(snds, maxfd); - +#endif for (;;) { FD_ZERO(fds); if (cfd != -1) FD_SET(cfd, fds); FD_SET(icmps, fds); FD_SET(ctlfd, fds); - /* Routing socket instead of using netgraph for ND/SeND */ - /* os_specific_add_fds(fds, &maxfd); */ +#ifdef SND_OS_freebsd snd_add_fds(fds, &maxfd, snds); +#else + os_specific_add_fds(fds, &maxfd); +#endif DBG(&snd_dbg, "after snd_add_fds"); tv = get_next_wait(tvb); @@ -124,10 +131,11 @@ if (FD_ISSET(ctlfd, fds)) { snd_ctl_read(ctlfd); } -#if 0 +#ifdef SND_OS_freebsd + snd_dispatch_fds(fds); +#else os_specific_dispatch_fds(fds); #endif - snd_dispatch_fds(fds); snd_replace_non_cga_linklocals(); } } @@ -162,7 +170,7 @@ { const char **lm = applog_get_methods(); - fprintf(stderr, "---> Usage: %s [-fV] [-c ] [-i ] " + fprintf(stderr, "Usage: %s [-fV] [-c ] [-i ] " "[-l ]\n", this); fprintf(stderr, " log methods: "); for (; *lm; lm++) { @@ -174,11 +182,15 @@ int main(int argc, char **argv) { - int r, c, icmps, snds, ctlfd, do_daemon = 1; + int r, c, icmps, ctlfd, do_daemon = 1; +#ifdef SND_OS_freebsd + int snds; +#endif char *cfile = SNDD_CONF_FILE; +#ifdef SND_OS_freebsd icmps = snds = (int *) malloc(sizeof(int)); - +#endif #ifdef DEBUG if (applog_open(L_STDERR, SENDD_NAME) < 0) { exit(1); @@ -250,9 +262,13 @@ snd_ssl_init() < 0 || snd_cga_init() < 0 || snd_params_init() < 0 || +#ifdef SND_OS_freebsd snd_net_init(&icmps, &snds) < 0 || icmps < 0 || snds < 0 || +#else + (icmps = snd_net_init()) < 0 || +#endif snd_init_cert() < 0 || snd_pkixip_config() < 0 || snd_proto_init() < 0 || @@ -280,8 +296,11 @@ cfd = 0; } #endif - +#ifdef SND_OS_freebsd r = do_select(icmps, snds, ctlfd); +#else + r = do_select(icmps, ctlfd); +#endif snd_cleanup(); exit(r); ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd_local.h#5 (text+ko) ==== @@ -130,7 +130,11 @@ /* net.c */ extern void snd_icmp_sock_read(void); +#ifdef SND_OS_freebsd extern int snd_net_init(int *, int *); +#else +extern int snd_net_init(void); +#endif extern struct sbuff *snd_get_buf(void); extern void snd_put_buf(struct sbuff *); extern int snd_send_icmp(struct sbuff *, struct sockaddr_in6 *, int); From owner-p4-projects@FreeBSD.ORG Mon May 10 16:20:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 824181065675; Mon, 10 May 2010 16:20:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 467F51065673 for ; Mon, 10 May 2010 16:20:28 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 32C8E8FC08 for ; Mon, 10 May 2010 16:20: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 o4AGKSi1018446 for ; Mon, 10 May 2010 16:20:28 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AGKRBi018442 for perforce@freebsd.org; Mon, 10 May 2010 16:20:27 GMT (envelope-from kibab@FreeBSD.org) Date: Mon, 10 May 2010 16:20:27 GMT Message-Id: <201005101620.o4AGKRBi018442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178044 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, 10 May 2010 16:20:28 -0000 http://p4web.freebsd.org/@@178044?ac=10 Change 178044 by kibab@kibab_kibab-nb on 2010/05/10 16:20:20 Merge latest changes from -CURRENT. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/e1000/e1000_phy.c#1 branch .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/xen/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_uio.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/bpf_zerocopy.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sys/conf.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sys/param.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/sys/vnode.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/device_pager.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/sg_pager.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/swap_pager.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_contig.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.696 2010/05/08 20:34:01 alc Exp $"); /* * Manages physical address maps. @@ -2796,7 +2796,7 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { pmap = PV_PMAP(pv); @@ -2834,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -3414,8 +3415,10 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); - (void) pmap_enter_quick_locked(pmap, va, m, prot, NULL); + (void)pmap_enter_quick_locked(pmap, va, m, prot, NULL); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -3926,8 +3929,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); + vm_page_lock_queues(); count = pmap_pvh_wired_mappings(&m->md, count); - return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count)); + count = pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count); + vm_page_unlock_queues(); + return (count); } /* @@ -3961,16 +3967,15 @@ boolean_t pmap_page_is_mapped(vm_page_t m) { - struct md_page *pvh; + boolean_t rv; if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0) return (FALSE); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (TAILQ_EMPTY(&m->md.pv_list)) { - pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); - return (!TAILQ_EMPTY(&pvh->pv_list)); - } else - return (TRUE); + vm_page_lock_queues(); + rv = !TAILQ_EMPTY(&m->md.pv_list) || + !TAILQ_EMPTY(&pa_to_pvh(VM_PAGE_TO_PHYS(m))->pv_list); + vm_page_unlock_queues(); + return (rv); } /* @@ -4238,7 +4243,7 @@ if ((m->flags & PG_FICTITIOUS) != 0 || (m->flags & PG_WRITEABLE) == 0) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) { pmap = PV_PMAP(pv); @@ -4269,6 +4274,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -140,7 +140,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.121 2010/04/30 00:46:43 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.122 2010/05/08 20:34:01 alc Exp $"); #include #include #include @@ -3118,18 +3118,11 @@ pmap_t curpm; int flags = 0; -#if defined(PMAP_DEBUG) - /* - * XXX This makes pmap_remove_all() illegal for non-managed pages! - */ - if (m->flags & PG_FICTITIOUS) { - panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); - } -#endif - + KASSERT((m->flags & PG_FICTITIOUS) == 0, + ("pmap_remove_all: page %p is fictitious", m)); if (TAILQ_EMPTY(&m->md.pv_list)) return; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pmap_remove_write(m); curpm = vmspace_pmap(curproc->p_vmspace); while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { @@ -3180,6 +3173,7 @@ pmap_tlb_flushD(curpm); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } @@ -3615,9 +3609,11 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { + vm_page_lock_queues(); PMAP_LOCK(pmap); pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT); + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -4450,10 +4446,11 @@ count = 0; if ((m->flags & PG_FICTITIOUS) != 0) return (count); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) if ((pv->pv_flags & PVF_WIRED) != 0) count++; + vm_page_unlock_queues(); return (count); } @@ -4530,8 +4527,11 @@ pmap_remove_write(vm_page_t m) { - if (m->flags & PG_WRITEABLE) + if (m->flags & PG_WRITEABLE) { + vm_page_lock_queues(); pmap_clearbit(m, PVF_WRITE); + vm_page_unlock_queues(); + } } ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 (text+ko) ==== @@ -3977,6 +3977,9 @@ } */ *ap; { + if (vn_rlimit_fsize(ap->a_vp, ap->a_uio, ap->a_uio->uio_td)) + return (EFBIG); + return (zfs_write(ap->a_vp, ap->a_uio, ap->a_ioflag, ap->a_cred, NULL)); } ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bce/if_bce.c#2 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.69 2010/04/30 02:35:46 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.70 2010/05/07 22:09:17 fabient Exp $"); /* * The following controllers are supported by this driver: @@ -5059,11 +5059,8 @@ #ifdef BCE_JUMBO_HDRSPLIT MGETHDR(m_new, M_DONTWAIT, MT_DATA); #else - if (sc->rx_bd_mbuf_alloc_size <= MCLBYTES) - m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - else - m_new = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, - sc->rx_bd_mbuf_alloc_size); + m_new = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, + sc->rx_bd_mbuf_alloc_size); #endif if (m_new == NULL) { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxp.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.299 2010/04/19 22:10:40 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.302 2010/05/09 22:16:15 yongari Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -106,9 +106,8 @@ /* * The configuration byte map has several undefined fields which - * must be one or must be zero. Set up a template for these bits - * only, (assuming a 82557 chip) leaving the actual configuration - * to fxp_init. + * must be one or must be zero. Set up a template for these bits. + * The actual configuration is performed in fxp_init. * * See struct fxp_cb_config for the bit definitions. */ @@ -137,7 +136,17 @@ 0xf0, /* 18 */ 0x0, /* 19 */ 0x3f, /* 20 */ - 0x5 /* 21 */ + 0x5, /* 21 */ + 0x0, /* 22 */ + 0x0, /* 23 */ + 0x0, /* 24 */ + 0x0, /* 25 */ + 0x0, /* 26 */ + 0x0, /* 27 */ + 0x0, /* 28 */ + 0x0, /* 29 */ + 0x0, /* 30 */ + 0x0 /* 31 */ }; /* @@ -253,6 +262,8 @@ static int fxp_miibus_writereg(device_t dev, int phy, int reg, int value); static void fxp_load_ucode(struct fxp_softc *sc); +static void fxp_update_stats(struct fxp_softc *sc); +static void fxp_sysctl_node(struct fxp_softc *sc); static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high); static int sysctl_hw_fxp_bundle_max(SYSCTL_HANDLER_ARGS); @@ -528,40 +539,8 @@ && (data & FXP_PHY_SERIAL_ONLY)) sc->flags |= FXP_FLAG_SERIAL_MEDIA; - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "int_delay", CTLTYPE_INT | CTLFLAG_RW, - &sc->tunable_int_delay, 0, sysctl_hw_fxp_int_delay, "I", - "FXP driver receive interrupt microcode bundling delay"); - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "bundle_max", CTLTYPE_INT | CTLFLAG_RW, - &sc->tunable_bundle_max, 0, sysctl_hw_fxp_bundle_max, "I", - "FXP driver receive interrupt microcode bundle size limit"); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "rnr", CTLFLAG_RD, &sc->rnr, 0, - "FXP RNR events"); - SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "noflow", CTLFLAG_RW, &sc->tunable_noflow, 0, - "FXP flow control disabled"); - + fxp_sysctl_node(sc); /* - * Pull in device tunables. - */ - sc->tunable_int_delay = TUNABLE_INT_DELAY; - sc->tunable_bundle_max = TUNABLE_BUNDLE_MAX; - sc->tunable_noflow = 1; - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), - "int_delay", &sc->tunable_int_delay); - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), - "bundle_max", &sc->tunable_bundle_max); - (void) resource_int_value(device_get_name(dev), device_get_unit(dev), - "noflow", &sc->tunable_noflow); - sc->rnr = 0; - - /* * Enable workarounds for certain chip revision deficiencies. * * Systems based on the ICH2/ICH2-M chip from Intel, and possibly @@ -2011,6 +1990,81 @@ return (rx_npkts); } +static void +fxp_update_stats(struct fxp_softc *sc) +{ + struct ifnet *ifp = sc->ifp; + struct fxp_stats *sp = sc->fxp_stats; + struct fxp_hwstats *hsp; + uint32_t *status; + + FXP_LOCK_ASSERT(sc, MA_OWNED); + + bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + /* Update statistical counters. */ + if (sc->revision >= FXP_REV_82559_A0) + status = &sp->completion_status; + else if (sc->revision >= FXP_REV_82558_A4) + status = (uint32_t *)&sp->tx_tco; + else + status = &sp->tx_pause; + if (*status == htole32(FXP_STATS_DR_COMPLETE)) { + hsp = &sc->fxp_hwstats; + hsp->tx_good += le32toh(sp->tx_good); + hsp->tx_maxcols += le32toh(sp->tx_maxcols); + hsp->tx_latecols += le32toh(sp->tx_latecols); + hsp->tx_underruns += le32toh(sp->tx_underruns); + hsp->tx_lostcrs += le32toh(sp->tx_lostcrs); + hsp->tx_deffered += le32toh(sp->tx_deffered); + hsp->tx_single_collisions += le32toh(sp->tx_single_collisions); + hsp->tx_multiple_collisions += + le32toh(sp->tx_multiple_collisions); + hsp->tx_total_collisions += le32toh(sp->tx_total_collisions); + hsp->rx_good += le32toh(sp->rx_good); + hsp->rx_crc_errors += le32toh(sp->rx_crc_errors); + hsp->rx_alignment_errors += le32toh(sp->rx_alignment_errors); + hsp->rx_rnr_errors += le32toh(sp->rx_rnr_errors); + hsp->rx_overrun_errors += le32toh(sp->rx_overrun_errors); + hsp->rx_cdt_errors += le32toh(sp->rx_cdt_errors); + hsp->rx_shortframes += le32toh(sp->rx_shortframes); + hsp->tx_pause += le32toh(sp->tx_pause); + hsp->rx_pause += le32toh(sp->rx_pause); + hsp->rx_controls += le32toh(sp->rx_controls); + hsp->tx_tco += le16toh(sp->tx_tco); + hsp->rx_tco += le16toh(sp->rx_tco); + + ifp->if_opackets += le32toh(sp->tx_good); + ifp->if_collisions += le32toh(sp->tx_total_collisions); + if (sp->rx_good) { + ifp->if_ipackets += le32toh(sp->rx_good); + sc->rx_idle_secs = 0; + } else if (sc->flags & FXP_FLAG_RXBUG) { + /* + * Receiver's been idle for another second. + */ + sc->rx_idle_secs++; + } + ifp->if_ierrors += + le32toh(sp->rx_crc_errors) + + le32toh(sp->rx_alignment_errors) + + le32toh(sp->rx_rnr_errors) + + le32toh(sp->rx_overrun_errors); + /* + * If any transmit underruns occured, bump up the transmit + * threshold by another 512 bytes (64 * 8). + */ + if (sp->tx_underruns) { + ifp->if_oerrors += le32toh(sp->tx_underruns); + if (tx_threshold < 192) + tx_threshold += 64; + } + *status = 0; + bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + } +} + /* * Update packet in/out/collision statistics. The i82557 doesn't * allow you to access these counters without doing a fairly @@ -2027,35 +2081,11 @@ { struct fxp_softc *sc = xsc; struct ifnet *ifp = sc->ifp; - struct fxp_stats *sp = sc->fxp_stats; FXP_LOCK_ASSERT(sc, MA_OWNED); - bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, BUS_DMASYNC_POSTREAD); - ifp->if_opackets += le32toh(sp->tx_good); - ifp->if_collisions += le32toh(sp->tx_total_collisions); - if (sp->rx_good) { - ifp->if_ipackets += le32toh(sp->rx_good); - sc->rx_idle_secs = 0; - } else if (sc->flags & FXP_FLAG_RXBUG) { - /* - * Receiver's been idle for another second. - */ - sc->rx_idle_secs++; - } - ifp->if_ierrors += - le32toh(sp->rx_crc_errors) + - le32toh(sp->rx_alignment_errors) + - le32toh(sp->rx_rnr_errors) + - le32toh(sp->rx_overrun_errors); - /* - * If any transmit underruns occured, bump up the transmit - * threshold by another 512 bytes (64 * 8). - */ - if (sp->tx_underruns) { - ifp->if_oerrors += le32toh(sp->tx_underruns); - if (tx_threshold < 192) - tx_threshold += 64; - } + + /* Update statistical counters. */ + fxp_update_stats(sc); /* * Release any xmit buffers that have completed DMA. This isn't @@ -2090,24 +2120,7 @@ /* * Start another stats dump. */ - bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, - BUS_DMASYNC_PREREAD); fxp_scb_cmd(sc, FXP_SCB_COMMAND_CU_DUMPRESET); - } else { - /* - * A previous command is still waiting to be accepted. - * Just zero our copy of the stats and wait for the - * next timer event to update them. - */ - sp->tx_good = 0; - sp->tx_underruns = 0; - sp->tx_total_collisions = 0; - - sp->rx_good = 0; - sp->rx_crc_errors = 0; - sp->rx_alignment_errors = 0; - sp->rx_rnr_errors = 0; - sp->rx_overrun_errors = 0; } if (sc->miibus != NULL) mii_tick(device_get_softc(sc->miibus)); @@ -2151,6 +2164,8 @@ /* Disable interrupts. */ CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE); + fxp_update_stats(sc); + /* * Release any xmit buffers. */ @@ -2253,7 +2268,9 @@ * Initialize base of dump-stats buffer. */ fxp_scb_wait(sc); - bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, BUS_DMASYNC_PREREAD); + bzero(sc->fxp_stats, sizeof(struct fxp_stats)); + bus_dmamap_sync(sc->fxp_stag, sc->fxp_smap, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); CSR_WRITE_4(sc, FXP_CSR_SCB_GENERAL, sc->stats_addr); fxp_scb_cmd(sc, FXP_SCB_COMMAND_CU_DUMP_ADR); @@ -2345,7 +2362,7 @@ cbp->force_fdx = 0; /* (don't) force full duplex */ cbp->fdx_pin_en = 1; /* (enable) FDX# pin */ cbp->multi_ia = 0; /* (don't) accept multiple IAs */ - cbp->mc_all = ifp->if_flags & IFF_ALLMULTI ? 1 : 0; + cbp->mc_all = ifp->if_flags & IFF_ALLMULTI ? 1 : prm; cbp->gamla_rx = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->vlan_strip_en = ((sc->flags & FXP_FLAG_EXT_RFA) != 0 && (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) ? 1 : 0; @@ -2374,6 +2391,22 @@ cbp->pri_fc_loc = 1; /* FC pri location (byte31) */ } + /* Enable 82558 and 82559 extended statistics functionality. */ + if (sc->revision >= FXP_REV_82558_A4) { + if (sc->revision >= FXP_REV_82559_A0) { + /* + * Extend configuration table size to 32 + * to include TCO configuration. + */ + cbp->byte_count = 32; + cbp->ext_stats_dis = 1; + /* Enable TCO stats. */ + cbp->tno_int_or_tco_en = 1; + cbp->gamla_rx = 1; + } else + cbp->ext_stats_dis = 0; + } + /* * Start the config command/DMA. */ @@ -2995,6 +3028,113 @@ sc->flags |= FXP_FLAG_UCODE; } +#define FXP_SYSCTL_STAT_ADD(c, h, n, p, d) \ + SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d) + +static void +fxp_sysctl_node(struct fxp_softc *sc) +{ + struct sysctl_ctx_list *ctx; + struct sysctl_oid_list *child, *parent; + struct sysctl_oid *tree; + struct fxp_hwstats *hsp; + + ctx = device_get_sysctl_ctx(sc->dev); + child = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)); + + SYSCTL_ADD_PROC(ctx, child, + OID_AUTO, "int_delay", CTLTYPE_INT | CTLFLAG_RW, + &sc->tunable_int_delay, 0, sysctl_hw_fxp_int_delay, "I", + "FXP driver receive interrupt microcode bundling delay"); + SYSCTL_ADD_PROC(ctx, child, + OID_AUTO, "bundle_max", CTLTYPE_INT | CTLFLAG_RW, + &sc->tunable_bundle_max, 0, sysctl_hw_fxp_bundle_max, "I", + "FXP driver receive interrupt microcode bundle size limit"); + SYSCTL_ADD_INT(ctx, child,OID_AUTO, "rnr", CTLFLAG_RD, &sc->rnr, 0, + "FXP RNR events"); + SYSCTL_ADD_INT(ctx, child, + OID_AUTO, "noflow", CTLFLAG_RW, &sc->tunable_noflow, 0, + "FXP flow control disabled"); + + /* + * Pull in device tunables. + */ + sc->tunable_int_delay = TUNABLE_INT_DELAY; + sc->tunable_bundle_max = TUNABLE_BUNDLE_MAX; + sc->tunable_noflow = 1; + (void) resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "int_delay", &sc->tunable_int_delay); + (void) resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "bundle_max", &sc->tunable_bundle_max); + (void) resource_int_value(device_get_name(sc->dev), + device_get_unit(sc->dev), "noflow", &sc->tunable_noflow); + sc->rnr = 0; + + hsp = &sc->fxp_hwstats; + tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "stats", CTLFLAG_RD, + NULL, "FXP statistics"); + parent = SYSCTL_CHILDREN(tree); + + /* Rx MAC statistics. */ + tree = SYSCTL_ADD_NODE(ctx, parent, OID_AUTO, "rx", CTLFLAG_RD, + NULL, "Rx MAC statistics"); + child = SYSCTL_CHILDREN(tree); + FXP_SYSCTL_STAT_ADD(ctx, child, "good_frames", + &hsp->rx_good, "Good frames"); + FXP_SYSCTL_STAT_ADD(ctx, child, "crc_errors", + &hsp->rx_crc_errors, "CRC errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "alignment_errors", + &hsp->rx_alignment_errors, "Alignment errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "rnr_errors", + &hsp->rx_rnr_errors, "RNR errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "overrun_errors", + &hsp->rx_overrun_errors, "Overrun errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "cdt_errors", + &hsp->rx_cdt_errors, "Collision detect errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "shortframes", + &hsp->rx_shortframes, "Short frame errors"); + if (sc->revision >= FXP_REV_82558_A4) { + FXP_SYSCTL_STAT_ADD(ctx, child, "pause", + &hsp->rx_pause, "Pause frames"); + FXP_SYSCTL_STAT_ADD(ctx, child, "controls", + &hsp->rx_controls, "Unsupported control frames"); + } + if (sc->revision >= FXP_REV_82559_A0) + FXP_SYSCTL_STAT_ADD(ctx, child, "tco", + &hsp->rx_tco, "TCO frames"); + + /* Tx MAC statistics. */ + tree = SYSCTL_ADD_NODE(ctx, parent, OID_AUTO, "tx", CTLFLAG_RD, + NULL, "Tx MAC statistics"); + child = SYSCTL_CHILDREN(tree); + FXP_SYSCTL_STAT_ADD(ctx, child, "good_frames", + &hsp->tx_good, "Good frames"); + FXP_SYSCTL_STAT_ADD(ctx, child, "maxcols", + &hsp->tx_maxcols, "Maximum collisions errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "latecols", + &hsp->tx_latecols, "Late collisions errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "underruns", + &hsp->tx_underruns, "Underrun errors"); + FXP_SYSCTL_STAT_ADD(ctx, child, "lostcrs", + &hsp->tx_lostcrs, "Lost carrier sense"); + FXP_SYSCTL_STAT_ADD(ctx, child, "deffered", + &hsp->tx_deffered, "Deferred"); + FXP_SYSCTL_STAT_ADD(ctx, child, "single_collisions", + &hsp->tx_single_collisions, "Single collisions"); + FXP_SYSCTL_STAT_ADD(ctx, child, "multiple_collisions", + &hsp->tx_multiple_collisions, "Multiple collisions"); + FXP_SYSCTL_STAT_ADD(ctx, child, "total_collisions", + &hsp->tx_total_collisions, "Total collisions"); + if (sc->revision >= FXP_REV_82558_A4) + FXP_SYSCTL_STAT_ADD(ctx, child, "pause", + &hsp->tx_pause, "Pause frames"); + if (sc->revision >= FXP_REV_82559_A0) + FXP_SYSCTL_STAT_ADD(ctx, child, "tco", + &hsp->tx_tco, "TCO frames"); +} + +#undef FXP_SYSCTL_STAT_ADD + static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high) { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxpreg.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.43 2008/12/02 02:30:12 yongari Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.44 2010/05/09 22:16:15 yongari Exp $ */ #define FXP_VENDORID_INTEL 0x8086 @@ -418,7 +418,15 @@ uint32_t rx_overrun_errors; uint32_t rx_cdt_errors; uint32_t rx_shortframes; + uint32_t tx_pause; + uint32_t rx_pause; + uint32_t rx_controls; + uint16_t tx_tco; + uint16_t rx_tco; uint32_t completion_status; + uint32_t reserved0; + uint32_t reserved1; + uint32_t reserved2; }; #define FXP_STATS_DUMP_COMPLETE 0xa005 #define FXP_STATS_DR_COMPLETE 0xa007 ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fxp/if_fxpvar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.49 2009/06/21 07:34:12 yongari Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.50 2010/05/09 22:16:15 yongari Exp $ */ /* @@ -149,6 +149,30 @@ char *name; }; +struct fxp_hwstats { + uint32_t tx_good; + uint32_t tx_maxcols; + uint32_t tx_latecols; + uint32_t tx_underruns; + uint32_t tx_lostcrs; + uint32_t tx_deffered; + uint32_t tx_single_collisions; + uint32_t tx_multiple_collisions; + uint32_t tx_total_collisions; + uint32_t tx_pause; + uint32_t tx_tco; + uint32_t rx_good; + uint32_t rx_crc_errors; + uint32_t rx_alignment_errors; + uint32_t rx_rnr_errors; + uint32_t rx_overrun_errors; + uint32_t rx_cdt_errors; + uint32_t rx_shortframes; + uint32_t rx_pause; + uint32_t rx_controls; + uint32_t rx_tco; +}; + /* * NOTE: Elements are ordered for optimal cacheline behavior, and NOT * for functional grouping. @@ -175,6 +199,7 @@ int tx_queued; /* # of active TxCB's */ struct fxp_stats *fxp_stats; /* Pointer to interface stats */ uint32_t stats_addr; /* DMA address of the stats structure */ + struct fxp_hwstats fxp_hwstats; int rx_idle_secs; /* # of seconds RX has been idle */ struct callout stat_ch; /* stat callout */ int watchdog_timer; /* seconds until chip reset */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iwn/if_iwn.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.35 2010/05/03 07:32:50 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.36 2010/05/06 17:53:04 bschmidt Exp $"); #include #include @@ -4730,7 +4730,7 @@ chan->passive = htole16(78); else chan->passive = htole16(110); - hdr->crc_threshold = htole16(1); + hdr->crc_threshold = 0xffff; } else if (!(c->ic_flags & IEEE80211_CHAN_PASSIVE)) { chan->rf_gain = 0x28; chan->active = htole16(36); @@ -4743,7 +4743,7 @@ chan->passive = htole16(88); else chan->passive = htole16(120); - hdr->crc_threshold = htole16(1); + hdr->crc_threshold = 0xffff; } DPRINTF(sc, IWN_DEBUG_STATE, ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mxge/if_mxge.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.78 2010/04/15 14:26:52 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.79 2010/05/07 22:09:17 fabient Exp $"); #include #include @@ -2400,10 +2400,7 @@ mxge_rx_ring_t *rx = &ss->rx_big; int cnt, err, i; - if (rx->cl_size == MCLBYTES) - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - else - m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rx->cl_size); + m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rx->cl_size); if (m == NULL) { rx->alloc_fail++; err = ENOBUFS; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/re/if_re.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.168 2010/04/09 22:50:28 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.169 2010/05/07 23:05:27 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -1162,9 +1162,11 @@ msic = 0; if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { sc->rl_flags |= RL_FLAG_PCIE; - /* Set PCIe maximum read request size to 2048. */ - if (pci_get_max_read_req(dev) < 2048) - pci_set_max_read_req(dev, 2048); + if (devid != RT_DEVICEID_8101E) { + /* Set PCIe maximum read request size to 2048. */ + if (pci_get_max_read_req(dev) < 2048) + pci_set_max_read_req(dev, 2048); + } msic = pci_msi_count(dev); if (bootverbose) device_printf(dev, "MSI count : %d\n", msic); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/wlan/if_rum.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.29 2010/05/03 07:32:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.30 2010/05/08 11:56:00 emaste Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.29 2010/05/03 07:32:50 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.30 2010/05/08 11:56:00 emaste Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -197,6 +197,7 @@ static void rum_update_slot(struct ifnet *); static void rum_set_bssid(struct rum_softc *, const uint8_t *); static void rum_set_macaddr(struct rum_softc *, const uint8_t *); +static void rum_update_mcast(struct ifnet *); static void rum_update_promisc(struct ifnet *); static void rum_setpromisc(struct rum_softc *); static const char *rum_get_rf(int); @@ -514,6 +515,7 @@ ic->ic_vap_create = rum_vap_create; ic->ic_vap_delete = rum_vap_delete; + ic->ic_update_mcast = rum_update_mcast; ieee80211_radiotap_attach(ic, &sc->sc_txtap.wt_ihdr, sizeof(sc->sc_txtap), @@ -1815,6 +1817,13 @@ RUM_UNLOCK(sc); } +static void +rum_update_mcast(struct ifnet *ifp) +{ + + /* XXX do nothing? */ +} + static const char * rum_get_rf(int rev) { ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/devfs/devfs_devs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.60 2010/04/16 07:02:28 jh Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.61 2010/05/06 19:22:50 kib Exp $ */ #include @@ -115,17 +115,21 @@ 0, sizeof(struct cdev_priv), "sizeof(struct cdev_priv)"); struct cdev * -devfs_alloc(void) +devfs_alloc(int flags) { struct cdev_priv *cdp; struct cdev *cdev; struct timespec ts; - cdp = malloc(sizeof *cdp, M_CDEVP, M_USE_RESERVE | M_ZERO | M_WAITOK); + cdp = malloc(sizeof *cdp, M_CDEVP, M_USE_RESERVE | M_ZERO | + ((flags & MAKEDEV_NOWAIT) ? M_NOWAIT : M_WAITOK)); + if (cdp == NULL) + return (NULL); cdp->cdp_dirents = &cdp->cdp_dirent0; cdp->cdp_dirent0 = NULL; cdp->cdp_maxdirent = 0; + cdp->cdp_inode = 0; cdev = &cdp->cdp_c; @@ -133,6 +137,7 @@ LIST_INIT(&cdev->si_children); vfs_timestamp(&ts); cdev->si_atime = cdev->si_mtime = cdev->si_ctime = ts; + cdev->si_cred = NULL; return (cdev); } ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/devfs/devfs_int.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.8 2010/04/16 07:02:28 jh Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_int.h,v 1.9 2010/05/06 19:22:50 kib Exp $ */ /* @@ -70,7 +70,7 @@ #define cdev2priv(c) member2struct(cdev_priv, cdp_c, c) -struct cdev *devfs_alloc(void); +struct cdev *devfs_alloc(int); void devfs_free(struct cdev *); void devfs_create(struct cdev *dev); void devfs_destroy(struct cdev *dev); ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.198 2010/05/05 16:44:25 trasz Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.199 2010/05/06 18:43:19 trasz Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -652,7 +652,6 @@ struct buf *bp; int ioflag = ap->a_ioflag; struct uio *uio = ap->a_uio; - struct thread *td = uio->uio_td; struct vnode *vp = ap->a_vp; struct vnode *thisvp; struct denode *dep = VTODE(vp); @@ -696,7 +695,7 @@ /* * If they've exceeded their filesize limit, tell them about it. */ - if (vn_rlimit_fsize(vp, uio, td)) + if (vn_rlimit_fsize(vp, uio, uio->uio_td)) return (EFBIG); /* ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfs_commonkrpc.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 10 17:14:24 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0535610656AD; Mon, 10 May 2010 17:14:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8B9A106577A for ; Mon, 10 May 2010 17:14:23 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A3B318FC18 for ; Mon, 10 May 2010 17:14:23 +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 o4AHENbo033849 for ; Mon, 10 May 2010 17:14:23 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AHEMtl033845 for perforce@freebsd.org; Mon, 10 May 2010 17:14:22 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 10 May 2010 17:14:22 GMT Message-Id: <201005101714.o4AHEMtl033845@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 178047 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, 10 May 2010 17:14:24 -0000 http://p4web.freebsd.org/@@178047?ac=10 Change 178047 by anchie@anchie_malimis on 2010/05/10 17:13:31 IFC @178041 Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xenfunc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xenvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/files.mv#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_xpt.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/linux/linux_ioctl.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/options#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/options.arm#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/changes.txt#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslpredef.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/debugger/dbdisply.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpe.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpeblk.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exoparg1.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/executer/exsystem.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acevents.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acglobal.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acinterp.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/actypes.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbutils.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/tables/tbxface.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/dev/acpica/utilities/uttrack.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/Osd/OsdHardware.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ae/if_ae.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ale/if_ale.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/atkbdc/atkbdcreg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwi/if_bwi.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cas/if_cas.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cas/if_casreg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/via_dmablit.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/drm/via_video.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/io/iodev.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/io/iodev.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/le/lance.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/malo/if_malo.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/md/md.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs_if.m#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs_soc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/quicc/quicc_bfe.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_run.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/wlan/if_zyd.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wl/if_wl.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/devfs/devfs_int.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonport.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_var.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfsport.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clbio.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clrpcops.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clstate.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvnops.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdstate.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/io.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/iodev.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pmap.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/xen/pmap.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/proc.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_exec.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_gzio.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_proc.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_bufring.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_uio.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/adm5120/if_admsw.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/atheros/if_arge.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/uart_dev_oct16550.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/AR71XX#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/pmap.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/proc.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#13 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/mvs/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/usb/usb/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/bpf.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/bpfdesc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/flowtable.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_ef.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_gif.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_gif.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_gre.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_stf.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/route.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#31 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_amrr.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_rssadapt.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_bridge.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_eiface.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_hub.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_pipe.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#15 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_proto.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_timewait.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/udp_var.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#42 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_ifattach.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_proto.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#31 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#11 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/scope6.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ah_var.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/esp_var.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipcomp_var.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipip_var.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/key.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea64.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/pmap.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/cache.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/mcntl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/pmap.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/identcpu.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/ofw_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/zeus.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/pmap.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/proc.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/_task.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/alq.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/buf_ring.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/conf.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/param.h#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/proc.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/resource.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/vnode.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufs_vfsops.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/device_pager.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/phys_pager.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/sg_pager.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/swap_pager.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/uma_core.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_glue.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_map.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_param.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $ */ #include "opt_atpic.h" @@ -50,14 +50,14 @@ .bss .globl dtrace_invop_jump_addr .align 8 - .type dtrace_invop_jump_addr, @object - .size dtrace_invop_jump_addr, 8 + .type dtrace_invop_jump_addr,@object + .size dtrace_invop_jump_addr,8 dtrace_invop_jump_addr: .zero 8 .globl dtrace_invop_calltrap_addr .align 8 - .type dtrace_invop_calltrap_addr, @object - .size dtrace_invop_calltrap_addr, 8 + .type dtrace_invop_calltrap_addr,@object + .size dtrace_invop_calltrap_addr,8 dtrace_invop_calltrap_addr: .zero 8 #endif @@ -157,7 +157,6 @@ * kernel from userland. Reenable interrupts if they were enabled * before the trap. This approximates SDT_SYS386TGT on the i386 port. */ - SUPERALIGN_TEXT .globl alltraps .type alltraps,@function @@ -211,16 +210,16 @@ * Set our jump address for the jump back in the event that * the breakpoint wasn't caused by DTrace at all. */ - movq $calltrap, dtrace_invop_calltrap_addr(%rip) + movq $calltrap,dtrace_invop_calltrap_addr(%rip) /* Jump to the code hooked in by DTrace. */ - movq dtrace_invop_jump_addr, %rax + movq dtrace_invop_jump_addr,%rax jmpq *dtrace_invop_jump_addr #endif .globl calltrap .type calltrap,@function calltrap: - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -274,9 +273,11 @@ testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: movq %rsp, %rdi +1: + movq %rsp,%rdi call dblfault_handler -2: hlt +2: + hlt jmp 2b IDTVEC(page) @@ -369,7 +370,7 @@ movq %r15,TF_R15(%rsp) /* C preserved */ movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call syscall movq PCPU(CURPCB),%rax andq $~PCB_FULLCTX,PCB_FLAGS(%rax) @@ -456,7 +457,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) - movq %rsp, %rdi + movq %rsp,%rdi call trap MEXITCOUNT #ifdef HWPMC_HOOKS @@ -555,9 +556,9 @@ iretq ENTRY(fork_trampoline) - movq %r12, %rdi /* function */ - movq %rbx, %rsi /* arg1 */ - movq %rsp, %rdx /* trapframe pointer */ + movq %r12,%rdi /* function */ + movq %rbx,%rsi /* arg1 */ + movq %rsp,%rdx /* trapframe pointer */ call fork_exit MEXITCOUNT jmp doreti /* Handle any ASTs */ @@ -628,7 +629,7 @@ testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax) je doreti_exit sti - movq %rsp, %rdi /* pass a pointer to the trapframe */ + movq %rsp,%rdi /* pass a pointer to the trapframe */ call ast jmp doreti_ast @@ -648,8 +649,8 @@ * Do not reload segment registers for kernel. * Since we do not reload segments registers with sane * values on kernel entry, descriptors referenced by - * segments registers may be not valid. This is fatal - * for the usermode, but is innocent for the kernel. + * segments registers might be not valid. This is fatal + * for user mode, but is not a problem for the kernel. */ testb $SEL_RPL_MASK,TF_CS(%rsp) jz ld_regs @@ -662,14 +663,16 @@ /* Restore %fs and fsbase */ movw TF_FS(%rsp),%ax .globl ld_fs -ld_fs: movw %ax,%fs +ld_fs: + movw %ax,%fs cmpw $KUF32SEL,%ax jne 1f movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase -ld_fsbase: wrmsr +ld_fsbase: + wrmsr 1: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si @@ -678,7 +681,8 @@ movl $MSR_GSBASE,%ecx rdmsr .globl ld_gs -ld_gs: movw %si,%gs +ld_gs: + movw %si,%gs wrmsr popfq cmpw $KUG32SEL,%si @@ -687,12 +691,17 @@ movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx .globl ld_gsbase -ld_gsbase: wrmsr -1: .globl ld_es -ld_es: movw TF_ES(%rsp),%es +ld_gsbase: + wrmsr +1: + .globl ld_es +ld_es: + movw TF_ES(%rsp),%es .globl ld_ds -ld_ds: movw TF_DS(%rsp),%ds -ld_regs:movq TF_RDI(%rsp),%rdi +ld_ds: + movw TF_DS(%rsp),%ds +ld_regs: + movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx movq TF_RCX(%rsp),%rcx @@ -711,7 +720,8 @@ jz 1f /* keep running with kernel GS.base */ cli swapgs -1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ +1: + addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ .globl doreti_iret doreti_iret: iretq @@ -738,7 +748,8 @@ testl $PSL_I,TF_RFLAGS(%rsp) jz 1f sti -1: movw %fs,TF_FS(%rsp) +1: + movw %fs,TF_FS(%rsp) movw %gs,TF_GS(%rsp) movw %es,TF_ES(%rsp) movw %ds,TF_DS(%rsp) @@ -768,7 +779,7 @@ .globl ds_load_fault ds_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_DS(%rsp) jmp doreti @@ -777,7 +788,7 @@ .globl es_load_fault es_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUDSEL,TF_ES(%rsp) jmp doreti @@ -786,7 +797,7 @@ .globl fs_load_fault fs_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUF32SEL,TF_FS(%rsp) jmp doreti @@ -796,7 +807,7 @@ gs_load_fault: popfq movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movw $KUG32SEL,TF_GS(%rsp) jmp doreti @@ -805,7 +816,7 @@ .globl fsbase_load_fault fsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 @@ -816,7 +827,7 @@ .globl gsbase_load_fault gsbase_load_fault: movl $T_PROTFLT,TF_TRAPNO(%rsp) - movq %rsp, %rdi + movq %rsp,%rdi call trap movq PCPU(CURTHREAD),%r8 movq TD_PCB(%r8),%r8 ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); #include "opt_cpu.h" @@ -240,7 +240,7 @@ printf("\n Features2=0x%b", cpu_feature2, "\020" "\001SSE3" /* SSE3 */ - "\002" + "\002PCLMULQDQ" /* Carry-Less Mul Quadword */ "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ @@ -264,7 +264,7 @@ "\027MOVBE" "\030POPCNT" "\031" - "\032" + "\032AESNI" /* AES Crypto*/ "\033XSAVE" "\034OSXSAVE" "\035" ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/io.c#3 (text+ko) ==== @@ -25,63 +25,35 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.3 2010/01/11 18:10:13 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.4 2010/04/28 15:38:01 attilio Exp $"); #include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include #include +#include #include -#include - -#include -#include -#include - -/* ARGSUSED */ int -ioopen(struct cdev *dev __unused, int flags __unused, int fmt __unused, - struct thread *td) +iodev_open(struct thread *td) { - int error; - error = priv_check(td, PRIV_IO); - if (error != 0) - return (error); - error = securelevel_gt(td->td_ucred, 0); - if (error != 0) - return (error); - td->td_frame->tf_rflags |= PSL_IOPL; - return (0); } -/* ARGSUSED */ int -ioclose(struct cdev *dev __unused, int flags __unused, int fmt __unused, - struct thread *td) +iodev_close(struct thread *td) { + td->td_frame->tf_rflags &= ~PSL_IOPL; - return (0); } /* ARGSUSED */ int -ioioctl(struct cdev *dev __unused, u_long cmd __unused, caddr_t data __unused, - int fflag __unused, struct thread *td __unused) +iodev_ioctl(u_long cmd __unused, caddr_t data __unused) { - return (ENXIO); + return (ENOIOCTL); } ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.690 2010/04/24 21:17:07 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.696 2010/05/08 20:34:01 alc Exp $"); /* * Manages physical address maps. @@ -404,7 +404,22 @@ return (pmap_pde_to_pte(pde, va)); } +static __inline void +pmap_resident_count_inc(pmap_t pmap, int count) +{ + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + pmap->pm_stats.resident_count += count; +} + +static __inline void +pmap_resident_count_dec(pmap_t pmap, int count) +{ + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + pmap->pm_stats.resident_count -= count; +} + PMAP_INLINE pt_entry_t * vtopte(vm_offset_t va) { @@ -778,7 +793,6 @@ SYSCTL_ULONG(_vm_pmap_pdpe, OID_AUTO, demotions, CTLFLAG_RD, &pmap_pdpe_demotions, 0, "1GB page demotions"); - /*************************************************** * Low level helper routines..... ***************************************************/ @@ -1185,15 +1199,20 @@ { pd_entry_t pde, *pdep; pt_entry_t pte; + vm_paddr_t pa; vm_page_t m; + pa = 0; m = NULL; - vm_page_lock_queues(); PMAP_LOCK(pmap); +retry: pdep = pmap_pde(pmap, va); if (pdep != NULL && (pde = *pdep)) { if (pde & PG_PS) { if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + if (vm_page_pa_tryrelock(pmap, (pde & PG_PS_FRAME) | + (va & PDRMASK), &pa)) + goto retry; m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) | (va & PDRMASK)); vm_page_hold(m); @@ -1202,12 +1221,14 @@ pte = *pmap_pde_to_pte(pdep, va); if ((pte & PG_V) && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + if (vm_page_pa_tryrelock(pmap, pte & PG_FRAME, &pa)) + goto retry; m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); } } } - vm_page_unlock_queues(); + PA_UNLOCK_COND(pa); PMAP_UNLOCK(pmap); return (m); } @@ -1477,6 +1498,7 @@ vm_page_t *free) { + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * unmap the page table page */ @@ -1496,7 +1518,7 @@ pd = pmap_pde(pmap, va); *pd = 0; } - --pmap->pm_stats.resident_count; + pmap_resident_count_dec(pmap, 1); if (m->pindex < NUPDE) { /* We just released a PT, unhold the matching PD */ vm_page_t pdpg; @@ -1613,6 +1635,7 @@ (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK")); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); /* * Allocate a page table page. */ @@ -1730,7 +1753,7 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } - pmap->pm_stats.resident_count++; + pmap_resident_count_inc(pmap, 1); return (m); } @@ -2037,7 +2060,7 @@ PMAP_LOCK(pmap); else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) continue; - pmap->pm_stats.resident_count--; + pmap_resident_count_dec(pmap, 1); pde = pmap_pde(pmap, va); KASSERT((*pde & PG_PS) == 0, ("pmap_collect: found" " a 2mpage in page %p's pv list", m)); @@ -2438,7 +2461,7 @@ return (FALSE); } if (va < VM_MAXUSER_ADDRESS) - pmap->pm_stats.resident_count++; + pmap_resident_count_inc(pmap, 1); } mptepa = VM_PAGE_TO_PHYS(mpte); firstpte = (pt_entry_t *)PHYS_TO_DMAP(mptepa); @@ -2530,7 +2553,7 @@ */ if (oldpde & PG_G) pmap_invalidate_page(kernel_pmap, sva); - pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; + pmap_resident_count_dec(pmap, NBPDR / PAGE_SIZE); if (oldpde & PG_MANAGED) { pvh = pa_to_pvh(oldpde & PG_PS_FRAME); pmap_pvh_free(pvh, pmap, sva); @@ -2553,7 +2576,7 @@ mpte = pmap_lookup_pt_page(pmap, sva); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); - pmap->pm_stats.resident_count--; + pmap_resident_count_dec(pmap, 1); KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pde: pte page wire count error")); mpte->wire_count = 0; @@ -2584,7 +2607,7 @@ */ if (oldpte & PG_G) pmap_invalidate_page(kernel_pmap, va); - pmap->pm_stats.resident_count -= 1; + pmap_resident_count_dec(pmap, 1); if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME); if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) @@ -2773,12 +2796,12 @@ KASSERT((m->flags & PG_FICTITIOUS) == 0, ("pmap_remove_all: page %p is fictitious", m)); - mtx_assert(&vm_page_queue_mtx, MA_OWNED); + vm_page_lock_queues(); pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) { - va = pv->pv_va; pmap = PV_PMAP(pv); PMAP_LOCK(pmap); + va = pv->pv_va; pde = pmap_pde(pmap, va); (void)pmap_demote_pde(pmap, pde, va); PMAP_UNLOCK(pmap); @@ -2786,7 +2809,7 @@ while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { pmap = PV_PMAP(pv); PMAP_LOCK(pmap); - pmap->pm_stats.resident_count--; + pmap_resident_count_dec(pmap, 1); pde = pmap_pde(pmap, pv->pv_va); KASSERT((*pde & PG_PS) == 0, ("pmap_remove_all: found" " a 2mpage in page %p's pv list", m)); @@ -2811,6 +2834,7 @@ PMAP_UNLOCK(pmap); } vm_page_flag_clear(m, PG_WRITEABLE); + vm_page_unlock_queues(); } /* @@ -2833,18 +2857,9 @@ if (oldpde & PG_MANAGED) { eva = sva + NBPDR; for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME); - va < eva; va += PAGE_SIZE, m++) { - /* - * In contrast to the analogous operation on a 4KB page - * mapping, the mapping's PG_A flag is not cleared and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 10 18:33:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA9471065678; Mon, 10 May 2010 18:33:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AEE1D106567A for ; Mon, 10 May 2010 18:33:43 +0000 (UTC) (envelope-from aman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 98CD08FC12 for ; Mon, 10 May 2010 18:33:43 +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 o4AIXhVm040702 for ; Mon, 10 May 2010 18:33:43 GMT (envelope-from aman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AIXhjQ040700 for perforce@freebsd.org; Mon, 10 May 2010 18:33:43 GMT (envelope-from aman@freebsd.org) Date: Mon, 10 May 2010 18:33:43 GMT Message-Id: <201005101833.o4AIXhjQ040700@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to aman@freebsd.org using -f From: Aman Jassal To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178051 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, 10 May 2010 18:33:44 -0000 http://p4web.freebsd.org/@@178051?ac=10 Change 178051 by aman@src on 2010/05/10 18:33:15 Fix MIF sysctl procedures for IPv4 and IPv6, that generated WARNING messages. In some files, the #include was added if needed. Reviewed by: pgj Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/igmp.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_icmp.c#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_mroute.c#8 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_usrreq.c#8 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#9 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/igmp.c#6 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -74,7 +75,6 @@ #include #include #include -#include #include ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_icmp.c#5 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_mroute.c#8 (text+ko) ==== @@ -99,6 +99,7 @@ #include #include #include +#include #include #include @@ -112,7 +113,6 @@ #include #include #include -#include #include @@ -795,7 +795,7 @@ } static int -export_viftable(SYSCTL_HANDLER_ARGS) +sysctl_export_viftable(SYSCTL_HANDLER_ARGS) { struct vif_stream vs; struct vif_data vd; @@ -812,16 +812,23 @@ VIF_LOCK(); vs.vs_count = numvifs; + + VIF_UNLOCK(); + buflen = sizeof(vs) + vs.vs_count * sizeof(vd) + 1; buffer = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); + + VIF_LOCK(); + sbuf_new(&sbuf, buffer, buflen, SBUF_FIXEDLEN); if (sbuf_bcat(&sbuf, &vs, sizeof(vs)) < 0) { + VIF_UNLOCK(); error = ENOMEM; goto out; } - for (vifi = 0; vifi < numvifs; vifi++) { + for (vifi = 0; vifi < min(vs.vs_count, numvifs); vifi++) { v = &viftable[vifi]; bzero(&vd, sizeof(vd)); @@ -836,6 +843,7 @@ vd.vd_bytes_out = v->v_bytes_out; if (sbuf_bcat(&sbuf, &vd, sizeof(vd)) < 0) { + VIF_UNLOCK(); error = ENOMEM; goto out; } @@ -851,11 +859,11 @@ } SYSCTL_PROC(_net_inet_ip, OID_AUTO, sviftable, CTLFLAG_RD|CTLTYPE_STRUCT, - 0, 0, export_viftable, "s,struct vif_data", + 0, 0, sysctl_export_viftable, "s,struct vif_data", "IPv4 Multicast Interfaces (streamed)"); static int -export_mfctable(SYSCTL_HANDLER_ARGS) +sysctl_export_mfctable(SYSCTL_HANDLER_ARGS) { struct mfc_stream ms; struct mfc_data md; @@ -863,7 +871,7 @@ int error, buflen; char *buffer; struct mfc *m; - u_int32_t i; + u_int32_t i, j; error = 0; bzero(&ms, sizeof(ms)); @@ -880,15 +888,22 @@ ms.ms_count++; } + MFC_UNLOCK(); + buflen = sizeof(ms) + ms.ms_count * sizeof(md) + 1; buffer = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); + + MFC_LOCK(); + sbuf_new(&sbuf, buffer, buflen, SBUF_FIXEDLEN); if (sbuf_bcat(&sbuf, &ms, sizeof(ms)) < 0) { + MFC_UNLOCK(); error = ENOMEM; goto out; } + j = 0; if (mfchashtbl != NULL) for (i = 0; i < mfchashsize; i++) { LIST_FOREACH(m, &mfchashtbl[i], mfc_hash) { @@ -902,9 +917,15 @@ bcopy(m->mfc_ttls, md.md_ttls, sizeof(md.md_ttls)); if (sbuf_bcat(&sbuf, &md, sizeof(md)) < 0) { + MFC_UNLOCK(); error = ENOMEM; goto out; } + + if (j < ms.ms_count) + j++; + else + break; } } @@ -918,7 +939,7 @@ } SYSCTL_PROC(_net_inet_ip, OID_AUTO, smfctable, CTLFLAG_RD|CTLTYPE_STRUCT, - 0, 0, export_mfctable, "s,struct mfc_data", + 0, 0, sysctl_export_mfctable, "s,struct mfc_data", "IPv4 Multicast Forwarding Table (streamed)"); /* ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_usrreq.c#8 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include +#include #include #include @@ -80,7 +81,6 @@ #endif #include #include -#include #include #ifdef IPSEC ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#9 (text+ko) ==== @@ -520,7 +520,7 @@ } static int -export_mif6table(SYSCTL_HANDLER_ARGS) +sysctl_export_mif6table(SYSCTL_HANDLER_ARGS) { struct mif6_stream ms; struct mif6_data md; @@ -537,16 +537,23 @@ MIF6_LOCK(); ms.ms_count = nummifs; + + MIF6_UNLOCK(); + buflen = sizeof(ms) + ms.ms_count * sizeof(md) + 1; buffer = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); + + MIF6_LOCK(); + sbuf_new(&sbuf, buffer, buflen, SBUF_FIXEDLEN); if (sbuf_bcat(&sbuf, &ms, sizeof(ms)) < 0) { + MIF6_UNLOCK(); error = ENOMEM; goto out; } - for (mifi = 0; mifi < nummifs; mifi++) { + for (mifi = 0; mifi < min(ms.ms_count, nummifs); mifi++) { m = &mif6table[mifi]; bzero(&md, sizeof(md)); @@ -560,6 +567,7 @@ md.md_bytes_out = m->m6_bytes_out; if (sbuf_bcat(&sbuf, &md, sizeof(md)) < 0) { + MIF6_UNLOCK(); error = ENOMEM; goto out; } @@ -575,11 +583,11 @@ } SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, smif6table, CTLFLAG_RD|CTLTYPE_STRUCT, - 0, 0, export_mif6table, "s,struct mif6_data", + 0, 0, sysctl_export_mif6table, "s,struct mif6_data", "IPv6 Multicast Interfaces (streamed)"); static int -export_mf6ctable(SYSCTL_HANDLER_ARGS) +sysctl_export_mf6ctable(SYSCTL_HANDLER_ARGS) { struct mf6c_stream ms; struct mf6c_data md; @@ -588,7 +596,7 @@ char *buffer; struct mf6c *m; struct rtdetq *r; - u_int32_t i; + u_int32_t i, j; error = 0; bzero(&ms, sizeof(ms)); @@ -603,15 +611,22 @@ ms.ms_count++; } + MFC6_UNLOCK(); + buflen = sizeof(ms) + ms.ms_count * sizeof(md) + 1; buffer = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); + + MFC6_LOCK(); + sbuf_new(&sbuf, buffer, buflen, SBUF_FIXEDLEN); if (sbuf_bcat(&sbuf, &ms, sizeof(ms)) < 0) { + MFC6_UNLOCK(); error = ENOMEM; goto out; } + j = 0; for (i = 0; i < MF6CTBLSIZ; i++) { for (m = mf6ctable[i]; m != NULL; m = m->mf6c_next) { bzero(&md, sizeof(md)); @@ -631,9 +646,15 @@ sizeof(md.md_ifs_bits)); if (sbuf_bcat(&sbuf, &md, sizeof(md)) < 0) { + MFC6_UNLOCK(); error = ENOMEM; goto out; } + + if (j < ms.ms_count) + j++; + else + break; } } @@ -647,7 +668,7 @@ } SYSCTL_PROC(_net_inet6_ip6, OID_AUTO, smf6ctable, CTLFLAG_RD|CTLTYPE_STRUCT, - 0, 0, export_mf6ctable, "s,struct mf6c_data", + 0, 0, sysctl_export_mf6ctable, "s,struct mf6c_data", "IPv6 Multicast Forwarding Table (streamed)"); static int From owner-p4-projects@FreeBSD.ORG Mon May 10 19:06:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B54F1065679; Mon, 10 May 2010 19:06:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F8AB1065677 for ; Mon, 10 May 2010 19:06:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1D9948FC1A for ; Mon, 10 May 2010 19:06:17 +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 o4AJ6HEk044535 for ; Mon, 10 May 2010 19:06:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AJ6Gxr044533 for perforce@freebsd.org; Mon, 10 May 2010 19:06:16 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 10 May 2010 19:06:16 GMT Message-Id: <201005101906.o4AJ6Gxr044533@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 178055 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, 10 May 2010 19:06:17 -0000 http://p4web.freebsd.org/@@178055?ac=10 Change 178055 by rene@rene_eee on 2010/05/10 19:06:12 MFen freebsd-glossary 1.35 -> 1.36 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#8 (text+ko) ==== @@ -2,10 +2,9 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.8 2009/05/17 17:12:22 rene Exp $ - $FreeBSDnl: doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml,v 1.10 2006/08/13 20:57:49 remko Exp $ %SOURCE% en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml - %SRCID% 1.35 + %SRCID% 1.36 FreeBSD begrippenlijst Houd dit bestand alstublieft alfabetisch/ASCII gesorteerd op @@ -1628,6 +1627,27 @@ + + Revision Control System + RCS + + Het Revision Control System + (RCS) is een van de oudste software-pakketten dat + revisie-beheer voor platte bestanden implementeert. + Het voorziet in het opslaan, ophalen, archiveren, loggen, + identificeren en samenvoegen van meerdere revisies voor elk bestand. + RCS bestaat uit vele kleine samenwerkende gereedschappen. Het mist + sommige eigenschappen die in modernere revisie-controlesystemen + zoals CVS of Subversion zitten, maar het is erg eenvoudig om te + installeren, configureren, en gebruiken voor een klein aantal + bestanden. Implementaties van RCS zijn in elk groot UNIX-achtig + besturingssysteem aanwezig. + + + + + + Received Data RD From owner-p4-projects@FreeBSD.ORG Mon May 10 19:54:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49A47106567A; Mon, 10 May 2010 19:54:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0E1411065675 for ; Mon, 10 May 2010 19:54:06 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EFDAE8FC18 for ; Mon, 10 May 2010 19:54:05 +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 o4AJs5a9048308 for ; Mon, 10 May 2010 19:54:05 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AJs5wk048306 for perforce@freebsd.org; Mon, 10 May 2010 19:54:05 GMT (envelope-from gpf@FreeBSD.org) Date: Mon, 10 May 2010 19:54:05 GMT Message-Id: <201005101954.o4AJs5wk048306@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178061 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, 10 May 2010 19:54:06 -0000 http://p4web.freebsd.org/@@178061?ac=10 Change 178061 by gpf@gpf_desktop on 2010/05/10 19:54:01 * I was afraid that no user credentials are sent for some rpcs, e.g. if we want to ping the nfs server. That's true, so I relaxed the checks at audit_nfs_enter() * added support for the final nfs rpcs. ufs tests are ok although we may encounter some problem with the fsinfo rpc over zfs (readdirplus, statfs, fsinfo, pathconf) procedures serviced: 23/23 Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#7 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#5 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#8 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/nfsserver/nfs_serv.c#7 (text+ko) ==== @@ -3557,6 +3557,7 @@ struct mbuf *mb, *mreq; char *cpos, *cend, *rbuf; struct vnode *vp = NULL, *nvp; + struct vnode *dir_vp = NULL; struct flrep fl; nfsfh_t nfh; fhandle_t *fhp, *nfhp = (fhandle_t *)fl.fl_nfh; @@ -3594,6 +3595,9 @@ fullsiz = siz; error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, nfsd, slp, nam, &rdonly, TRUE); + + dir_vp = vp; + if (!error && vp->v_type != VDIR) { error = ENOTDIR; vput(vp); @@ -3886,6 +3890,24 @@ if (vp) vrele(vp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (dir_vp != NULL) { + struct thread *td = curthread; + char *fullpath, *freepath; + + AUDIT_ARG_VNODE1(dir_vp); + + freepath = NULL; + vn_fullpath_global(td, dir_vp, &fullpath, &freepath); + if (freepath != NULL) { + AUDIT_ARG_UPATH1(td, fullpath); + free(freepath, M_TEMP); + } + } + } + return(error); } @@ -4092,6 +4114,7 @@ int v3 = (nfsd->nd_flag & ND_NFSV3); struct mbuf *mb, *mreq; struct vnode *vp = NULL; + struct vnode *AUDIT_vp = NULL; struct vattr at; nfsfh_t nfh; fhandle_t *fhp; @@ -4105,6 +4128,9 @@ nfsm_srvmtofh(fhp); error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, nfsd, slp, nam, &rdonly, TRUE); + + AUDIT_vp = vp; + if (error) { nfsm_reply(NFSX_UNSIGNED); if (v3) @@ -4165,6 +4191,24 @@ if (vp) vput(vp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + struct thread *td = curthread; + char *fullpath, *freepath; + + AUDIT_ARG_VNODE1(AUDIT_vp); + + freepath = NULL; + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + AUDIT_ARG_UPATH1(td, fullpath); + free(freepath, M_TEMP); + } + } + } + return(error); } @@ -4184,6 +4228,7 @@ int error = 0, rdonly, getret = 1, pref; struct mbuf *mb, *mreq; struct vnode *vp = NULL; + struct vnode *AUDIT_vp = NULL; struct vattr at; nfsfh_t nfh; fhandle_t *fhp; @@ -4200,6 +4245,9 @@ nfsm_srvmtofh(fhp); error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, nfsd, slp, nam, &rdonly, TRUE); + + AUDIT_vp = vp; + if (error) { nfsm_reply(NFSX_UNSIGNED); nfsm_srvpostop_attr(getret, &at); @@ -4241,6 +4289,24 @@ if (vp) vput(vp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + struct thread *td = curthread; + char *fullpath, *freepath; + + AUDIT_ARG_VNODE1(AUDIT_vp); + + freepath = NULL; + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + AUDIT_ARG_UPATH1(td, fullpath); + free(freepath, M_TEMP); + } + } + } + return(error); } @@ -4261,6 +4327,7 @@ register_t linkmax, namemax, chownres, notrunc; struct mbuf *mb, *mreq; struct vnode *vp = NULL; + struct vnode *AUDIT_vp = NULL; struct vattr at; nfsfh_t nfh; fhandle_t *fhp; @@ -4275,6 +4342,9 @@ nfsm_srvmtofh(fhp); error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, nfsd, slp, nam, &rdonly, TRUE); + + AUDIT_vp = vp; + if (error) { nfsm_reply(NFSX_UNSIGNED); nfsm_srvpostop_attr(getret, &at); @@ -4315,6 +4385,24 @@ if (vp) vput(vp); VFS_UNLOCK_GIANT(vfslocked); + + /* XXX AUDIT */ + if (AUDITING_TD(curthread)) { + if (AUDIT_vp != NULL) { + struct thread *td = curthread; + char *fullpath, *freepath; + + AUDIT_ARG_VNODE1(AUDIT_vp); + + freepath = NULL; + vn_fullpath_global(td, AUDIT_vp, &fullpath, &freepath); + if (freepath != NULL) { + AUDIT_ARG_UPATH1(td, fullpath); + free(freepath, M_TEMP); + } + } + } + return(error); } ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit.c#5 (text) ==== @@ -740,7 +740,6 @@ KASSERT(td->td_ar == NULL, ("audit_nfs_enter: td->td_ar != NULL")); KASSERT((td->td_pflags & TDP_AUDITREC) == 0, ("audit_nfs_enter: TDP_AUDITREC set")); - KASSERT(user_cr != NULL, ("audit_nfs_enter: user_cr == NULL")); /* XXXgpf: perhaps log a failure to match a rpc to an audit event? */ audit_nfs_proc_to_event(proc, &event); @@ -807,7 +806,7 @@ * td->ar = audit_new(...); * td->td_ucred = orig_cr; */ - if (td->td_ar != NULL) { + if (td->td_ar != NULL && user_cr != NULL) { cru2x(user_cr, &td->td_ar->k_ar.ar_subj_cred); td->td_ar->k_ar.ar_subj_ruid = user_cr->cr_ruid; td->td_ar->k_ar.ar_subj_rgid = user_cr->cr_rgid; ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/security/audit/audit_bsm.c#8 (text) ==== @@ -1586,6 +1586,7 @@ case AUE_NFS_WRITE: case AUE_NFS_MKDIR: case AUE_NFS_READDIR: + case AUE_NFS_READDIR_PLUS: case AUE_NFS_READLINK: case AUE_NFS_REMOVE: case AUE_NFS_RMDIR: @@ -1595,6 +1596,9 @@ case AUE_NFS_LOOKUP: case AUE_NFS_MKNODE: case AUE_NFS_COMMIT: + case AUE_NFS_PATHCONF: + case AUE_NFS_STATFS: + case AUE_NFS_FSINFO: if (ARG_IS_VALID(kar, ARG_MODE)) { tok = au_to_arg32(3, "mode", ar->ar_arg_mode); kau_write(rec, tok); From owner-p4-projects@FreeBSD.ORG Mon May 10 23:07:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EEFC1065673; Mon, 10 May 2010 23:07:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 33795106564A for ; Mon, 10 May 2010 23:07:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 097988FC16 for ; Mon, 10 May 2010 23:07: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 o4AN7KaD087828 for ; Mon, 10 May 2010 23:07:20 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4AN7KwW087826 for perforce@freebsd.org; Mon, 10 May 2010 23:07:20 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 23:07:20 GMT Message-Id: <201005102307.o4AN7KwW087826@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 178073 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, 10 May 2010 23:07:21 -0000 http://p4web.freebsd.org/@@178073?ac=10 Change 178073 by gcooper@starr on 2010/05/10 23:06:32 Move the functional spec file over to the appropriate directory as libpkg now lives under lib. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libpkg/functional_spec#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/lib/functional_spec#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 10 23:17:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6CF21065676; Mon, 10 May 2010 23:17:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7B31E1065675 for ; Mon, 10 May 2010 23:17:31 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5134C8FC21 for ; Mon, 10 May 2010 23:17: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 o4ANHVvZ088519 for ; Mon, 10 May 2010 23:17:31 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ANHVUs088517 for perforce@freebsd.org; Mon, 10 May 2010 23:17:31 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 23:17:31 GMT Message-Id: <201005102317.o4ANHVUs088517@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 178074 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, 10 May 2010 23:17:32 -0000 http://p4web.freebsd.org/@@178074?ac=10 Change 178074 by gcooper@starr on 2010/05/10 23:16:37 Check in skeleton bits for pkg_create tests and testplan. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/test_create_package.sh#1 add .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon May 10 23:35:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C37C1065676; Mon, 10 May 2010 23:35:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC927106566B for ; Mon, 10 May 2010 23:35:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D2C248FC21 for ; Mon, 10 May 2010 23:35: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 o4ANZngH090025 for ; Mon, 10 May 2010 23:35:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ANZnb9090023 for perforce@freebsd.org; Mon, 10 May 2010 23:35:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 10 May 2010 23:35:49 GMT Message-Id: <201005102335.o4ANZnb9090023@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 178075 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, 10 May 2010 23:35:50 -0000 http://p4web.freebsd.org/@@178075?ac=10 Change 178075 by hselasky@hselasky_laptop001 on 2010/05/10 23:35:13 USB CORE + USB CONTROLLER: - fix for intervalled High Speed isochronous transfers. ehci.c: - back out USB P4 change #173002 which was causing problems when the first and the last microframe slot was not in the smask. The problem was that the EHCI driver was then thinking that the transfer was immediately complete in some cases. Which could lead to freeze-like situations, which can be recovered by unplugging the USB device. I have chosen a simple method over a faster one, because making a faster solution takes some more time to investigate, and I don't have that time right now. usb_hub.c: - overload the "bandwidth_reclaimed" bit-flag, which should only be used for the UHCI. When used with the EHCI it means we have allocated bandwidth for a high speed endpoint. This bit is checked when allocating and freeing to avoid duplicate operations. At least the close method of a USB transfer type can be called two times in a row, with only one open, due to the current design. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#51 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#43 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#51 (text+ko) ==== @@ -1352,22 +1352,32 @@ } } else if (methods == &ehci_device_isoc_hs_methods) { ehci_itd_t *td; - uint8_t n = (xfer->nframes & 7); /* isochronous high speed transfer */ /* check last transfer */ td = xfer->td_transfer_last; usb_pc_cpu_invalidate(td->page_cache); - if (n == 0) - status = td->itd_status[7]; - else - status = td->itd_status[n-1]; + status = td->itd_status[0]; + status |= td->itd_status[1]; + status |= td->itd_status[2]; + status |= td->itd_status[3]; + status |= td->itd_status[4]; + status |= td->itd_status[5]; + status |= td->itd_status[6]; + status |= td->itd_status[7]; /* also check first transfer */ td = xfer->td_transfer_first; usb_pc_cpu_invalidate(td->page_cache); status |= td->itd_status[0]; + status |= td->itd_status[1]; + status |= td->itd_status[2]; + status |= td->itd_status[3]; + status |= td->itd_status[4]; + status |= td->itd_status[5]; + status |= td->itd_status[6]; + status |= td->itd_status[7]; /* if no transactions are active we continue */ if (!(status & htohc32(sc, EHCI_ITD_ACTIVE))) { @@ -2799,14 +2809,15 @@ uint8_t x; uint8_t td_no; uint8_t page_no; + uint8_t shift = usbd_xfer_get_fps_shift(xfer); #ifdef USB_DEBUG uint8_t once = 1; #endif - DPRINTFN(6, "xfer=%p next=%d nframes=%d\n", - xfer, xfer->endpoint->isoc_next, xfer->nframes); + DPRINTFN(6, "xfer=%p next=%d nframes=%d shift=%d\n", + xfer, xfer->endpoint->isoc_next, xfer->nframes, (int)shift); /* get the current frame index */ @@ -2820,7 +2831,7 @@ (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); if ((xfer->endpoint->is_synced == 0) || - (buf_offset < ((xfer->nframes + 7) / 8))) { + (buf_offset < (((xfer->nframes << shift) + 7) / 8))) { /* * If there is data underflow or the pipe queue is empty we * schedule the transfer a few frames ahead of the current @@ -2844,7 +2855,7 @@ */ xfer->isoc_time_complete = usb_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset + - ((xfer->nframes + 7) / 8); + (((xfer->nframes << shift) + 7) / 8); /* get the real number of frames */ ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#43 (text+ko) ==== @@ -1230,6 +1230,11 @@ if (udev->flags.usb_mode != USB_MODE_HOST) return; /* not supported */ + if (xfer->flags_int.bandwidth_reclaimed != 0) + return; /* bandwidth already allocated */ + + xfer->flags_int.bandwidth_reclaimed = 1; + xfer->endpoint->refcount_bw++; if (xfer->endpoint->refcount_bw != 1) return; /* already allocated */ @@ -1310,6 +1315,11 @@ if (udev->flags.usb_mode != USB_MODE_HOST) return; /* not supported */ + if (xfer->flags_int.bandwidth_reclaimed == 0) + return; /* bandwidth already freed */ + + xfer->flags_int.bandwidth_reclaimed = 0; + xfer->endpoint->refcount_bw--; if (xfer->endpoint->refcount_bw != 0) return; /* still allocated */ From owner-p4-projects@FreeBSD.ORG Mon May 10 23:39:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E5EC1065674; Mon, 10 May 2010 23:39:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 22C8F1065670 for ; Mon, 10 May 2010 23:39:54 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 10ED48FC18 for ; Mon, 10 May 2010 23:39: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 o4ANdrWI090271 for ; Mon, 10 May 2010 23:39:53 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ANdrTc090269 for perforce@freebsd.org; Mon, 10 May 2010 23:39:53 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 10 May 2010 23:39:53 GMT Message-Id: <201005102339.o4ANdrTc090269@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 178076 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, 10 May 2010 23:39:54 -0000 http://p4web.freebsd.org/@@178076?ac=10 Change 178076 by gcooper@starr on 2010/05/10 23:39:32 Checkpoint testplan. Not much has been achieved yet.. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#2 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#2 (text+ko) ==== @@ -1,178 +1,38 @@ -Basic package installation. +Basic package creation. - Local package install: + Empty package: - Type: Positive - - Setup: Create basic package (no special metadata in package list). - - Test: Install predefined package. - - PF Criteria: The contents of the package must be installed in the - defined prefix and the permissions and the mode must match the - created package. + - Setup: Create basic comments and description files; do not add any + data to the package list. + - Test: Attempt to create package. + - PF Criteria: Package will be created with an empty package list, + and the associated comments and description files will + be added to the package with the appropriate modes + (00644). - Remote package install (FTP, absolute): + Regular base package: - Type: Positive - - Setup: Create basic package (no special metadata in package list). - Host said package on ftp server. - - Test: Install predefined package via fully qualified URI. - - PF Criteria: The package must be fetched. The contents of the - package must be installed in the defined prefix and the permissions - and the mode must match the created package. The package will be - deleted after the installation is complete. - - Remote package install (HTTP, absolute): - - Type: Positive - - Setup: Create basic package (no special metadata in package list). - Host said package on webserver. - - Test: Install predefined package via fully qualified URI. - - PF Criteria: The package must be fetched. The contents of the - package must be installed in the defined prefix and the permissions - and the mode must match the created package. The package will be - deleted after the installation is complete. - - Remote package install (FTP, package name): - - Type: Positive - - Setup: Create basic package (no special metadata in package list). - Host said package on webserver. - - Test: Install predefined package. - - PF Criteria: The package must be fetched. The contents of the - package must be installed in the defined prefix and the permissions - and the mode must match the created package. The package will be - deleted after the installation is complete. - - Remote package install (HTTP, package name): - - Type: Positive - - Setup: Create basic package (no special metadata in package list). - Host said package on webserver. - - Test: Install predefined package. - - PF Criteria: The package must be fetched. The contents of the - package must be installed in the defined prefix and the permissions - and the mode must match the created package. The package will be - deleted after the installation is complete. - - Remote package install (pre-existing package): - - Type: Positive - - Setup: Create basic package (no special metadata in package list). - - Test: Install pre-existing package. - - PF Criteria: The package will not be fetched. The contents of the - package must be installed in the defined prefix and the permissions - and the mode must match the created package. The package will be - deleted after the installation is complete. - - Remote package install (lacking space): - - Type: Negative - - Setup: Create a large package (or a small memory disk). - - Test: Attempt to install package. - - PF Criteria: The package will be partially fetched and fail. Thus, - the installation will fail as well. The package will be deleted. - - Remote package install (unsupported URI scheme): - - Type: Negative - - Setup: n/a - - Test: Attempt to install package via non-fetch(3) supported URI - (say, gopher:// ?) scheme. - - PF Criteria: The package fetch will fail and the install will fail - with the utility claiming that the URI isn't supported, or something - of the like. - - Already Installed package: - - Type: Negative - - Setup: Install a package. - - Test: Attempt to reinstall package. - - PF Criteria: The package will not be installed. - - Already Installed package: - - Type: Positive - - Setup: Install a package. - - Test: Attempt to reinstall package with force option. - - PF Criteria: The package will be installed. + - Setup: Create basic comments and description files; create dummy + files; add dummy files to package list. + - Test: Attempt to create package. + - PF Criteria: Package will be created with a package list containing + the dummy files; the associated comments and description + files will be added to the package with the appropriate + modes (00644). - Local package install (package missing metadata): - - Type: Negative - - Setup: Create tarball missing required pieces (+CONTENTS, etc). - - Test: Attempt to install predefined package. - - PF Criteria: The payload contained in the package will not be - installed as the metadata is missing. - - Missing package: - - Type: Negative - - Setup: n/a - - Test: Attempt to install a non-existent package. - - PF Criteria: The installation will fail. - - Missing dependency: - - Type: Negative - - Setup: Create package A, dependent on missing package B - - Test: Attempt to install package A. - - PF Criteria: The installation will fail because of the unfulfilled - dependency requirement via package B. - - Conflicting package: - - Type: Negative - - Setup: Create package A and package B, s.t. package A conflicts with - package B. - - Test: Install package B. Attempt to install package A. - - PF Criteria: package B will successfully install, but package A will - be rejected due to the conflict between package A and package B - noted in package A. - - Incomplete payload: - - Type: Negative - - Setup: Create package, but modify +CONTENTS to add more entries than - are actually present in the package. - - Test: Attempt to install package. - - PF Criteria: package will fail to install because of missing payload - entries. All of the files staged or installed will be rolled back. - - Corrupt payload: - - Type: Negative - - Setup: Create package. Flip some bits in one of the files, - effectively changing the unique signature. Repackage. - - Test: Attempt to install package. - - PF Criteria: package will fail to install because of a checksum - mismatch. All of the files staged or installed will be rolled back. - Tertiary functionality - Install into prefix... - - Precondition: the user must request that the package be installed in - a non-standard location. + Backup package... - ... package exists: - - Setup: Create package which would install in /usr/local by default. - Create a directory called /tmp/package . - - Test: Install package in /tmp/package . - - PF Criteria: package contents will be installed in a path rooted at - /tmp/package + ... package already exists: + - Setup: Install package A. + - Test: Attempt to backup package A to B.tbz . Do not add an mtree file. + - PF Criteria: Resources permitting, package A will be backed up to + B.tbz . The contents of the package (sans metadata) will + match the contents on disk. - ... non-existent prefix: - - Setup: Create package which would install in /usr/local by default. - - Test: Attempt to install package in /i/dont/exist . - - PF Criteria: package will fail to install because /i/dont/exist - doesn't exist :). - - Keep remote package... - - Precondition: the specified package has a valid libfetch supported - URI (ftp://, http://), or a package origin / basename is specified - with remote fetch requested. - - ... package exists: - - Setup: Create basic package (no special metadata in package list). - Host said package on webserver. - - Test: Install package; request that it be retained after the install. - - PF Criteria: package will be installed; package will be retained - after installation is complete. - - ... missing package on remote endpoint: + ... non-existent package: - Setup: n/a - - Test: Install package from non-existent URI. - - PF Criteria: package will not be installed; package will not exist - on the disk. - - ... unsupported URI scheme: - - Type: Negative - - Setup: n/a - - Test: Attempt to install package via non-fetch(3) supported URI - (say, gopher:// ?) scheme. - - PF Criteria: The package fetch will fail and the install will fail - with the utility claiming that the URI isn't supported, or something - of the like. Package will not exist on the disk. - + - Test: Attempt to backup non-existent package C . + - PF Criteria: package will fail to backup package C because it isn't + already installed on the system. From owner-p4-projects@FreeBSD.ORG Mon May 10 23:42:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE4A71065672; Mon, 10 May 2010 23:42:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2CB9106566B for ; Mon, 10 May 2010 23:42:32 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe14.swipnet.se [212.247.155.161]) by mx1.freebsd.org (Postfix) with ESMTP id 33C5F8FC1F for ; Mon, 10 May 2010 23:42:31 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=qL1Cqo4YLXoA:10 a=Q9fys5e9bTEA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=6I5d2MoRAAAA:8 a=ALcXzfPqg_cNW9f1jGkA:9 a=jJncDVITzPSTuolcfI9HCtGrR1sA:4 a=PUjeQqilurYA:10 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe14.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 622819937 for perforce@freebsd.org; Tue, 11 May 2010 01:42:30 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Tue, 11 May 2010 01:39:44 +0200 User-Agent: KMail/1.12.4 (FreeBSD/8.0-STABLE; KDE/4.3.4; amd64; ; ) References: <201005102335.o4ANZnb9090023@repoman.freebsd.org> In-Reply-To: <201005102335.o4ANZnb9090023@repoman.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201005110139.44220.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 178075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2010 23:42:33 -0000 On Tuesday 11 May 2010 01:35:49 Hans Petter Selasky wrote: > http://p4web.freebsd.org/@@178075?ac=10 > The following change is about computing the correct delay in the frame-list: > if ((xfer->endpoint->is_synced == 0) || > - (buf_offset < ((xfer->nframes + 7) / 8))) { > + (buf_offset < (((xfer->nframes << shift) + 7) / 8))) { > /* > * If there is data underflow or the pipe queue is empty we > * schedule the transfer a few frames ahead of the current > @@ -2844,7 +2855,7 @@ > */ > xfer->isoc_time_complete = > usb_isoc_time_expand(&sc->sc_bus, nframes) + buf_offset + > - ((xfer->nframes + 7) / 8); > + (((xfer->nframes << shift) + 7) / 8); > > /* get the real number of frames */ > > From owner-p4-projects@FreeBSD.ORG Mon May 10 23:49:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DE8B1065678; Mon, 10 May 2010 23:49:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 524F11065676 for ; Mon, 10 May 2010 23:49:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F99D8FC48 for ; Mon, 10 May 2010 23:49: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 o4ANn3U2090940 for ; Mon, 10 May 2010 23:49:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4ANn33q090938 for perforce@freebsd.org; Mon, 10 May 2010 23:49:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 10 May 2010 23:49:03 GMT Message-Id: <201005102349.o4ANn33q090938@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 178077 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, 10 May 2010 23:49:03 -0000 http://p4web.freebsd.org/@@178077?ac=10 Change 178077 by hselasky@hselasky_laptop001 on 2010/05/10 23:48:15 USB WLAN: - update RUN firmware - patch obtained from: Akinori Affected files ... .. //depot/projects/usb/src/sys/contrib/dev/run/rt2870.fw.uu#2 edit Differences ... ==== //depot/projects/usb/src/sys/contrib/dev/run/rt2870.fw.uu#2 (text+ko) ==== @@ -1,90 +1,108 @@ -# Copyright (c) 2007, Ralink Technology Corporation +# Copyright (c) 2007, Ralink Technology Corporation # All rights reserved. # -# Redistribution. Redistribution and use in binary form, without -# modification, are permitted provided that the following conditions are +# Redistribution. Redistribution and use in binary form, without +# modification, are permitted provided that the following conditions are # met: -# -# * Redistributions must reproduce the above copyright notice and the -# following disclaimer in the documentation and/or other materials -# provided with the distribution. +# +# * Redistributions must reproduce the above copyright notice and the +# following disclaimer in the documentation and/or other materials +# provided with the distribution. # * Neither the name of Ralink Technology Corporation nor the names of its # suppliers may be used to endorse or promote products derived from this -# software without specific prior written permission. -# * No reverse engineering, decompilation, or disassembly of this software +# software without specific prior written permission. +# * No reverse engineering, decompilation, or disassembly of this software # is permitted. -# -# Limited patent license. Ralink Technology Corporation grants a world-wide, -# royalty-free, non-exclusive license under patents it now or hereafter -# owns or controls to make, have made, use, import, offer to sell and -# sell ("Utilize") this software, but solely to the extent that any -# such patent is necessary to Utilize the software alone, or in -# combination with an operating system licensed under an approved Open -# Source license as listed by the Open Source Initiative at -# http://opensource.org/licenses. The patent license shall not apply to -# any other combinations which include this software. No hardware per +# +# Limited patent license. Ralink Technology Corporation grants a world-wide, +# royalty-free, non-exclusive license under patents it now or hereafter +# owns or controls to make, have made, use, import, offer to sell and +# sell ("Utilize") this software, but solely to the extent that any +# such patent is necessary to Utilize the software alone, or in +# combination with an operating system licensed under an approved Open +# Source license as listed by the Open Source Initiative at +# http://opensource.org/licenses. The patent license shall not apply to +# any other combinations which include this software. No hardware per # se is licensed hereunder. -# -# DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +# +# DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH # DAMAGE. -begin 644 rt2870.fw -M____`A`H`A`R`A!X`A)G`A)H`A*'`A*,$A*((@(620(7'P(3=P(2C3`%!B`- -M`Q(7P2*0`8S@,.,;Y4PPX`1_0(`"?P"0$"_O\)`!C'0(\.20`:?PD`&,X##@ -M')`!@."T`A6CX+0!$)`!A."T@0F0`8QT`?`2#<@BD`04X"#G`P(29I!P$N#U -M5I`$!.`2"IT0MS$0X%`1!%$1#5(1#5,1#5013E41?G`1J7$1UW(2'7,2/H`` -M`!)F(`(#,`,=?0*O5A(+D9`$%'2`\.20`D7?57D'`0X/]T1R57^,;OQI!P$>#_=$@E5_C&[\;D_:]6$@N1D`04 -M=(#PY)!P$_#E5O1P`P(29@(27^5'9`=@"^5'9`A@!>5'M`D(D'`1X%0/]3KE -M1[0)".4ZM`,#Y/5&Y/VO5A(+D=($(I!P$.#^D'`1X/WM^.;U5_VO5A(+D9`$ -M%'2`\.20#][?6"CH/@]5?]KU82"Y&0 -M!!1T@/#DD'`3\.56]'`#`A)F`A)?D!`"X+1P'J/@M#`9D`4(X$0!\/V0!07@ -M5/OP1`3P[53^D`4(\.3U3O5/=3K_K5>O5A(+D9`$%'2`\.20!$`?`B(N53Y4=D!F`#`A-$@!OE2,14#_5#Y4K$5`_U -M0N5,Q%0/]5[E1V0&<&930P^`885)0X5+0H5-7N5'9`9P4H`;Y4G$5`_U0^5+ -MQ%0/]4+E3<14#_5>Y4=D!G`UY4-4#T00]4.`*^5'M`0&4U[[=4()Y4>T!09# -M7@1U0@GE1[0&$.5#5`]$,/5#@`;22X`"TDSD]27E0L14\/_E0U0/3_5?D'!$ -M\*/E7O"CY4KPH^5(\*/E3/"CY43PH^5"\*/E0_#28"+E1V`0),!P`Q(6*1(3 -MC,*OP@32KR+"KY`$%.!4#F`$TAB`".5.14\D_Y(8TJ^0!!3@HN22&70>\.5? -M5`_U+>4E5?5##_OS`1Y25P!74E#(`"%272;-)M@`_E -M7S#F!L)LTFV`!-)LPFWE1V0#<"$P2P;";-)M@!CE)7`#,$P1PDSE)7`%=24' -M@`(5)=)LTFWE1[0)%.5$(.,+Y3ID`F`%Y3JT`P3";-)MD'!&Y2WP(&D'Y5X@ -MX`*R:"!K!^5>(.$"LFH@;0?E7B#B`K)LD'!'Y2WP=2Y`(&D$HFB`)C!H!N5& -MHN*`'>5>(.($?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_DG.2!4_O#E0\14#Q1@%"3^8",D`V`#`A88D`(HX#!'#X`'D`(HX"!' -M!E3^\`(6&$0!\`(6&.5&,.($?P&``G\`D`(HX%3^3_`"%ACE1V0'8`_E1V0( -M8`GE1V0)8`,"%ACD]2>0`BG@5/SPY3H48"T48"X48#8D_&!?)/E@'R0.<&GE -M1A,35#]U\`.$K_`@1P1^`8`"?@#O;B3_@$6B1X!!Y48PX@/3@"?#@"3E1C#B -M#50XPY0P4`9^`'\!@`1^`'\`($<$?0&``GT`[VU.)/^2.*)'LY(Y@!GE1C#B -M`].``<.2.:)'LY(X@`>B1[.2.)(YD`(HX%3\12?PD'"4Z -M\"+DD`(I\#!'!*]%@`3E1?3_D`(H[_`BCU#262*/5-)8(N3U8L*OY5$48$84 -M8&(D`F`#`A<#TEEU50&0`J+@5'_PH^`@YR*0!#3@M`(;H^"T`A:CX+0"$7\@ -M$A8_D!`$X%3S\'51`8!SY5!P!75B`X!JD!(`X%0#50<`*`1I`"H^`@YCN0!#?@9")P,Y`!BG1^\)`!EO"0$@1T"O"0$RC@ -M5/#PH^!4\/"CX%3Z\)`$`>!4^?!U8@%U50+D]5&`">50<`5U8@/U4>5B8!7" -M`>3U4<)9K6*O0!(7C>5BM`,"T@/2KR+"KS`!$N20`9;P]5'"6<(!?0*O0!(7 -MC>52%&`)!'!,=5(!=54#D`0!X$0.\)`3*.!$#_"CX$0/\*/@1`7PD!($=`/P -MD`*BX$3`\)`0!.!$#/#D]5+U53`""\("?0&O01(7C8`"P@/DD`&6\-*O(N_T -M8"WD_G04+O6"Y#1P]8/@M/\9=!0N]8+D-'#U@^_P=!PN]8+D-'#U@^WP(@Z^ -M!-4B(B*0<"K@,.%-PJ^0<"C@D!`<\)!P*>"0$!WPD'`JX)`0'O"0$!S@]6*0 -M$![@(.'SD!`"T"`9U3@%U3X20`D_Y)'(I`$!.`EX"1=]5>0T#`B0#T_Y!P$.!?_Y!P$>!5)T^0#_D'`9X/[O7I`"*?`P1P2O)X`$ +MY2?T_Y`"*._PY5;T<`,"$RD"$R*0#][?CF]5?]KU82"Y&0!!1T +M@/#DD'`3\.56]'`#`A,I`A,BD'`0X/Z0WU@HZ#X/57_:]6$@N1D`04 +M=(#PY)!P$_#E5O1P`P(3*0(3(I`0`.#U5Y`0`N#U6*/@]5GE6+1P'N59M#`9 +MD`4(X$0!\/V0!07@5/OP1`3P[53^D`4(\.3U3O5/=3K_=3S_K5>O5A(+D9`$ +M%'2`\.20!$`?`B +M(N53!5 +M)_^0D`(I\#!'!*\G@`3E)_3_D`(H[_#"%"+" +M2\),Y402"IT3I0`4,P04+P@4#Q`3N2`3V6`3ZJ```!0UA4A#A4I"A4Q>Y4=D +M!F`#`A0U@!OE2,14#_5#Y4K$5`_U0N5,Q%0/]5[E1V0&<&%30P^`7(5)0X5+ +M0H5-7N5'9`9P38`;Y4G$5`_U0^5+Q%0/]4+E3<14#_5>Y4=D!G`PY4-4#T00 +M]4.`)N5'9`1@!>5'M`4&0UX$=4()Y4>T!A#E0U0/1##U0X`&TDN``M),Y/4E +MY4+$5/#_Y4-4#T_U7])@(M(5Y4\.5?5`_U +M+>4E5?5##_OS`1Y25P!74E#(`"%272;-)M@`_E7S#F +M!L)LTFV`!-)LPFWE1V0#<"$P2P;";-)M@!CE)7`#,$P1PDSE)7`%=24'@`(5 +M)=)LTFWE1[0)%.5$(.,+Y3ID`F`%Y3JT`P3";-)MY4>T"A/E.K0!!L)LTFV` +M".4Z<`32;,)M(&D'Y5X@X`*R:"!K!^5>(.$"LFH@;0?E7B#B`K)L=2Y`(&D$ +MHFB`)C!H!N5&HN*`'>5>(.($?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_DG.2 +M5>(.$$?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_ +MDG&2<)`0`."0$"SPD!`#X,.4,$`4HG&2=Z)PDG;E+A,35#_U+L)WTG:0$"_E +M+O#E1V0&<#F0`BG@5/[PY4/$5`\48`PD_F`,)`-P$\(X@`_2.(`+Y48PX@/3 +M@`'#DC@P1P6O)P(7?N4G]/\"%W[E1V0'8`_E1V0(8`GE1V0)8`,"%OV0`BG@ +M5/SPY3H48"(48"448"TD_&!))/E@%"0.<%#E1A,35#]U\`.$Y?`D_X`ZTCG" +M.(`^Y48PX@/3@!W#@!KE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(XPCF` +M$^5&,.(#TX`!PY(YPCB`!,(XPCDP1P2O)X`$Y2?T_P(7?N5'9`Q@!N5'9`MP +M>I`"*>!4_?#E.A1@(!1@(11@*R3\8$4D^6`2)`YP2N5&$Q-4/W7P`X3E\(`I +MTCF`.N5&,.(#TX`!PY(Y@"WE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(Y +M@`_E1C#B`].``<.2.8`"PCDP1P2O)X`$Y2?T_Y`"*._P(N5'M`L0D`(IX%3K +M\.4G5.M%1?4G(N20`BGP,$<$KT6`!.5%]/^0`BCO\"*/4-)9(H]4TE@BY/5B +MPJ_E411@2!1@9B0"8`,"&-326755`9`"HN!4?_"CX"#G(Y`$-."T`ARCX+0" +M%Z/@M`(2?R`2%Z^0$`3@5//P=5$!`AC4Y5!P!G5B`P(8U)`2`.!4`W`2?R`2 +M%Z^0`J+@5+_P=5$"`AC4Y5!P`P(8SY`"H^`PY@,"&,N0!#?@9")@`P(8RY`! +MBG1^\)`!EO"0$@1T"O#E6+1R%>59M#40Y)`%`/"C=`CPHW0!\'0#\'\!$@TJ +MD!,HX)!P&O"0$RG@D'`;\)`3*.!4\/"CX%3P\.59M#44Y3ST8`:CX%3S@!20 +M$RK@5/OP@!3E//20$RI@".!4\D4\\(`$X%3Z\)`$`>!4_?!U8@%U50+D]5&` +M">50<`5U8@/U4>5B8!7"`>3U4<)9K6*O0!(9E.5BM`,"T@/2KR+"KS`!$N20 +M`9;P]5'"6<(!?0*O0!(9E.52%&`,!&`#`AF1=5(!=54#D`0!X$0.\)!P&N"0 +M$RCPD'`;X)`3*?#E//1@".4\1`&C\(`&D!,J=`7PD!($=`/PY5BT"0$!WPD'`JX)`0'O"0$!S@]6*0$![@(.'SD!`O___P(0*`(0,@(0>`(3*@(3*P(32@(33Q(32R("%[D"&/`"%$@"$X,P!08@ +M#0,2&<@BD`&,X##C&^5,,.`$?T"``G\`D!`O[_"0`8QT"/#DD`&G\)`!C.`P +MX!R0`8#@M`(5H^"T`1"0`83@M($)D`&,=`'P$@W=(I`$%.`@YP,"$RF0#U/.20!D"&`$X+0@!G5.`W5/(.3U)R*0 +M`D7?57D'`0X/]T1R57^,;OQI!P$>#_=$@E5_C&[\;D +M_:]6$@NJD`04=(#PY)!P$_#E5O1P`P(3*0(3(N5'9`=@'>5'9`A@%^5'9`E@ +M$>5'9`I@"^5'9`M@!>5'M`P(D'`1X%0/]3KE1[0)".4ZM`,#Y/5&Y4>T"@CE +M.K0!`^3U1N3]KU82"ZK2!"*0"0 +M0`BG@_Y!P&>#^[UZ0`BGP,$<$KR>` +M!.4G]/^0`BCO\.56]'`#`A,I`A,BD'`0X/Z0WXYO57_:]6$@NJD`04 +M=(#PY)!P$_#E5O1P`P(3*0(3(I!P$.#^D'`1X/WM]8*.@^#U5_VO5A(+JI`$ +M%'2`\.200$`+@]5BCX/59Y5BTO5A(+JI`$%'2`\.200<"7@1`'P +M(B+E4W`:,&`)LDTP300%1L($Y4]%3F`(Y4\53W`"%4XB(L)"TR(P%#"0#_D'`9X/[O7I`"*?`P1P2O)X`$Y2?T_Y`"*._PPA0B +MPDO"3.5$$@JV$Z4`%#,$%"\(%`\0$[D@$]E@$^J@```4-85(0X5*0H5,7N5' +M9`9@`P(4-8`;Y4C$5`_U0^5*Q%0/]4+E3,14#_5>Y4=D!G!A4T,/@%R%24.% +M2T*%35[E1V0&<$V`&^5)Q%0/]4/E2\14#_5"Y4W$5`_U7N5'9`9P,.5#5`]$ +M$/5#@";E1V0$8`7E1[0%!D->!'5"">5'M`80Y4-4#T0P]4.`!M)+@`+23.3U +M)>5"Q%3P_^5#5`]/]5_28"+2%>5')/5@"R3+8`$$A1JPA7" +MK\($TJ\BPJ^0!!3@5`Y@!-(8@`CE3D5/)/^2&-*OD`04X*+DDAET'O#E7U0/ +M]2WE)7`3,!@%Y5\@Y0LP&1GE7U0P_[\P$>4E<`5U)0R``A4ETFS2;8`/Y5\P +MY@;";-)M@`32;,)MY4=D`W`A,$L&PFS2;8`8Y25P`S!,$<),Y25P!74E!X`" +M%272;-)MY4>T"13E1"#C"^4Z9`)@!>4ZM`,$PFS2;>5'M`H3Y3JT`0;";-)M +M@`CE.G`$TFS";2!I!^5>(.`"LF@@:P?E7B#A`K)J(&T'Y5X@X@*R;'4N0"!I +M!*)H@"8P:`;E1J+B@!WE7B#B!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D_Y)S +MDG(@:P2B:H`F,&H&Y4:BXH`=Y5X@X`1_`8`"?P#E1E3P_K[P!'X!@`)^`.YO +M)/^2=9)T(&T$HFR`)N5'9`IP(C!L!N5&HN.`%^4ZM`$&Y4:BXX`TY48@Y`,P +MY0/3@`'#@"8P;`;E1J+B@!WE7B#A!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D +M_Y)QDG"0$`#@D!`L\)`0`^##E#!`%*)QDG>B<))VY2X3$U0_]2["=])VD!`O +MY2[PY4=D!G`YD`(IX%3^\.5#Q%0/%&`,)/Y@#"0#`!.4G]/\"%W[E1V0,8`;E1V0+ +M<'J0`BG@5/WPY3H48"`48"$48"LD_&!%)/E@$B0.<$KE1A,35#]U\`.$Y?"` +M*=(Y@#KE1C#B`].``<.2.8`MY48PX@U4.,.4,%`&?@!_`8`$?@!_`.Y/)/^2 +M.8`/Y48PX@/3@`'#DCF``L(Y,$<$KR>`!.4G]/^0`BCO\"+E1[0+$)`"*>!4 +MZ_#E)U3K147U)R+DD`(I\#!'!*]%@`3E1?3_D`(H[_`BCU#262*/5-)8(N3U +M8L*OY5$48$@48&8D`F`#`AC4TEEU50&0`J+@5'_PH^`@YR.0!#3@M`(CX+0"$G\@$A>OD!`$X%3S\'51`0(8U.50<`9U8@,"&-20$@#@5`-P$G\@ +M$A>OD`*BX%2_\'51`@(8U.50<`,"&,^0`J/@,.8#`AC+D`0WX&0B8`,"&,N0 +M`8IT?O"0`9;PD!($=`KPY5BT!$#O"0X"#A\Y`0'."0<"CPD!`=X)!P +M*?"0$![@D'`J\#!*!Y!P).!$`?#"!=*O(B(B```````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` @@ -128,54 +205,6 @@ M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M``````````````````````````````````````````````````````````R4 -M/____P(0*`(0,@(0>`(29P(2:`(2AP(2C!(2B"("%DD"%Q\"$W<"$HTP!08@ -M#0,2%\$BD`&,X##C&^5,,.`$?T"``G\`D!`O[_"0`8QT"/#DD`&G\)`!C.`P -MX!R0`8#@M`(5H^"T`1"0`83@M($)D`&,=`'P$@W=(I`$%.`@YP,"$F:0!D"&`(X&0@8`,"$F9U3@-U3R`BD'`1X"3_DD!4#_4Z -MY4>T"0CE.K0#`^3U1N3]KU82"ZK2!"*0#][?CF]5?]KU82"ZJ0 -M!!1T@/#DD'`3\.56]'`#`A)F`A)?D'`0X/Z0WU@HZ#X/57_:]6$@NJ -MD`04=(#PY)!P$_#E5O1P`P(29@(27Y`0`N"TO5A(+JI`$%'2`\.200<"7@1`'P(B+E4W`:,&`)LDTP300% -M1L($Y4]%3F`(Y4\53W`"%4XB(L)"TR(BPDO"3.5$$@JV$J\`$T($$SX($QD0 -M$L,@$N-@$O2@```31(5(0X5*0H5,7N5'9`9@`P(31(`;Y4C$5`_U0^5*Q%0/ -M]4+E3,14#_5>Y4=D!G!F4T,/@&&%24.%2T*%35[E1V0&<%*`&^5)Q%0/]4/E -M2\14#_5"Y4W$5`_U7N5'9`9P->5#5`]$$/5#@"OE1[0$!E->^W5"">5'M`4& -M0UX$=4()Y4>T!A#E0U0/1##U0X`&TDN``M),Y/4EY4+$5/#_Y4-4#T_U7Y!P -M1/"CY5[PH^5*\*/E2/"CY4SPH^5$\*/E0O"CY4/PTF`BY4=@$"3`<`,2%BD2 -M$XS"K\($TJ\BPJ^0!!3@5`Y@!-(8@`CE3D5/)/^2&-*OD`04X*+DDAET'O#E -M7U0/]2WE)7`3,!@%Y5\@Y0LP&1GE7U0P_[\P$>4E<`5U)0R``A4ETFS2;8`/ -MY5\PY@;";-)M@`32;,)MY4=D`W`A,$L&PFS2;8`8Y25P`S!,$<),Y25P!74E -M!X`"%272;-)MY4>T"13E1"#C"^4Z9`)@!>4ZM`,$PFS2;9!P1N4M\"!I!^5> -M(.`"LF@@:P?E7B#A`K)J(&T'Y5X@X@*R;)!P1^4M\'4N0"!I!*)H@"8P:`;E -M1J+B@!WE7B#B!'\!@`)_`.5&5/#^OO`$?@&``GX`[F\D_Y)SDG(@:P2B:H`F -M,&H&Y4:BXH`=Y5X@X`1_`8`"?P#E1E3P_K[P!'X!@`)^`.YO)/^2=9)T(&T$ -MHFR`)C!L!N5&HN*`'>5>(.$$?P&``G\`Y494\/Z^\`1^`8`"?@#N;R3_DG&2 -M<)`0`."0$"_PD!`#X,.4,$`4HG&2=Z)PDG;E+A,35#_U+L)WTG:0$"_E+O#E -M1V0&<$R0`BG@5/[PY4/$5`\48!0D_F`C)`-@`P(6&)`"*.`P1P^`!Y`"*.`@ -M1P94_O`"%AA$`?`"%ACE1C#B!'\!@`)_`)`"*.!4_D_P`A88Y4=D!V`/Y4=D -M"&`)Y4=D"6`#`A88Y/4GD`(IX%3\\.4Z%&`M%&`N%&`V)/Q@7R3Y8!\D#G!I -MY483$U0_=?`#A*_P($<$?@&``GX`[VXD_X!%HD>`0>5&,.(#TX`GPX`DY48P -MX@U4.,.4,%`&?@!_`8`$?@!_`"!'!'T!@`)]`.]M3B3_DCBB1[.2.8`9Y48P -MX@/3@`'#DCFB1[.2.(`'HD>SDCB2.9`"*.!4_$4G\)!PG.4Z\*/E1_"0<$'E -M.O`BY)`"*?`P1P2O18`$Y47T_Y`"*._P(H]0TEDBCU326"+D]6+"K^51%&!& -M%&!B)`)@`P(7`])9=54!D`*BX%1_\*/@(.!$#O"0$RC@1`_PH^!$#_"CX$0%\)`2!'0# -M\)`"HN!$P/"0$`3@1`SPY/52]54P`@O"`GT!KT$2%XV``L(#Y)`!EO#2KR+O -M]&`MY/YT%"[U@N0TX"#A\Y`0'."0<"CPD!`=X)!P*?"0$![@D'`J\#!*!Y!P).!$`?#"!=*O -M(B(B```````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` @@ -197,29 +226,7 @@ M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````" -"F\`` +M```````````````````````````````````````````````````````````1 +"=X$` ` end From owner-p4-projects@FreeBSD.ORG Tue May 11 00:04:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6688F1065674; Tue, 11 May 2010 00:04:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2B28D1065672 for ; Tue, 11 May 2010 00:04:08 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe02.swip.net [212.247.154.33]) by mx1.freebsd.org (Postfix) with ESMTP id AE1C28FC12 for ; Tue, 11 May 2010 00:04:07 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=qL1Cqo4YLXoA:10 a=Q9fys5e9bTEA:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=o1ClsfTC3BFJSMjbj2MA:9 a=AGp1dEPD4qV1btnhOEw0VE-rYb4A:4 a=PUjeQqilurYA:10 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe02.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 1376145741 for perforce@freebsd.org; Tue, 11 May 2010 02:04:05 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Tue, 11 May 2010 02:01:19 +0200 User-Agent: KMail/1.12.4 (FreeBSD/8.0-STABLE; KDE/4.3.4; amd64; ; ) References: <201005102335.o4ANZnb9090023@repoman.freebsd.org> In-Reply-To: <201005102335.o4ANZnb9090023@repoman.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'( =?iso-8859-1?q?=3B=5FIjlA=3A=0A=09hGE=2E=2EEw?=, =?iso-8859-1?q?XAQ*o=23=5C/M=7ESC=3DS1-f9=7BEzRfT=27=7CHhll5Q=5Dha5Bt-s=7Co?= =?iso-8859-1?q?TlKMusi=3A1e=5BwJl=7Dkd=7DGR=0A=09Z0adGx-x=5F0zGbZj=27e?=(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201005110201.19384.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 178075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2010 00:04:08 -0000 On Tuesday 11 May 2010 01:35:49 Hans Petter Selasky wrote: > usb_hub.c: > > - overload the "bandwidth_reclaimed" bit-flag, which should > only be used for the UHCI. When used with the EHCI it > means we have allocated bandwidth for a high speed endpoint. This bit is > checked when allocating and freeing to avoid duplicate operations. At > least the close method of a USB transfer type can be called two times in a > row, with only one open, due to the current design. > s/close/xxx_device_done/ Close should always be paired with open. What I had in mind was the ehci_device_done() method, which can be called multiple times. And hence neither of any allocations/freeing is done from that function, the double-call check can be removed (is superfluous) --HPS From owner-p4-projects@FreeBSD.ORG Tue May 11 00:04:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24B0C1065746; Tue, 11 May 2010 00:04:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DDAB11065744 for ; Tue, 11 May 2010 00:04:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CC90E8FC0A for ; Tue, 11 May 2010 00:04: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 o4B04IvS093044 for ; Tue, 11 May 2010 00:04:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4B04IO0093042 for perforce@freebsd.org; Tue, 11 May 2010 00:04:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 11 May 2010 00:04:18 GMT Message-Id: <201005110004.o4B04IO0093042@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 178078 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, 11 May 2010 00:04:19 -0000 http://p4web.freebsd.org/@@178078?ac=10 Change 178078 by hselasky@hselasky_laptop001 on 2010/05/11 00:03:19 Back out double-call check from P4 change 178075. This should not be possible from open/close after all. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#44 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#44 (text+ko) ==== @@ -1230,11 +1230,6 @@ if (udev->flags.usb_mode != USB_MODE_HOST) return; /* not supported */ - if (xfer->flags_int.bandwidth_reclaimed != 0) - return; /* bandwidth already allocated */ - - xfer->flags_int.bandwidth_reclaimed = 1; - xfer->endpoint->refcount_bw++; if (xfer->endpoint->refcount_bw != 1) return; /* already allocated */ @@ -1315,11 +1310,6 @@ if (udev->flags.usb_mode != USB_MODE_HOST) return; /* not supported */ - if (xfer->flags_int.bandwidth_reclaimed == 0) - return; /* bandwidth already freed */ - - xfer->flags_int.bandwidth_reclaimed = 0; - xfer->endpoint->refcount_bw--; if (xfer->endpoint->refcount_bw != 0) return; /* still allocated */ From owner-p4-projects@FreeBSD.ORG Tue May 11 06:13:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 519121065673; Tue, 11 May 2010 06:13:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0BD84106566B for ; Tue, 11 May 2010 06:13:29 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EB43C8FC0C for ; Tue, 11 May 2010 06:13: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 o4B6DSQ9047862 for ; Tue, 11 May 2010 06:13:28 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4B6DS7k047860 for perforce@freebsd.org; Tue, 11 May 2010 06:13:28 GMT (envelope-from gcooper@FreeBSD.org) Date: Tue, 11 May 2010 06:13:28 GMT Message-Id: <201005110613.o4B6DS7k047860@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 178080 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, 11 May 2010 06:13:29 -0000 http://p4web.freebsd.org/@@178080?ac=10 Change 178080 by gcooper@starr on 2010/05/11 06:12:41 IFC Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#5 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/tzdata/northamerica#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/tzdata/zone.tab#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/AUTHORS#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/COPYING#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/ChangeLog#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/FREEBSD-Xlist#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/FREEBSD-upgrade#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/README#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/THANKS#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/TODO#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/po/LINGUAS#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/po/Makevars#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/po/POTFILES.in#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/po/cs.po#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/mythread.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/sysdefs.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_config.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_cpucores.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_cpucores.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_exit.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_exit.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_gettext.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_integer.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_open_stdxxx.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_open_stdxxx.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_physmem.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_physmem.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_progname.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/common/tuklib_progname.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/base.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/bcj.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/block.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/check.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/container.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/delta.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/filter.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/hardware.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/index.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/index_hash.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/lzma.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/stream_flags.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/subblock.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/version.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/api/lzma/vli.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/check.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/check.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_fast.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_small.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_table.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_table_be.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_table_le.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_tablegen.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc32_x86.S#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_fast.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_small.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_table.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_table_be.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_table_le.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_tablegen.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc64_x86.S#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/crc_macros.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/check/sha256.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/alone_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/alone_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/alone_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/auto_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_buffer_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_buffer_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_header_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_header_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/block_util.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/chunk_size.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/common.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_buffer_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_decoder_memusage.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_encoder_memusage.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_preset.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/easy_preset.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_buffer_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_buffer_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_common.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_flags_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/filter_flags_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/hardware_physmem.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/index_hash.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_buffer_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_buffer_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_flags_common.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_flags_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_flags_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/stream_flags_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/vli_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/vli_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/common/vli_size.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_common.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/delta/delta_private.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_encoder_hash.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lz/lz_encoder_mf.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/fastpos.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/fastpos_table.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma2_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma2_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma2_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma2_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/price.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/price_table.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/price_tablegen.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/range_common.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/range_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/rangecoder/range_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/arm.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/armthumb.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/ia64.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/powerpc.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_coder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_coder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/simple_private.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/sparc.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/simple/x86.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_decoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_decoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_encoder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/liblzma/subblock/subblock_encoder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/lzmainfo/lzmainfo.1#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/lzmainfo/lzmainfo.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/args.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/args.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/coder.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/coder.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/file_io.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/file_io.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/hardware.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/hardware.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/list.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/list.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/main.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/main.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/message.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/message.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/options.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/options.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/private.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/signals.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/signals.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/suffix.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/suffix.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/util.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/util.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xz/xz.1#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xzdec/xzdec.1#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/xz/src/xzdec/xzdec.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/ja_JP.eucJP/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/anchie.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/decke.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/dougb.key#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/jacula.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys-developers.sgml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/pgpkeys.ent#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/romain.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/rstone.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/pgpkeys/sahil.key#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/share/sgml/mirrors.xml#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libarchive/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/gen/raise.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/liblzma/config.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/rescue/rescue/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man1/builtin.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/pthread_cond_timedwait.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man3/pthread_condattr.3#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/iscsi_initiator.4#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/man/man4/sge.4#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/boot/common/module.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/sge/if_sgereg.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfs/nfskpiport.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/subr_uio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/param.h#4 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/swap_pager.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_contig.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_fault.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_object.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/case2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/case3.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/builtins/var-assign2.0#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/errors/assignment-error1.0#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/case1.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/case2.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/bin/sh/parser/heredoc3.0#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libc/gen/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/lib/libc/gen/test-fnmatch.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/ar/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/bsdcpio.1#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/cmdline.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/cpio.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/cpio.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/err.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/err.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/line_reader.c#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/line_reader.h#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/matching.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/matching.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/pathmatch.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/pathmatch.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/cpio/test/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/less/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/less/lesspipe.sh#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/lzmainfo/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/config_freebsd.h#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/tar/test/Makefile#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/xz/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.bin/xzdec/Makefile#1 branch .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/bluetooth/bthidd/hid.c#2 integrate .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pmcstat/pmcpl_calltree.c#4 integrate Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.645 2010/04/23 11:07:43 flz Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.646 2010/05/10 15:28:44 mm Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1113,7 +1113,7 @@ lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ - lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/eval.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.81 2010/05/05 21:48:40 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.82 2010/05/08 14:00:01 jilles Exp $"); #include #include @@ -1089,8 +1089,7 @@ int commandcmd(int argc, char **argv) { - static char stdpath[] = _PATH_STDPATH; - char *path; + const char *path; int ch; int cmd = -1; @@ -1101,7 +1100,7 @@ while ((ch = getopt(argc, argv, "pvV")) != -1) { switch (ch) { case 'p': - path = stdpath; + path = _PATH_STDPATH; break; case 'v': cmd = TYPECMD_SMALLV; ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/bin/sh/sh.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.138 2010/04/05 14:15:51 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $ .\" -.Dd April 5, 2010 +.Dd May 9, 2010 .Dt SH 1 .Os .Sh NAME @@ -415,11 +415,11 @@ .Pq Ql \en . A backslash preceding a newline is treated as a line continuation. .El -.Ss Reserved Words -Reserved words are words that have special meaning to the +.Ss Keywords +Keywords or reserved words are words that have special meaning to the shell and are recognized at the beginning of a line and after a control operator. -The following are reserved words: +The following are keywords: .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi @@ -429,8 +429,8 @@ An alias is a name and corresponding value set using the .Ic alias built-in command. -Whenever a reserved word may occur (see above), -and after checking for reserved words, the shell +Whenever a keyword may occur (see above), +and after checking for keywords, the shell checks the word to see if it matches an alias. If it does, it replaces it in the input stream with its value. For example, if there is an alias called @@ -469,7 +469,7 @@ document). Essentially though, a line is read and if the first word of the line (or after a control operator) -is not a reserved word, then the shell has recognized a +is not a keyword, then the shell has recognized a simple command. Otherwise, a complex command or some other special construct may have been recognized. @@ -695,7 +695,7 @@ .In sys/signal.h . .Ss Complex Commands Complex commands are combinations of simple commands -with control operators or reserved words, together creating a larger complex +with control operators or keywords, together creating a larger complex command. More generally, a command is one of the following: .Bl -item -offset indent @@ -739,7 +739,7 @@ If the pipeline is not in the background (discussed later), the shell waits for all commands to complete. .Pp -If the reserved word +If the keyword .Ic !\& does not precede the pipeline, the exit status is the exit status of the last command specified ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/tzdata/northamerica#2 (text+ko) ==== @@ -1,5 +1,5 @@ # 
    -# @(#)northamerica	8.30
+# @(#)northamerica	8.31
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -2089,7 +2089,44 @@
 			-8:00	-	PST	1970
 			-7:00	Mexico	M%sT	1999
 			-7:00	-	MST
+
+# From Alexander Krivenyshev (2010-04-21):
+# According to news, Bahía de Banderas (Mexican state of Nayarit)
+# changed time zone UTC-7 to new time zone UTC-6 on April 4, 2010 (to
+# share the same time zone as nearby city Puerto Vallarta, Jalisco).
+#
+# (Spanish)
+# Bahía de Banderas homologa su horario al del centro del
+# país, a partir de este domingo
+# 
+# http://www.nayarit.gob.mx/notes.asp?id=20748
+# 
+#
+# Bahía de Banderas homologa su horario con el del Centro del
+# País
+# 
+# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50"
+# 
+#
+# (English)
+# Puerto Vallarta and Bahía de Banderas: One Time Zone
+# 
+# http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml
+# 
+#
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_mexico08.html
+# 
+#
+# "Mexico's Senate approved the amendments to the Mexican Schedule System that
+# will allow Bahía de Banderas and Puerto Vallarta to share the same time
+# zone ..."
 # Baja California Sur, Nayarit, Sinaloa
+
+# From Arthur David Olson (2010-05-01):
+# Use "Bahia_Banderas" to keep the name to fourteen characters.
+
 Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
 			-7:00	-	MST	1927 Jun 10 23:00
 			-6:00	-	CST	1930 Nov 15
@@ -2100,6 +2137,19 @@
 			-7:00	-	MST	1949 Jan 14
 			-8:00	-	PST	1970
 			-7:00	Mexico	M%sT
+
+Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
+			-7:00	-	MST	1927 Jun 10 23:00
+			-6:00	-	CST	1930 Nov 15
+			-7:00	-	MST	1931 May  1 23:00
+			-6:00	-	CST	1931 Oct
+			-7:00	-	MST	1932 Apr  1
+			-6:00	-	CST	1942 Apr 24
+			-7:00	-	MST	1949 Jan 14
+			-8:00	-	PST	1970
+			-7:00	Mexico	M%sT	2010 Apr 4
+			-6:00	Mexico	C%sT
+
 # Baja California (near US border)
 Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 			-7:00	-	MST	1924

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/contrib/tzdata/zone.tab#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
    -# @(#)zone.tab	8.35
+# @(#)zone.tab	8.36
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -288,6 +288,7 @@
 MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
 MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
 MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
 MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
 MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
 MZ	-2558+03235	Africa/Maputo

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#2 (text+ko) ====

@@ -4,10 +4,10 @@
 
   The FreeBSD Documentation Project
 
-  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml,v 1.12 2009/08/24 19:47:40 manolis Exp $
+  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml,v 1.13 2010/05/01 13:27:11 manolis Exp $
 
   %SOURCE%	en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
-  %SRCID%	1.91
+  %SRCID%	1.95
 
 -->
 
@@ -492,7 +492,7 @@
 	    OpenOffice.org
 	    ðïëëïß (âáñéÜ)
 	    åîáéñåôéêÜ âáñéÜ
-	    &jdk; 1.4, Mozilla
+	    &jdk;, Mozilla
 	  
 	
       
@@ -673,7 +673,7 @@
       
 	ÊáôÜ ôçí ðñþôç åêêßíçóç, èá óáò ãßíïõí äéÜöïñåò åñùôÞóåéò êáé
 	  èá äçìéïõñãçèåß Ýíáò êáôÜëïãïò ìå üíïìá
-	  .openoffice.org2 ìÝóá óôïí ðñïóùðéêü óáò
+	  .openoffice.org ìÝóá óôïí ðñïóùðéêü óáò
 	  êáôÜëïãï.
       
 
@@ -683,7 +683,7 @@
 	÷þñï óôï äßóêï êáé èá ÷ñåéáóôåß êáé ðÜñá ðïëý ÷ñüíï ãéá íá
 	ïëïêëçñùèåß.
 
-      &prompt.root; cd /usr/ports/editors/openoffice.org-2
+      &prompt.root; cd /usr/ports/editors/openoffice.org-3
 &prompt.root; make install clean
 
       
@@ -779,10 +779,10 @@
 	ôïõ Linux, ç åöáñìïãÞ åßíáé åðßóçò äéáèÝóéìç ãéá ôï &os;.
 
       Ãéá íá åãêáôáóôÞóåôå ôï
-	&acrobat.reader; 7 áðü ôç ÓõëëïãÞ ôùí
+	&acrobat.reader; 8 áðü ôç ÓõëëïãÞ ôùí
 	Ports, ãñÜøôå:
 
-      &prompt.root; cd /usr/ports/print/acroread7
+      &prompt.root; cd /usr/ports/print/acroread8
 &prompt.root; make install clean
 
       Äåí õðÜñ÷åé äéáèÝóéìï ðáêÝôï, ëüãù ðåñéïñéóìþí óôçí Üäåéá
@@ -1139,13 +1139,13 @@
 	  
 	    OpenOffice.org
 	    openoffice
-	    editors/openoffice-1.1
+	    editors/openoffice.org-3
 	  
 
 	  
 	    &acrobat.reader;
 	    acroread
-	    print/acroread7
+	    print/acroread8
 	  
 
 	  

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#3 (text+ko) ====

@@ -4,10 +4,10 @@
 
   The FreeBSD Greek Documentation Project
 
-  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml,v 1.22 2010/03/25 10:50:00 manolis Exp $
+  $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml,v 1.23 2010/04/07 19:54:56 manolis Exp $
 
   %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
-  %SRCID%	1.478
+  %SRCID%	1.479
 
 -->
 
@@ -932,10 +932,7 @@
 	  ôïõ &os; äåí Ý÷ïõí ôï &man.csup.1; óôï âáóéêü óýóôçìá, áëëÜ ìðïñåßôå
 	  íá ôï åãêáôáóôÞóåôå åýêïëá áðü ôï port
 	  net/csup port, Þ áðü Ýôïéìï
-	  ðáêÝôï.  Ùóôüóï, ôï csup äåí õðïóôçñßæåé
-	  êáôÜóôáóç ëåéôïõñãßáò CVS.  Áí èÝëåôå íá êÜíåôå mirror ïëüêëçñá
-	  repositories, èá ÷ñåéáóôåß íá ÷ñçóéìïðïéÞóåôå ôï
-	  CVSup.  Áí áðïöáóßóåôå íá ÷ñçóéìïðïéÞóåôå
+	  ðáêÝôï.  Áí áðïöáóßóåôå íá ÷ñçóéìïðïéÞóåôå
 	  ôï csup, áðëþò ðáñáëåßøôå ôá âÞìáôá ãéá
 	  ôçí åãêáôÜóôáóç ôïõ CVSup êáé
 	  áíôéêáôáóôÞóôå êÜèå áíáöïñÜ óôï CVSup óå

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#3 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
+
 
 
 
@@ -131,7 +131,7 @@
       key issue in the decisions.
 
     
-      Because of some unfortunate design limitations with the RCS file
+      Because of some unfortunate design limitations with the RCS file
 	format and the use of vendor branches, minor, trivial and/or
 	cosmetic changes are strongly discouraged on
 	files that are still tracking the vendor branch.  Spelling
@@ -167,7 +167,7 @@
     The important thing here is that the
       src/contrib/file directory is created according to
       the rules: it is supposed to contain the sources as distributed (on a
-      proper vendor-branch and without RCS keyword expansion) with as few
+      proper vendor-branch and without RCS keyword expansion) with as few
       FreeBSD-specific changes as possible.  If there are any doubts on
       how to go about it, it is imperative that you ask first and not blunder
       ahead and hope it works out.

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -788,7 +788,7 @@
       
 	Kernel Configuration
 
-	To use wireless networking you need a wireless
+	To use wireless networking, you need a wireless
 	  networking card and to configure the kernel with the
 	  appropriate wireless networking support.  The latter is
 	  separated into multiple modules so that you only need to
@@ -803,13 +803,13 @@
 	if_ath_load="YES"
 
 	The Atheros driver is split up into three separate
-	  pieces: the driver proper (&man.ath.4;), the hardware
+	  pieces: the proper driver (&man.ath.4;), the hardware
 	  support layer that handles chip-specific functions
 	  (&man.ath.hal.4;), and an algorithm for selecting which of
 	  several possible rates for transmitting frames
-	  (ath_rate_sample here).  When you load this support as
-	  modules these dependencies are automatically handled for
-	  you.  If instead of an Atheros device you had another device
+	  (ath_rate_sample here).  When this support is loaded as kernel
+	  modules, these dependencies are automatically handled for
+	  you.  If, instead of an Atheros device, you had another device
 	  you would select the module for that device; e.g.:
 
 	if_wi_load="YES"
@@ -852,7 +852,7 @@
 	  base &man.wlan.4; driver which is dynamically loaded with
 	  the adapter driver.
 
-	With that you will need the modules
+	With that, you will need the modules
 	  that implement cryptographic support for the security
 	  protocols you intend to use.  These are intended to be
 	  dynamically loaded on demand by the &man.wlan.4; module but
@@ -861,8 +861,8 @@
 	  and &man.wlan.tkip.4;.  Both &man.wlan.ccmp.4; and
 	  &man.wlan.tkip.4; drivers are only needed if you intend to
 	  use the WPA and/or 802.11i security protocols.  If your
-	  network is to run totally open (i.e., with no encryption)
-	  then you do not even need the &man.wlan.wep.4; support.  To
+	  network does not use encryption,
+	  you will not need &man.wlan.wep.4; support.  To
 	  load these modules at boot time, add the following lines to
 	  /boot/loader.conf:
 
@@ -874,7 +874,7 @@
 	  configuration file (i.e.,
 	  /boot/loader.conf), you have to reboot
 	  your &os; box.  If you do not want to reboot your machine
-	  for the moment, you can just load the modules by hand using
+	  for the moment, you can load the modules by hand using
 	  &man.kldload.8;.
 
 	
@@ -959,8 +959,8 @@
 
 	    &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
+	    In the rest of this document, &os; 7.X users
+	      will need to change the command and configuration lines
 	      according to that scheme.
 	  
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
 
 
@@ -463,7 +463,7 @@
             OpenOffice.org
             heavy
             huge
-            &jdk; 1.4, Mozilla
+            &jdk;, Mozilla
           
         
       
@@ -638,7 +638,7 @@
 
       
 	During the first launch, you will be asked some
-	  questions and a .openoffice.org2 folder
+	  questions and a .openoffice.org folder
 	  will be created in your home directory.
       
 
@@ -647,7 +647,7 @@
         port.  However, you must bear in mind that it requires a lot of
         disk space and a fairly long time to compile.
 
-      &prompt.root; cd /usr/ports/editors/openoffice.org-2
+      &prompt.root; cd /usr/ports/editors/openoffice.org-3
 &prompt.root; make install clean
 
       
@@ -743,10 +743,10 @@
         for Linux.  As FreeBSD can run Linux binaries, it is also
         available for FreeBSD.
 
-      To install &acrobat.reader; 7 from
+      To install &acrobat.reader; 8 from
 	the Ports collection, do:
 
-      &prompt.root; cd /usr/ports/print/acroread7
+      &prompt.root; cd /usr/ports/print/acroread8
 &prompt.root; make install clean
 
       A package is not available due to licencing restrictions.
@@ -1088,13 +1088,13 @@
 	  
             OpenOffice.org
 	    openoffice
-	    editors/openoffice-1.1
+	    editors/openoffice.org-3
 	  
 
 	  
             &acrobat.reader;
 	    acroread
-	    print/acroread7
+	    print/acroread8
 	  
 
 	  

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 The Mesa Project is an effort to provide free OpenGL
 	  implementation.  You can specify a dependency on various components
 	  of this project with USE_GL variable.
-	  Valid options are: glut, glu, glw, gl and
+	  Valid options are: glut, glu, glw, glew, gl and
 	  linux.  For backwards compatibility, the value
 	  of yes maps to glu.
 
@@ -8418,17 +8418,14 @@
 	an article
 	on practical aspects of rc.d scripting.
 
-      One or more rc scripts can be installed:
+      One or more rc.d scripts can be installed:
 
       USE_RC_SUBR=	doormand
 
       Scripts must be placed in the files

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

From owner-p4-projects@FreeBSD.ORG  Tue May 11 06:15:31 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8DF991065677; Tue, 11 May 2010 06:15:31 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4CFF21065675
	for ; Tue, 11 May 2010 06:15:31 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 227BA8FC1D
	for ; Tue, 11 May 2010 06:15: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 o4B6FVo2048036
	for ; Tue, 11 May 2010 06:15:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4B6FVVL048034
	for perforce@freebsd.org; Tue, 11 May 2010 06:15:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 06:15:31 GMT
Message-Id: <201005110615.o4B6FVVL048034@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 178081 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, 11 May 2010 06:15:31 -0000

http://p4web.freebsd.org/@@178081?ac=10

Change 178081 by gcooper@starr on 2010/05/11 06:14:40

	Delete a stupid integrate mistake.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/README#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/articles/pxe/pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/contributing-ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/linux-comparison/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/linux-comparison/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/policies/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/dtrace/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/porters-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/flyer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/flyer/flyer.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/bsdl-gpl/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/compiz-fusion/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/compiz-fusion/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/contributing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/contributing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/gjournal-desktop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/gjournal-desktop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/greek-language-support/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/greek-language-support/article.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/linux-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/mailing-list-faq/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/nanobsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/faq/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/advanced-networking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/appendix.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/audit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir1.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir2.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir3.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir4.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/basics/example-dir5.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/colophon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/config/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/desktop/chapter.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/disks/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/dtrace/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/dtrace/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/eresources/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/filesystems/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/geom/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/example-dir1.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/example-dir2.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/example-dir3.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/example-dir4.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/install/example-dir5.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/kernelconfig/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/linuxemu/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/network-servers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/pgpkeys/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/ports/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/ppp-and-slip/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/preface/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/security/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/serialcomms/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/txtfiles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/users/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/vinum/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/flyer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/flyer/flyer.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/mk/doc.local.mk#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/books.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/translators.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/sgml/urls.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/tools/checkupdate/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/el_GR.ISO8859-7/share/tools/checkupdate/checkupdate.py#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/compiz-fusion/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/compiz-fusion/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cups/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cups/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/custom-gcc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/custom-gcc/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/euro/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/geom-class/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/gjournal-desktop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/gjournal-desktop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/hats/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/hubs/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/ldap-auth/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/ldap-auth/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-emulation/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-emulation/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/mh/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/nanobsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pam/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pam/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pam/converse.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pam/su.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/portbuild/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/install.cfg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/loader.rc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/pxe/pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/releng/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/remote-install/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/version-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/bibliography/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/dev-model/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/faq/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/appendix.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/config/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/dtrace/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/filesystems/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/security/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/virtualization/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2006/mckusick-kernelinternals/mckusick-kernelinternals-1.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2007/meetbsd/brueffer-torprvacy.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2007/nycbsdcon/dixon-bsdisdying.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2008/asiabsdcon/olander-pcbsd.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2008/nycbsdcon/dixon-bsdvsgpl.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/asiabsdcon/allman-internetmail.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/asiabsdcon/losh-mips.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-1.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-2.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/dcbsdcon/bejtlich-networksecurity.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/dcbsdcon/davis-isolatingcluster.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/dcbsdcon/dixon-bsdisstilldying.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/2009/dcbsdcon/mckusick-historyofbsd.sbv#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/captions/README#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/flyer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/flyer/flyer.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/mk/doc.local.mk#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/teams.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/README#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-more-information.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/admin.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/applications.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/includes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/install.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/misc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/network.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/serial.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/FAQ/x.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/contributing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/euro/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/euro/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/laptop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/dhcpd.conf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/install.cfg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/loader.rc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/pxe/pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/releng/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/releng/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/releng/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/faq/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/authors.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/updating/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/flyer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/flyer/flyer.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/articles.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/books.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/teams.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/sgml/translators.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/es_ES.ISO8859-1/share/tools/checkupdate/notify#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/euro/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/explaining-bsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/mh/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pam/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pam/converse.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pam/su.c#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/pxe/pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/releng/extra.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/faq/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/faq/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/audit/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/firewalls/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/jails/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/virtualization/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/flyer/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/flyer/flyer.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/cat.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/chkey.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/echo.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/head.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man1/intro.1#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/agp.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/amd.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/ncr.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/sd.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/sn.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/spic.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/st.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man5/intro.5#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man5/publickey.5#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man6/intro.6#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man7/ascii.7#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/man/man7/intro.7#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#2 delete

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

From owner-p4-projects@FreeBSD.ORG  Tue May 11 09:49:06 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8904B1065675; Tue, 11 May 2010 09:49:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4DCCC1065672
	for ; Tue, 11 May 2010 09:49:06 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CB2A8FC1F
	for ; Tue, 11 May 2010 09:49:06 +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 o4B9n6aS077440
	for ; Tue, 11 May 2010 09:49:06 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4B9n5ji077438
	for perforce@freebsd.org; Tue, 11 May 2010 09:49:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 11 May 2010 09:49:05 GMT
Message-Id: <201005110949.o4B9n5ji077438@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 178089 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, 11 May 2010 09:49:06 -0000

http://p4web.freebsd.org/@@178089?ac=10

Change 178089 by hselasky@hselasky_laptop001 on 2010/05/11 09:48:54

	
	USB serial:
		- increase the maximum number of ports to 12 in u3g driver.
		- patch by: Nick Hibma

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#31 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#31 (text+ko) ====

@@ -71,7 +71,7 @@
     &u3g_debug, 0, "Debug level");
 #endif
 
-#define	U3G_MAXPORTS		8
+#define	U3G_MAXPORTS		12
 #define	U3G_CONFIG_INDEX	0
 #define	U3G_BSIZE		2048
 

From owner-p4-projects@FreeBSD.ORG  Tue May 11 14:03:21 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16BB71065677; Tue, 11 May 2010 14:03:21 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CF6F81065675
	for ; Tue, 11 May 2010 14:03:20 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BEE708FC1B
	for ; Tue, 11 May 2010 14:03:20 +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 o4BE3KVV015541
	for ; Tue, 11 May 2010 14:03:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BE3K0w015539
	for perforce@freebsd.org; Tue, 11 May 2010 14:03:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 11 May 2010 14:03:20 GMT
Message-Id: <201005111403.o4BE3K0w015539@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 178094 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, 11 May 2010 14:03:21 -0000

http://p4web.freebsd.org/@@178094?ac=10

Change 178094 by hselasky@hselasky_laptop001 on 2010/05/11 14:02:28

	
	USB serial:
		- add new FTDI USB device ID.
	
	PR:		kern/146483

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#121 edit

Differences ...

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

@@ -212,6 +212,7 @@
 	UFTDI_DEV(ATMEL, STK541, 8U232AM),
 	UFTDI_DEV(DRESDENELEKTRONIK, SENSORTERMINALBOARD, 8U232AM),
 	UFTDI_DEV(DRESDENELEKTRONIK, WIRELESSHANDHELDTERMINAL, 8U232AM),
+	UFTDI_DEV(FTDI, GAMMASCOUT, 8U232AM),
 	UFTDI_DEV(FTDI, SERIAL_8U100AX, SIO),
 	UFTDI_DEV(FTDI, SERIAL_2232C, 8U232AM),
 	UFTDI_DEV(FTDI, SERIAL_2232D, 8U232AM),

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

@@ -1501,6 +1501,7 @@
 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi
 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru
 product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal
+product FTDI GAMMASCOUT		0xd678	Gamma-Scout
 product FTDI EISCOU		0xe888	Expert ISDN Control USB
 product FTDI UOPTBR		0xe889	USB-RS232 OptoBridge
 product FTDI EMCU2D		0xe88a	Expert mouseCLOCK USB II

From owner-p4-projects@FreeBSD.ORG  Tue May 11 14:44:02 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 599941065674; Tue, 11 May 2010 14:44:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 135B5106566B
	for ; Tue, 11 May 2010 14:44:02 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 023238FC17
	for ; Tue, 11 May 2010 14:44: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 o4BEi1bm022285
	for ; Tue, 11 May 2010 14:44:01 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BEi1JQ022283
	for perforce@freebsd.org; Tue, 11 May 2010 14:44:01 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 14:44:01 GMT
Message-Id: <201005111444.o4BEi1JQ022283@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 178097 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, 11 May 2010 14:44:02 -0000

http://p4web.freebsd.org/@@178097?ac=10

Change 178097 by gcooper@starr on 2010/05/11 14:44:01

	Fix the error catch with a archive_write_new failure, and make sure that we actually truncate any existing files if Regenerate is TRUE.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#11 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#11 (text+ko) ====

@@ -403,8 +403,10 @@
 
 	archive_open_flags = O_WRONLY;
 
-	if (Regenerate == FALSE)
-		archive_open_flags |= O_CREAT;
+        if (Regenerate == TRUE)
+                archive_open_flags |= O_TRUNC;
+        else
+                archive_open_flags |= O_CREAT;
 
 	/* 
 	 * NOTE (gcooper): No sense in calloc'ing destfile or srcfile as the
@@ -425,7 +427,7 @@
 			warn("Skipping package creation for: '%s'", tball);
 	}
 	else if ((archive = archive_write_new()) == NULL)
-		error = archive_error_string(archive);
+		error = strerror(errno);
 	else if (archive_write_set_format_ustar(archive) != ARCHIVE_OK)
 		error = archive_error_string(archive);
 	else {

From owner-p4-projects@FreeBSD.ORG  Tue May 11 15:57:19 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68D19106566C; Tue, 11 May 2010 15:57:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 298F7106564A
	for ; Tue, 11 May 2010 15:57:19 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1536D8FC17
	for ; Tue, 11 May 2010 15:57: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 o4BFvJlJ029701
	for ; Tue, 11 May 2010 15:57:19 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BFvIlD029699
	for perforce@freebsd.org; Tue, 11 May 2010 15:57:18 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 15:57:18 GMT
Message-Id: <201005111557.o4BFvIlD029699@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 178101 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, 11 May 2010 15:57:19 -0000

http://p4web.freebsd.org/@@178101?ac=10

Change 178101 by gcooper@starr on 2010/05/11 15:56:18

	Curiously, another artifact of my disintegration that wasn't deleted last night even though I reverted the change. Oh well...	

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/da/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/da/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/da/doc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/FAQ/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/FAQ/index.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/about.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/administration.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/applications.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/art.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/availability.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community/irc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community/mailinglists.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community/newsgroups.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/community/webresources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/developers.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/developers/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/developers/cvs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/doc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/doc-set.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/docproj.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/sgml.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/submitting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docproj/who.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docs/books.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/docs/webresources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/features.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/gifs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/gifs/bar.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/handbook/index.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/index.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/internet.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/java/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/java/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/java/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/logo.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/mailto.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2002/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2002/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2003/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2003/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2004/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2004/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2004/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2005/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2005/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2005/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2006/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2006/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2006/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2007/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2007/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2007/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2008/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2008/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2008/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2009/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/2009/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/news/news.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/alpha.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/amd64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/arm.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/i386.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/index.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/machines.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/refs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ia64/todo.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/mips.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/pc98.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/ppc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/sparc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/sun4v.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/x86-64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/platforms/xbox.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/Makefile.inc0#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/categories#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/categories.descriptions#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/growth/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/installing.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/packages#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/portindex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/ports.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/references.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/searching.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/ports/updating.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/projects/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/projects/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/projects/cvsweb.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/projects/newbies.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/projects/projects.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.11R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.6.2R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.7R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.8R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/4.9R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/early-adopter.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.0R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/early-adopter.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.1R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/early-adopter.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.2R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/announce.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/docbook.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/errata.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/hardware.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/installation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/migration-guide.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/readme.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-alpha.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-amd64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-i386.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-ia64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-pc98.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes-sparc64.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/5.3R/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/releases/snapshots.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/relnotes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/relnotes/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/security/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/security/charter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/security/security.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/send-pr.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/catalog.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/header.l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/libcommon.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/navibar.l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/share/sgml/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/support.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/support/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/support/bugreports.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/support/webresources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/de/where.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/FAQ/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/FAQ/index.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/about.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/doc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/docs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/catalog#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/catalog.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/header.l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/libcommon.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/el/share/sgml/navibar.l10n.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/FAQ/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/FAQ/index.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/about.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/administration.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/advocacy/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/advocacy/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/advocacy/letter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/advocacy/myths.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/applications.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/art.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/availability.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/Gnats.pm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/cgi-lib.pl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/cgi-style.pl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/confirm-code.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/cvsweb.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/cvsweb.conf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/cvsweb.conf-freebsd#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/dosendpr.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/getmsg.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/mailindex.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/man.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/mid.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/mirror.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/missing_handler.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/monthly.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/pds.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/ports.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/query-pr-lib.pl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/query-pr-summary.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/query-pr.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/search.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/cgi/url.cgi#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/commercial/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/commercial/commercial.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/irc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/mailinglists.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/newsgroups.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/social.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/community/webresources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/COPYING#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/COPYING.LIB#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/copyright.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/daemon.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/freebsd-doc-license.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/freebsd-license.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/license.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/copyright/trademarks.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/developers.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/developers/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/developers/cvs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/doc/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/current.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/doc-set.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/docproj.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/handbook.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/handbook3.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/sgml.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/submitting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/todo.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/translations.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docproj/who.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docs/books.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/docs/webresources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/donations/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/donations/donors.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/donations/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/donations/wantlist.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/2002/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/2002/bsdcon-devsummit.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/2002/usenix-devsummit.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/2003/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/2003/bsdcon-devsummit.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/events.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/events/rss.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/favicon.ico#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/features.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/freebsd.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/2.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/205-jp.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/205-jpb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/3.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/4.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/5.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/6.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/7.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/8.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/9.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/A.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/B.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/C.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/D.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/E.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/F.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/G.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/H.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/J.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/K.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/L.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/M.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/N.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/P.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/Q.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/R.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/S.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/T.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/U.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/V.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/W.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/X.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/Y.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/Z.pnm#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/aboutf.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/aboutfb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/abs_bsd_cov.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/apache.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/back.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/banner1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/banner2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/banner3.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/banner4.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bar.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/binary.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/blocked.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/branches.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/branches.tex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdcomp-4.2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdi-handbook.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdisc.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdiscb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdm.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdmagazine.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bsdmb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bug.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/building_internet_servers.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/building_internet_servers_small.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/bukudepan.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/c99.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/cahiers_adm_cov.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/comp_b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/complete.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/cover.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/coverb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/dae_up2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/dae_up3.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon-phk.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon_hammer-tn15.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon_hammer-tn20.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon_hammer-tn25.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/daemon_hammer.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/darbylogo.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/dir.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/doc.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/doc.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/docs0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/docs1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/done.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/faq0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/faq1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fbsd-ososfypc.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fbsdcng-english.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fbsdcng-japanese.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fhp_mini.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/flash0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/flash1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fm-freebsd45.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/freebsd-advert.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/freebsd-basics-cover-front-145.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/freebsd_1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/freebsd_3.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/freebsdro.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/frowny.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fullcourse3.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fullcourse3b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/fultus-cover.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/get0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/get1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/getstarb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/getstart.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/gourchin3.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/handboo0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/handboo1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/home.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/how_to_contribute.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/in_progress.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/index0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/index1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/instman.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/instmanb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/jp.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/jpb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/kapak.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/kapak_sml.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/kr.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/krb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las5.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las512.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las512b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las523.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las523b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/las5b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/light_button.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/littlelogo.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/lob-freebsd-4.2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/lob-freebsd-4.4-small.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/lob-freebsd-4.4.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/lynx.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/mall_title_medium.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/mall_title_tiny.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/minigraph.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/new.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/news.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/news.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/newslet2.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/newslet2b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/newsletb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/newslett.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/not_planned.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/not_started.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/pbfbsd2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/pc98-jp.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/pc98-jpb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/pf_packet_filter_book_cover.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/pht.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/phtb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/plain.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/plueschtier-tiny.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/power-button.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/power.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/powerani.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/powerlogo.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/project_goal.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/project_plan.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/rbsdc-2007-01-cover-01.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/releases.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/resources_and_links.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/running.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/runningb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/sam.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/samb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/search0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/search1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/smart-reseller-small.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/smart-reseller.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/smiley.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/soft0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/soft1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/starkit.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/starkitb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/status_board.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/support0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/support1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/text.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/topbar.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/tw.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/twb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/twbsd6cover.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/ugu_icon.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/unixuser.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/unixuserb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/unleashed6.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/urm.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/urmb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/vendors0.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/vendors1.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-10.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-10b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-11.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-11b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-200.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-200b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-205.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-205b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-21.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-215.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-215b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-216.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-216b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-216jp.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-216jpb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-217.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-217b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-21b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-221.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-221b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-222.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-222b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-22snap.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-22snapb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-30sna.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-30snab.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-44lite2.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-44lite2b.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-blun.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-blunb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-bsdalph-4.2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-bsdtool.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-docs.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-docsb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-freebsd-4.2.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wc-freebsd-4.2b.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wclogo.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wr-bsdtool-june2001.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wr-freebsd43.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wr-freebsd44.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gifs/wr-handbook-2nd.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/.cvsignore#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/TODO#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/contact.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/.cvsignore#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/bugging.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/develfaq.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/example-Makefile.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq2.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq210.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq212.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq214.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq216.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq218.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq220.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq222.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq224.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq226.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq228.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/faq28.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/gnome1_porting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/gnome2_porting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/gnome_porting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/halfaq.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/porting.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/docs/volunteer.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/gnome_prefix.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/gnomelogalyzer.sh#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/adamw.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/ahze.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/gnome.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/hippobutt.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/kwm.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/marcus.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/mezz.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/ss224-1-tn.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/ss224-1.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/ss224-2-tn.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/images/ss224-2.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/index.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/newsflash.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/rss.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/rss2.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/gnome/screenshots.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/handbook/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/handbook/index.html#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/index.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/index.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/README.mirror#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/about.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/bylaws.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/core-vote.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/developer.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/doceng.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/expire-bits.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/fortunes.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/homepage.pl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/homepage.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/i18n.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/internal.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/machines.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/mirror.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/new-account.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/photos.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/policies.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/releng.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/ssh-keys.asc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internal/statistic.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/internet.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/advocacy.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/10.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/11.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/12.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/13.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/14.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/15.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/16.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/dists/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/faq.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/howtoports.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/newbies.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/performance.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/docs/tutorials.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/howhelp.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/install.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/j2j.gif#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/java-rss.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/api.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/development.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/documentation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/freebsd.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/resources.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/servlets.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/tools.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/tutorials.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/links/vendor.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/java/newsflash.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/kse/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/kse/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/cvsweb.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/fixed.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/fixed_large.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/global.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/iefixes.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/layout.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/navigation.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/query-pr.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/table.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/css/text.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/beastie.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/blt_gry_arrow.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/blt_red_arrow.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_get_back.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_get_bl.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_get_br.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_get_tl.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_get_tr.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_new_back.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_new_bl.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_new_br.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_new_tl.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/front_new_tr.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/hdr_fill.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/ico_rss.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/logo-red.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/logo.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/nav_rgt.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/nav_tbl_btm.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/images/nav_tbl_top.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/js/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/layout/js/styleswitcher.js#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/cd-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/cd.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-basic-thumb.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-basic.ai#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-basic.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-basic.svg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-bw-thumb.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-bw.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-full-thumb.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-full.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-reverse-thumb.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo-reverse.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/logo.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard1-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard1.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard2-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard2.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard3-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard3.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard4-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/postcard4.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall1-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall1.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall2-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall2.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall3-thumb.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/logo/wall3.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/mailto.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/marketing/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/marketing/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/marketing/os-comparison.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/Makefile.output#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia-input.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.html.intro#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.html.post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.html.pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.pl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.sgml.intro#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.sgml.post#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/multimedia/multimedia.sgml.pre#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1993/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1993/freebsd-coined.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1996/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1996/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1997/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1997/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1998/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1998/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1998/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1999/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1999/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/1999/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2000/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2000/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2000/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2001/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2001/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2001/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2002/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2002/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2002/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2003/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2003/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2003/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2004/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2004/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2004/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2005/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2005/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2005/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2006/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2006/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2006/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2007/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2007/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2007/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2008/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2008/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2008/press.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2009/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/2009/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/news.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-1.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-2.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-3.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-4.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-5.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-6.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-7.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-8.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/press-rel-9.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/pressreleases.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/sou1999.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/README#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-07.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-08.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-09.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-11.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2001-12-2002-01.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2002-02-2002-04.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2002-05-2002-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2002-07-2002-08.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2002-09-2002-10.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2002-11-2002-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2003-01-2003-02.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2003-03-2003-09.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2003-10-2003-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2004-01-2004-02.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2004-03-2004-04.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2004-05-2004-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2004-07-2004-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2005-01-2005-03.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2005-03-2005-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2005-07-2005-10.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2005-10-2005-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2006-01-2006-03.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2006-04-2006-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2006-06-2006-10.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2006-10-2006-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2007-01-2007-03.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2007-04-2007-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2007-07-2007-10.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2007-10-2007-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2008-01-2008-03.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2008-04-2008-06.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2008-07-2008-09.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2008-10-2008-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2009-01-2009-03.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2009-04-2009-09.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-2009-10-2009-12.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report-sample.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/report.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/news/status/status.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/alpha.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/amd64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/arm.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/i386.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/i2inside.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/index.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/machines.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/mckinley-die.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/merced-die.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/montecito-die.png#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/news.xml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/refs.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ia64/todo.xsl#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/mips.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/pc98.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/ppc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/sparc.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/sun4v.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/x86-64.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/platforms/xbox.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/charter.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/implementation.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/policies.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/policies_committing.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/policies_contributors.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/policies_releng_4.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/portmgr/qa.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/Makefile.inc0#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/categories#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/categories.descriptions#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/growth/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/installing.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/packages#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/portindex#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/ports.ent#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/references.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/searching.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/ports/updating.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/2009-freebsd-gsoc-thumbnail.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/2009-freebsd-gsoc.pdf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/2010-freebsd-gsoc-thumbnail.jpg#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/2010-freebsd-gsoc.pdf#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/Makefile.inc#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/acpi/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/acpi/completed.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/acpi/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/acpi/style.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/bigdisk/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/bigdisk/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/bigdisk/style.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/busdma/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/busdma/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/busdma/style.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/c99/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/c99/index.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/c99/style.css#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/cvsweb.sgml#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/ideas/Makefile#2 delete
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/www/en/projects/ideas/ideas.xml#2 delete

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

From owner-p4-projects@FreeBSD.ORG  Tue May 11 16:08:30 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9ED9106567B; Tue, 11 May 2010 16:08:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 763631065670
	for ; Tue, 11 May 2010 16:08:30 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6428D8FC1E
	for ; Tue, 11 May 2010 16:08: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 o4BG8U8b031493
	for ; Tue, 11 May 2010 16:08:30 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BG8UlQ031491
	for perforce@freebsd.org; Tue, 11 May 2010 16:08:30 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 16:08:30 GMT
Message-Id: <201005111608.o4BG8UlQ031491@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 178102 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, 11 May 2010 16:08:31 -0000

http://p4web.freebsd.org/@@178102?ac=10

Change 178102 by gcooper@starr on 2010/05/11 16:08:27

	
	Convert a strlcpy for prefix to a one-time strlen and change it to a strcpy. This is an optimization to not have to deal with checking error, passing more crud across the stack, etc.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#12 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#12 (text+ko) ====

@@ -533,6 +533,7 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
+                        /* Same as above, if srcbase is NULL. */
 			if (srcbase != NULL)
 				if (strlcat(srcfile, srcbase,
 				    PATH_MAX) > PATH_MAX)
@@ -557,19 +558,23 @@
 				 * whitespace.
 				 */
 				assert(prefix != NULL);
+                                
+                                /* 
+                                 * NOTE (gcooper): strcpy is safe here so long
+                                 * as the buffers are of equal size, and also
+                                 * because the value has been sanitized below
+                                 * and because of the assert above.
+                                 */
+				strcpy(destbase, prefix);
 
-				/* Reset destbase */
-				if (strlcpy(destbase, prefix, PATH_MAX) >
-				    PATH_MAX)
-					error = strerror(ENAMETOOLONG);
-
 				/* Reset srcbase */
 				/* Tack BaseDir on the front if defined. */
 				if (BaseDir != NULL) {
 					if (strlcpy(srcbase, BaseDir,
 					    PATH_MAX) > PATH_MAX)
 						error = strerror(ENAMETOOLONG);
-				if (strlcpy(srcbase, prefix, PATH_MAX) >
+                                
+                                if (strlcpy(srcbase, prefix, PATH_MAX) >
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
@@ -583,18 +588,24 @@
 				/* First @cwd -- wewt! */
 				if (prefix == NULL) {
 
-					prefix = p->name;
+                                        if (strlen(prefix) > MAX_PATH)
+                                                error = strerror(ENAMETOOLONG);
+                                        else {
+
+                                                prefix = p->name;
 
-				 	/*
-					 * Tack BaseDir on the front if
-					 * defined and this is the first run.
-					 */
-					if (BaseDir != NULL) {
-						if (strlcpy(srcbase, BaseDir,
-						    PATH_MAX) > PATH_MAX)
-							error = strerror(ENAMETOOLONG);
-					} else
-						srcbase[0] = '\0';
+	        			 	/*
+		        			 * Tack BaseDir on the front if
+			        		 * defined and this is the first run.
+				        	 */
+					        if (BaseDir != NULL) {
+						        if (strlcpy(srcbase,
+                                                            BaseDir, PATH_MAX) >
+                                                            PATH_MAX)
+	        						error = strerror(ENAMETOOLONG);
+		        			} else
+			        			srcbase[0] = '\0';
+                                        }
 
 				}
 

From owner-p4-projects@FreeBSD.ORG  Tue May 11 16:27:50 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C95011065672; Tue, 11 May 2010 16:27:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6A22C106566C
	for ; Tue, 11 May 2010 16:27:50 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 582FA8FC1D
	for ; Tue, 11 May 2010 16:27: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 o4BGRooH032926
	for ; Tue, 11 May 2010 16:27:50 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BGRoW4032924
	for perforce@freebsd.org; Tue, 11 May 2010 16:27:50 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 16:27:50 GMT
Message-Id: <201005111627.o4BGRoW4032924@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 178105 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, 11 May 2010 16:27:51 -0000

http://p4web.freebsd.org/@@178105?ac=10

Change 178105 by gcooper@starr on 2010/05/11 16:26:52

	strlen wasn't on the value to test. Silly me.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#13 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#13 (text+ko) ====

@@ -588,7 +588,7 @@
 				/* First @cwd -- wewt! */
 				if (prefix == NULL) {
 
-                                        if (strlen(prefix) > MAX_PATH)
+                                        if (strlen(p->name) > MAX_PATH)
                                                 error = strerror(ENAMETOOLONG);
                                         else {
 

From owner-p4-projects@FreeBSD.ORG  Tue May 11 17:33:58 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67A361065675; Tue, 11 May 2010 17:33:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B42D1065673
	for ; Tue, 11 May 2010 17:33:58 +0000 (UTC)
	(envelope-from iprebeg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 16EE88FC1B
	for ; Tue, 11 May 2010 17:33:58 +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 o4BHXwBD049459
	for ; Tue, 11 May 2010 17:33:58 GMT
	(envelope-from iprebeg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BHXvfN049457
	for perforce@freebsd.org; Tue, 11 May 2010 17:33:57 GMT
	(envelope-from iprebeg@freebsd.org)
Date: Tue, 11 May 2010 17:33:57 GMT
Message-Id: <201005111733.o4BHXvfN049457@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	iprebeg@freebsd.org using -f
From: Ivor Prebeg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178109 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, 11 May 2010 17:33:58 -0000

http://p4web.freebsd.org/@@178109?ac=10

Change 178109 by iprebeg@iprebeg_nxlab_login on 2010/05/11 17:33:05

	IFC@178103

Affected files ...

.. //depot/projects/vimage/src/share/man/man1/builtin.1#3 integrate
.. //depot/projects/vimage/src/share/man/man3/Makefile#4 integrate
.. //depot/projects/vimage/src/share/man/man3/pthread_cond_timedwait.3#2 integrate
.. //depot/projects/vimage/src/share/man/man3/pthread_condattr.3#2 integrate
.. //depot/projects/vimage/src/share/man/man4/cas.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#4 integrate
.. //depot/projects/vimage/src/share/man/man4/ng_bridge.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/ng_hub.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/sge.4#3 integrate
.. //depot/projects/vimage/src/share/man/man9/make_dev.9#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#15 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#21 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#39 integrate
.. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#19 integrate
.. //depot/projects/vimage/src/sys/amd64/include/xen/xenfunc.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/xen/xenvar.h#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#12 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#11 integrate
.. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#9 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#27 integrate
.. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#17 integrate
.. //depot/projects/vimage/src/sys/arm/include/cpuconf.h#5 integrate
.. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#8 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#16 integrate
.. //depot/projects/vimage/src/sys/boot/common/module.c#5 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#26 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#19 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#5 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#31 integrate
.. //depot/projects/vimage/src/sys/conf/options.arm#13 integrate
.. //depot/projects/vimage/src/sys/dev/ae/if_ae.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/an/if_an.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#47 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#29 integrate
.. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/bwn/if_bwn.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/cas/if_cas.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/cas/if_casreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ce/if_ce.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/cm/smc90cx6.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/cp/if_cp.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/cs/if_cs.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ctau/if_ct.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#22 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#33 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#31 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/sys/mvec.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/drm/via_dmablit.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ed/if_ed.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ep/if_ep.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ex/if_ex.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/fe/if_fe.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/fxp/if_fxpvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/ie/if_ie.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/if_ic.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/le/lance.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/malo/if_malo.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/md/md.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#26 integrate
.. //depot/projects/vimage/src/sys/dev/mvs/mvs.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mwl/if_mwl.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#23 integrate
.. //depot/projects/vimage/src/sys/dev/my/if_my.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/pdq/pdq_ifsubr.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#19 integrate
.. //depot/projects/vimage/src/sys/dev/re/if_re.c#32 integrate
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbni.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sgereg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/sn/if_sn.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/snc/dp83932.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/net/uhso.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgt.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_urtw.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#19 integrate
.. //depot/projects/vimage/src/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/wl/if_wl.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/xe/if_xe.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#16 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#11 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#6 integrate
.. //depot/projects/vimage/src/sys/fs/ext2fs/ext2_readwrite.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#19 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonkrpc.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfskpiport.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#11 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#10 integrate
.. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_io.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_ctl.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#11 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#23 integrate
.. //depot/projects/vimage/src/sys/geom/geom.h#9 integrate
.. //depot/projects/vimage/src/sys/geom/geom_subr.c#15 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#11 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.h#8 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_events.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_var.h#7 integrate
.. //depot/projects/vimage/src/sys/geom/zero/g_zero.c#2 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#11 integrate
.. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#22 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/vimage/src/sys/i386/include/specialreg.h#19 integrate
.. //depot/projects/vimage/src/sys/i386/include/xen/xenfunc.h#5 integrate
.. //depot/projects/vimage/src/sys/i386/include/xen/xenvar.h#5 integrate
.. //depot/projects/vimage/src/sys/i386/xen/pmap.c#16 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/kern_conf.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#33 integrate
.. //depot/projects/vimage/src/sys/kern/kern_resource.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bufring.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/subr_uio.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/sys_pipe.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_cow.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#36 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#32 integrate
.. //depot/projects/vimage/src/sys/mips/adm5120/if_admsw.c#7 integrate
.. //depot/projects/vimage/src/sys/mips/atheros/if_arge.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/include/pmap.h#10 integrate
.. //depot/projects/vimage/src/sys/mips/mips/db_trace.c#4 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#20 integrate
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#13 integrate
.. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#6 integrate
.. //depot/projects/vimage/src/sys/net/if.c#99 integrate
.. //depot/projects/vimage/src/sys/net/if_ef.c#20 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#38 integrate
.. //depot/projects/vimage/src/sys/net/if_gre.c#18 integrate
.. //depot/projects/vimage/src/sys/net/if_stf.c#22 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#44 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#65 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#13 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_bridge.h#2 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#38 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_fec.c#6 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_hub.c#5 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_hub.h#2 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#35 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_ksocket.c#8 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_tty.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#50 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#66 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#38 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#48 integrate
.. //depot/projects/vimage/src/sys/netipsec/key.c#53 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#19 integrate
.. //depot/projects/vimage/src/sys/pci/if_rl.c#17 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#13 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#18 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#18 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#19 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/sys/buf_ring.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#21 integrate
.. //depot/projects/vimage/src/sys/sys/mbuf.h#21 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#66 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#41 integrate
.. //depot/projects/vimage/src/sys/sys/resource.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/resourcevar.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/vmmeter.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#29 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#18 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#19 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#19 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/quota.h#5 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#8 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufsmount.h#5 integrate
.. //depot/projects/vimage/src/sys/vm/device_pager.c#13 integrate
.. //depot/projects/vimage/src/sys/vm/phys_pager.c#9 integrate
.. //depot/projects/vimage/src/sys/vm/sg_pager.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/swap_pager.c#25 integrate
.. //depot/projects/vimage/src/sys/vm/uma_core.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_contig.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#24 integrate
.. //depot/projects/vimage/src/sys/vm/vm_glue.c#17 integrate
.. //depot/projects/vimage/src/sys/vm/vm_kern.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#30 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#29 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.h#15 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#24 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.h#4 integrate
.. //depot/projects/vimage/src/sys/vm/vnode_pager.c#21 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man1/builtin.1#3 (text+ko) ====

@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.31 2010/04/25 17:38:53 jilles Exp $
+.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.32 2010/05/09 15:00:30 jilles Exp $
 .\"
-.Dd April 25, 2010
+.Dd May 9, 2010
 .Dt BUILTIN 1
 .Os
 .Sh NAME
@@ -200,7 +200,7 @@
 .It Ic % Ta \&No Ta Yes Ta \&No
 .It Ic \&. Ta \&No Ta \&No Ta Yes
 .It Ic \&: Ta \&No Ta Yes Ta Yes
-.It Ic @ Ta \&No Ta Yes Ta Yes
+.It Ic @ Ta \&No Ta Yes Ta \&No
 .It Ic \&[ Ta Yes Ta \&No Ta Yes
 .It Ic { Ta \&No Ta \&No Ta Yes
 .It Ic } Ta \&No Ta \&No Ta Yes

==== //depot/projects/vimage/src/share/man/man3/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/13/93
-# $FreeBSD: src/share/man/man3/Makefile,v 1.51 2010/01/09 12:31:11 delphij Exp $
+# $FreeBSD: src/share/man/man3/Makefile,v 1.52 2010/05/09 14:21:34 jilles Exp $
 
 .include 
 
@@ -251,7 +251,11 @@
 PTHREAD_MLINKS+=pthread_barrier_destroy.3 pthread_barrier_init.3 \
 		pthread_barrier_destroy.3 pthread_barrier_wait.3
 PTHREAD_MLINKS+=pthread_condattr.3 pthread_condattr_destroy.3 \
-		pthread_condattr.3 pthread_condattr_init.3
+		pthread_condattr.3 pthread_condattr_init.3 \
+		pthread_condattr.3 pthread_condattr_getclock.3 \
+		pthread_condattr.3 pthread_condattr_setclock.3 \
+		pthread_condattr.3 pthread_condattr_getpshared.3 \
+		pthread_condattr.3 pthread_condattr_setpshared.3
 PTHREAD_MLINKS+=pthread_getconcurrency.3 pthread_setconcurrency.3
 PTHREAD_MLINKS+=pthread_multi_np.3 pthread_single_np.3
 PTHREAD_MLINKS+=pthread_mutexattr.3 pthread_mutexattr_destroy.3 \

==== //depot/projects/vimage/src/share/man/man3/pthread_cond_timedwait.3#2 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.21 2007/10/22 10:08:00 ru Exp $
+.\" $FreeBSD: src/share/man/man3/pthread_cond_timedwait.3,v 1.22 2010/05/09 14:21:34 jilles Exp $
 .\"
-.Dd July 28, 1998
+.Dd May 9, 2010
 .Dt PTHREAD_COND_TIMEDWAIT 3
 .Os
 .Sh NAME
@@ -56,6 +56,11 @@
 .Fa abstime ,
 and the current thread reacquires the lock on
 .Fa mutex .
+.Pp
+The clock used to measure
+.Fa abstime
+can be specified during creation of the condition variable using
+.Xr pthread_condattr_setclock 3 .
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_cond_timedwait
@@ -87,7 +92,8 @@
 .Xr pthread_cond_destroy 3 ,
 .Xr pthread_cond_init 3 ,
 .Xr pthread_cond_signal 3 ,
-.Xr pthread_cond_wait 3
+.Xr pthread_cond_wait 3 ,
+.Xr pthread_condattr_setclock 3
 .Sh STANDARDS
 The
 .Fn pthread_cond_timedwait

==== //depot/projects/vimage/src/share/man/man3/pthread_condattr.3#2 (text+ko) ====

@@ -25,13 +25,17 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man3/pthread_condattr.3,v 1.15 2007/10/22 10:08:00 ru Exp $
-.Dd April 28, 2000
+.\" $FreeBSD: src/share/man/man3/pthread_condattr.3,v 1.16 2010/05/09 14:21:34 jilles Exp $
+.Dd May 9, 2010
 .Dt PTHREAD_CONDATTR 3
 .Os
 .Sh NAME
 .Nm pthread_condattr_init ,
-.Nm pthread_condattr_destroy
+.Nm pthread_condattr_destroy ,
+.Nm pthread_condattr_getclock ,
+.Nm pthread_condattr_setclock ,
+.Nm pthread_condattr_getpshared ,
+.Nm pthread_condattr_setpshared ,
 .Nd condition attribute operations
 .Sh LIBRARY
 .Lb libpthread
@@ -41,14 +45,17 @@
 .Fn pthread_condattr_init "pthread_condattr_t *attr"
 .Ft int
 .Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.Ft int
+.Fn pthread_condattr_getclock "pthread_condattr_t * restrict attr" "clock_t * restrict clock_id"
+.Ft int
+.Fn pthread_condattr_setclock "pthread_condattr_t *attr" "clock_t clock_id"
+.Ft int
+.Fn pthread_condattr_getpshared "pthread_condattr_t * restrict attr" "int * restrict pshared"
+.Ft int
+.Fn pthread_condattr_setpshared "pthread_condattr_t *attr" "int pshared"
 .Sh DESCRIPTION
 Condition attribute objects are used to specify parameters to
 .Fn pthread_cond_init .
-.Fx Ns 's
-implementation of conditions does not support any non-default
-attributes, so these functions are not very useful, though they are required
-to be present by
-.Tn POSIX .
 .Pp
 The
 .Fn pthread_condattr_init
@@ -57,6 +64,52 @@
 The
 .Fn pthread_condattr_destroy
 function destroys a condition attribute object.
+.Pp
+The
+.Fn pthread_condattr_getclock
+function will put the value of the clock attribute from
+.Fa attr
+into the memory area pointed to by
+.Fa clock_id .
+The
+.Fn pthread_condattr_setclock
+function will set the clock attribute of
+.Fa attr
+to the value specified in
+.Fa clock_id .
+The clock attribute affects the interpretation of
+.Fa abstime
+in
+.Xr pthread_cond_timedwait 3
+and may be set to
+.Dv CLOCK_REALTIME
+(default)
+or
+.Dv CLOCK_MONOTONIC .
+.Pp
+The
+.Fn pthread_condattr_getpshared
+function will put the value of the process-shared attribute from
+.Fa attr
+into the memory area pointed to by
+.Fa pshared .
+The
+.Fn pthread_condattr_setpshared
+function will set the process-shared attribute of
+.Fa attr
+to the value specified in
+.Fa pshared .
+The argument
+.Fa pshared
+may have one of the following values:
+.Bl -tag -width ".Dv PTHREAD_PROCESS_PRIVATE"
+.It Dv PTHREAD_PROCESS_PRIVATE
+The condition variable it is attached to may only be accessed by
+threads in the same process as the one that created the object.
+.It Dv PTHREAD_PROCESS_SHARED
+The condition variable it is attached to may be accessed by
+threads in processes other than the one that created the object.
+.El
 .Sh RETURN VALUES
 If successful, these functions return 0.
 Otherwise, an error number is returned to indicate the error.
@@ -77,8 +130,29 @@
 Invalid value for
 .Fa attr .
 .El
+.Pp
+The
+.Fn pthread_condattr_setclock
+function will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value specified in
+.Fa clock_id
+is not one of the allowed values.
+.El
+.Pp
+The
+.Fn pthread_condattr_setpshared
+function will fail if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value specified in
+.Fa pshared
+is not one of the allowed values.
+.El
 .Sh SEE ALSO
-.Xr pthread_cond_init 3
+.Xr pthread_cond_init 3 ,
+.Xr pthread_cond_timedwait 3
 .Sh STANDARDS
 The
 .Fn pthread_condattr_init
@@ -86,3 +160,15 @@
 .Fn pthread_condattr_destroy
 functions conform to
 .St -p1003.1-96
+.Sh BUGS
+The implementation of
+condition variables
+does not fully conform to
+.St -p1003.2
+because the process-shared attribute is ignored;
+if any value other than
+.Dv PTHREAD_PROCESSES_PRIVATE
+is specified in a call to
+.Fn pthread_condattr_setpshared ,
+it will return
+.Er EINVAL .

==== //depot/projects/vimage/src/share/man/man4/cas.4#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/cas.4,v 1.1 2009/06/15 18:24:04 marius Exp $
+.\" $FreeBSD: src/share/man/man4/cas.4,v 1.2 2010/05/03 20:59:27 marius Exp $
 .\"
-.Dd June 15, 2009
+.Dd May 3, 2010
 .Dt CAS 4
 .Os
 .Sh NAME
@@ -91,6 +91,9 @@
 .Pp
 .Bl -bullet -compact
 .It
+Sun GigaSwift Ethernet 1.0 MMF (Cassini Kuheen)
+(part no.\& 501-5524)
+.It
 Sun GigaSwift Ethernet 1.0 UTP (Cassini)
 (part no.\& 501-5902)
 .It

==== //depot/projects/vimage/src/share/man/man4/iscsi_initiator.4#4 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.4 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/share/man/man4/iscsi_initiator.4,v 1.5 2010/05/09 21:34:05 brueffer Exp $
 .\"
-.Dd February 23, 2007
+.Dd May 9, 2010
 .Dt ISCSI_INITIATOR 4
 .Os
 .Sh NAME
@@ -48,34 +48,39 @@
 The
 .Nm
 implements the kernel side of the Internet SCSI (iSCSI) network
-protocol standard, the user land companion is
+protocol standard.
+The userland companion is
 .Xr iscontrol 8 ,
 and permits access to remote
 .Em virtual
 SCSI devices via
 .Xr cam 4 .
 .Sh SYSCTL VARIABLES
-.Bl -tag -width ".Va net.iscsi.n.targeaddress"
+.Bl -tag -width "net.iscsi.n.targedaddress"
 .It Va debug.iscsi_initiator
 set the debug-level, 0 means no debugging, 9 for maximum.
 .It Va net.iscsi.isid
 the initiator part of the Session Identifier.
-.It "the following are informative only:"
+.El
+.Pp
+The following are informative only:
+.Pp
+.Bl -tag -width "net.iscsi.n.targedaddress"
 .It Va net.iscsi.driver_version
 the current version of the driver.
 .It Va net.iscsi.sessions
 the number of current active sessions.
 .It Va net.iscsi.n.targetname
-is the targe name of session
+the target name of session
 .Em n .
-.It Va net.iscsi.n.targeaddress
-is the IP address of the target of session
+.It Va net.iscsi.n.targedaddress
+the IP address of the target of session
 .Em n .
 .It Va net.iscsi.n.stats
-are some statistics for session
+statistics for session
 .Em n
 .It Va net.iscsi.n.pid
-is the 
+the 
 .Em "process id"
 of the userland side of session
 .Em n ,

==== //depot/projects/vimage/src/share/man/man4/ng_bridge.4#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\"
 .\" Author: Archie Cobbs 
 .\"
-.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.11 2005/09/27 18:10:42 mlaier Exp $
+.\" $FreeBSD: src/share/man/man4/ng_bridge.4,v 1.12 2010/05/05 22:06:05 zec Exp $
 .\"
-.Dd August 31, 2000
+.Dd May 5, 2010
 .Dt NG_BRIDGE 4
 .Os
 .Sh NAME
@@ -181,11 +181,17 @@
 .It Dv NGM_BRIDGE_GET_TABLE
 Returns the current host mapping table used to direct packets, in a
 .Dv "struct ng_bridge_host_ary" .
+.It Dv NGM_BRIDGE_SET_PERSISTENT
+This command sets the persistent flag on the node, and takes no arguments.
 .El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message, or when all hooks have been disconnected.
+control message, or when all hooks have been disconnected.  Setting the
+persistent flag via a
+.Dv NGM_BRIDGE_SET_PERSISTENT
+control message disables automatic node shutdown when the last hook gets
+disconnected.
 .Sh FILES
 .Bl -tag -width XXXXXXXX -compact
 .It Pa /usr/share/examples/netgraph/ether.bridge

==== //depot/projects/vimage/src/share/man/man4/ng_hub.4#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.1 2004/04/17 12:42:17 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ng_hub.4,v 1.2 2010/05/05 22:06:05 zec Exp $
 .\"
-.Dd April 17, 2004
+.Dd May 5, 2010
 .Dt NG_HUB 4
 .Os
 .Sh NAME
@@ -45,11 +45,20 @@
 node accepts any request to connect, regardless of the hook name,
 as long as the name is unique.
 .Sh CONTROL MESSAGES
-This node type supports only the generic control messages.
+This node type supports the generic control messages, plus the
+following:
+.Bl -tag -width foo
+.It Dv NGM_HUB_SET_PERSISTENT
+This command sets the persistent flag on the node, and takes no arguments.
+.El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
 .Dv NGM_SHUTDOWN
-control message, or when all hooks have been disconnected.
+control message, or when all hooks have been disconnected.  Setting the
+persistent flag via a
+.Dv NGM_HUB_SET_PERSISTENT
+control message disables automatic node shutdown when the last hook gets
+disconnected.
 .Sh SEE ALSO
 .Xr netgraph 4 ,
 .Xr ng_bridge 4 ,

==== //depot/projects/vimage/src/share/man/man4/sge.4#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sge.4,v 1.2 2010/04/29 18:21:27 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/sge.4,v 1.3 2010/05/10 17:48:00 yongari Exp $
 .\"
-.Dd April 29, 2010
+.Dd May 10, 2010
 .Dt SGE 4
 .Os
 .Sh NAME
@@ -54,9 +54,9 @@
 All LOMs supported by the
 .Nm
 driver have TCP/UDP/IP checksum offload for transmit and receive,
-hardware VLAN tag stripping/insertion features.
-Due to lack of documentation more offloading features like TCP
-segmentation offload (TSO), Wake On Lan (WOL), Jumbo frame and an
+TCP segmentation offload (TSO), hardware VLAN tag stripping/insertion
+features.
+Due to lack of documentation Wake On Lan (WOL), Jumbo frame and an
 interrupt moderation mechanism are not supported yet.
 .Pp
 The

==== //depot/projects/vimage/src/share/man/man9/make_dev.9#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.27 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.28 2010/05/06 19:23:49 kib Exp $
 .\"
-.Dd September 28, 2008
+.Dd May 6, 2010
 .Dt MAKE_DEV 9
 .Os
 .Sh NAME
@@ -133,9 +133,18 @@
 .Pp
 .Bd -literal -offset indent -compact
 MAKEDEV_REF	reference the created device
+MAKEDEV_NOWAIT	do not sleep, may return NULL
+MAKEDEV_WAITOK	allow the function to sleep to satisfy malloc
 .Ed
 .Pp
 The
+.Dv MAKEDEV_WAITOK
+flag is assumed if none of
+.Dv MAKEDEV_WAITOK ,
+.Dv MAKEDEV_NOWAIT
+is specified.
+.Pp
+The
 .Xr dev_clone 9
 event handler shall specify
 .Dv MAKEDEV_REF

==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#15 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $
  */
 
 #include "opt_atpic.h"
@@ -50,14 +50,14 @@
 	.bss
 	.globl	dtrace_invop_jump_addr
 	.align	8
-	.type	dtrace_invop_jump_addr, @object
-        .size	dtrace_invop_jump_addr, 8
+	.type	dtrace_invop_jump_addr,@object
+	.size	dtrace_invop_jump_addr,8
 dtrace_invop_jump_addr:
 	.zero	8
 	.globl	dtrace_invop_calltrap_addr
 	.align	8
-	.type	dtrace_invop_calltrap_addr, @object
-        .size	dtrace_invop_calltrap_addr, 8
+	.type	dtrace_invop_calltrap_addr,@object
+	.size	dtrace_invop_calltrap_addr,8
 dtrace_invop_calltrap_addr:
 	.zero	8
 #endif
@@ -157,7 +157,6 @@
 	 * kernel from userland.  Reenable interrupts if they were enabled
 	 * before the trap.  This approximates SDT_SYS386TGT on the i386 port.
 	 */
-
 	SUPERALIGN_TEXT
 	.globl	alltraps
 	.type	alltraps,@function
@@ -211,16 +210,16 @@
 	 * Set our jump address for the jump back in the event that
 	 * the breakpoint wasn't caused by DTrace at all.
 	 */
-	movq	$calltrap, dtrace_invop_calltrap_addr(%rip)
+	movq	$calltrap,dtrace_invop_calltrap_addr(%rip)
 
 	/* Jump to the code hooked in by DTrace. */
-	movq	dtrace_invop_jump_addr, %rax
+	movq	dtrace_invop_jump_addr,%rax
 	jmpq	*dtrace_invop_jump_addr
 #endif
 	.globl	calltrap
 	.type	calltrap,@function
 calltrap:
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	MEXITCOUNT
 	jmp	doreti			/* Handle any pending ASTs */
@@ -274,9 +273,11 @@
 	testb	$SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
 	jz	1f			/* already running with kernel GS.base */
 	swapgs
-1:	movq	%rsp, %rdi
+1:
+	movq	%rsp,%rdi
 	call	dblfault_handler
-2:	hlt
+2:
+	hlt
 	jmp	2b
 
 IDTVEC(page)
@@ -369,7 +370,7 @@
 	movq	%r15,TF_R15(%rsp)	/* C preserved */
 	movl	$TF_HASSEGS,TF_FLAGS(%rsp)
 	FAKE_MCOUNT(TF_RIP(%rsp))
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	syscall
 	movq	PCPU(CURPCB),%rax
 	andq	$~PCB_FULLCTX,PCB_FLAGS(%rax)
@@ -456,7 +457,7 @@
 /* Note: this label is also used by ddb and gdb: */
 nmi_calltrap:
 	FAKE_MCOUNT(TF_RIP(%rsp))
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	MEXITCOUNT
 #ifdef HWPMC_HOOKS
@@ -555,9 +556,9 @@
 	iretq
 
 ENTRY(fork_trampoline)
-	movq	%r12, %rdi		/* function */
-	movq	%rbx, %rsi		/* arg1 */
-	movq	%rsp, %rdx		/* trapframe pointer */
+	movq	%r12,%rdi		/* function */
+	movq	%rbx,%rsi		/* arg1 */
+	movq	%rsp,%rdx		/* trapframe pointer */
 	call	fork_exit
 	MEXITCOUNT
 	jmp	doreti			/* Handle any ASTs */
@@ -628,7 +629,7 @@
 	testl	$TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax)
 	je	doreti_exit
 	sti
-	movq	%rsp, %rdi			/* pass a pointer to the trapframe */
+	movq	%rsp,%rdi	/* pass a pointer to the trapframe */
 	call	ast
 	jmp	doreti_ast
 
@@ -648,8 +649,8 @@
 	 * Do not reload segment registers for kernel.
 	 * Since we do not reload segments registers with sane
 	 * values on kernel entry, descriptors referenced by
-	 * segments registers may be not valid. This is fatal
-	 * for the usermode, but is innocent for the kernel.
+	 * segments registers might be not valid.  This is fatal
+	 * for user mode, but is not a problem for the kernel.
 	 */
 	testb	$SEL_RPL_MASK,TF_CS(%rsp)
 	jz	ld_regs
@@ -662,14 +663,16 @@
 	/* Restore %fs and fsbase */
 	movw	TF_FS(%rsp),%ax
 	.globl	ld_fs
-ld_fs:	movw	%ax,%fs
+ld_fs:
+	movw	%ax,%fs
 	cmpw	$KUF32SEL,%ax
 	jne	1f
 	movl	$MSR_FSBASE,%ecx
 	movl	PCB_FSBASE(%r8),%eax
 	movl	PCB_FSBASE+4(%r8),%edx
 	.globl	ld_fsbase
-ld_fsbase: wrmsr
+ld_fsbase:
+	wrmsr
 1:
 	/* Restore %gs and gsbase */
 	movw	TF_GS(%rsp),%si
@@ -678,7 +681,8 @@
 	movl	$MSR_GSBASE,%ecx
 	rdmsr
 	.globl	ld_gs
-ld_gs:	movw	%si,%gs
+ld_gs:
+	movw	%si,%gs
 	wrmsr
 	popfq
 	cmpw	$KUG32SEL,%si
@@ -687,12 +691,17 @@
 	movl	PCB_GSBASE(%r8),%eax
 	movl	PCB_GSBASE+4(%r8),%edx
 	.globl	ld_gsbase
-ld_gsbase: wrmsr
-1:	.globl	ld_es
-ld_es:	movw	TF_ES(%rsp),%es
+ld_gsbase:
+	wrmsr
+1:
+	.globl	ld_es
+ld_es:
+	movw	TF_ES(%rsp),%es
 	.globl	ld_ds
-ld_ds:	movw	TF_DS(%rsp),%ds
-ld_regs:movq	TF_RDI(%rsp),%rdi
+ld_ds:
+	movw	TF_DS(%rsp),%ds
+ld_regs:
+	movq	TF_RDI(%rsp),%rdi
 	movq	TF_RSI(%rsp),%rsi
 	movq	TF_RDX(%rsp),%rdx
 	movq	TF_RCX(%rsp),%rcx
@@ -711,7 +720,8 @@
 	jz	1f			/* keep running with kernel GS.base */
 	cli
 	swapgs
-1:	addq	$TF_RIP,%rsp		/* skip over tf_err, tf_trapno */
+1:
+	addq	$TF_RIP,%rsp		/* skip over tf_err, tf_trapno */
 	.globl	doreti_iret
 doreti_iret:
 	iretq
@@ -738,7 +748,8 @@
 	testl	$PSL_I,TF_RFLAGS(%rsp)
 	jz	1f
 	sti
-1:	movw	%fs,TF_FS(%rsp)
+1:
+	movw	%fs,TF_FS(%rsp)
 	movw	%gs,TF_GS(%rsp)
 	movw	%es,TF_ES(%rsp)
 	movw	%ds,TF_DS(%rsp)
@@ -768,7 +779,7 @@
 	.globl	ds_load_fault
 ds_load_fault:
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movw	$KUDSEL,TF_DS(%rsp)
 	jmp	doreti
@@ -777,7 +788,7 @@
 	.globl	es_load_fault
 es_load_fault:
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movw	$KUDSEL,TF_ES(%rsp)
 	jmp	doreti
@@ -786,7 +797,7 @@
 	.globl	fs_load_fault
 fs_load_fault:
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movw	$KUF32SEL,TF_FS(%rsp)
 	jmp	doreti
@@ -796,7 +807,7 @@
 gs_load_fault:
 	popfq
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movw	$KUG32SEL,TF_GS(%rsp)
 	jmp	doreti
@@ -805,7 +816,7 @@
 	.globl	fsbase_load_fault
 fsbase_load_fault:
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movq	PCPU(CURTHREAD),%r8
 	movq	TD_PCB(%r8),%r8
@@ -816,7 +827,7 @@
 	.globl	gsbase_load_fault
 gsbase_load_fault:
 	movl	$T_PROTFLT,TF_TRAPNO(%rsp)
-	movq	%rsp, %rdi
+	movq	%rsp,%rdi
 	call	trap
 	movq	PCPU(CURTHREAD),%r8
 	movq	TD_PCB(%r8),%r8

==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#21 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.180 2010/03/11 14:17:37 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $");
 
 #include "opt_cpu.h"
 
@@ -240,7 +240,7 @@
 				printf("\n  Features2=0x%b", cpu_feature2,
 				"\020"
 				"\001SSE3"	/* SSE3 */
-				"\002"
+				"\002PCLMULQDQ"	/* Carry-Less Mul Quadword */
 				"\003DTES64"	/* 64-bit Debug Trace */
 				"\004MON"	/* MONITOR/MWAIT Instructions */
 				"\005DS_CPL"	/* CPL Qualified Debug Store */
@@ -264,7 +264,7 @@
 				"\027MOVBE"
 				"\030POPCNT"
 				"\031"
-				"\032"
+				"\032AESNI"	/* AES Crypto*/
 				"\033XSAVE"
 				"\034OSXSAVE"
 				"\035"

==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#39 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.694 2010/04/30 00:46:43 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.696 2010/05/08 20:34:01 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -2796,7 +2796,7 @@
 
 	KASSERT((m->flags & PG_FICTITIOUS) == 0,
 	    ("pmap_remove_all: page %p is fictitious", m));
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	vm_page_lock_queues();
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) {
 		pmap = PV_PMAP(pv);
@@ -2834,6 +2834,7 @@
 		PMAP_UNLOCK(pmap);
 	}
 	vm_page_flag_clear(m, PG_WRITEABLE);
+	vm_page_unlock_queues();
 }
 
 /*
@@ -3414,8 +3415,10 @@
 pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 {
 
+	vm_page_lock_queues();
 	PMAP_LOCK(pmap);

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

From owner-p4-projects@FreeBSD.ORG  Tue May 11 17:47:12 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49AA31065679; Tue, 11 May 2010 17:47:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0E15B106566C
	for ; Tue, 11 May 2010 17:47:12 +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 D69588FC16
	for ; Tue, 11 May 2010 17:47:11 +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 o4BHlBBq050533
	for ; Tue, 11 May 2010 17:47:11 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BHlBu7050531
	for perforce@freebsd.org; Tue, 11 May 2010 17:47:11 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 17:47:11 GMT
Message-Id: <201005111747.o4BHlBu7050531@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 178111 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, 11 May 2010 17:47:12 -0000

http://p4web.freebsd.org/@@178111?ac=10

Change 178111 by gcooper@starr-bastion on 2010/05/11 17:46:51

	Fix the compile.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#14 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#14 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Tue May 11 18:20:45 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 90FE71065674; Tue, 11 May 2010 18:20: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 555EF106566C
	for ; Tue, 11 May 2010 18:20: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 431D48FC13
	for ; Tue, 11 May 2010 18:20:45 +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 o4BIKjXL054115
	for ; Tue, 11 May 2010 18:20:45 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BIKjMe054113
	for perforce@freebsd.org; Tue, 11 May 2010 18:20:45 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 18:20:45 GMT
Message-Id: <201005111820.o4BIKjMe054113@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 178112 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, 11 May 2010 18:20:45 -0000

http://p4web.freebsd.org/@@178112?ac=10

Change 178112 by gcooper@starr-bastion on 2010/05/11 18:20:16

	Actually fix the compile because the perforce reverted the changes -_-...

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#15 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#15 (text+ko) ====

@@ -412,11 +412,11 @@
 	 * NOTE (gcooper): No sense in calloc'ing destfile or srcfile as the
 	 * first byte is zeroed out below in the archive add loop.
 	 */
-	if ((destfile = malloc(PATH_MAX, sizeof(char))) == NULL ||
+	if ((destfile = malloc(PATH_MAX * sizeof(char))) == NULL ||
 	   (destbase = calloc(PATH_MAX, sizeof(char))) == NULL ||
 	   (prefix = calloc(PATH_MAX, sizeof(char))) == NULL ||
 	   (srcbase = calloc(PATH_MAX, sizeof(char))) == NULL ||
-	   (srcfile = malloc(PATH_MAX, sizeof(char))) == NULL)
+	   (srcfile = malloc(PATH_MAX * sizeof(char))) == NULL)
 		error = strerror(errno);
 	/*
 	 * If the package tarball exists already, and we are running in
@@ -573,7 +573,7 @@
 					if (strlcpy(srcbase, BaseDir,
 					    PATH_MAX) > PATH_MAX)
 						error = strerror(ENAMETOOLONG);
-                                
+                                } 
                                 if (strlcpy(srcbase, prefix, PATH_MAX) >
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
@@ -588,7 +588,7 @@
 				/* First @cwd -- wewt! */
 				if (prefix == NULL) {
 
-                                        if (strlen(p->name) > MAX_PATH)
+                                        if (strlen(p->name) > PATH_MAX)
                                                 error = strerror(ENAMETOOLONG);
                                         else {
 

From owner-p4-projects@FreeBSD.ORG  Tue May 11 19:57:22 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B08CA1065670; Tue, 11 May 2010 19:57: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 5CDB71065686
	for ; Tue, 11 May 2010 19:57: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 4A44C8FC1D
	for ; Tue, 11 May 2010 19:57: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 o4BJvMr2062051
	for ; Tue, 11 May 2010 19:57:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BJvM06062049
	for perforce@freebsd.org; Tue, 11 May 2010 19:57:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 19:57:22 GMT
Message-Id: <201005111957.o4BJvM06062049@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 178114 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, 11 May 2010 19:57:22 -0000

http://p4web.freebsd.org/@@178114?ac=10

Change 178114 by gcooper@starr-bastion on 2010/05/11 19:56:31

	
	Add conflicts and mtree testcases.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#3 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#3 (text+ko) ====

@@ -20,6 +20,94 @@
 		       files will be added to the package with the appropriate
 		       modes (00644).
 
+Optional package contents.
+
+Mtree file:
+
+	Mtree file - no action:
+	- Type: Positive
+	- Setup: Create basic comments, description, and mtree files; create
+		 dummy files; add dummy files to package list.
+	- Test: Attempt to create package.
+	- PF Criteria: Package will be created with a package list containing
+		       the dummy files, and the mtree file; the associated
+		       comments, description, and mtree files will be added to
+		       the package with the appropriate modes (00644).
+
+	Mtree file - ownership and permissions modifications:
+	- Type: Positive
+	- Setup: Create basic comments, description, and mtree files (in
+		 particular add particular user and group ownership bits, mode
+		 bits, etc); create dummy files; add dummy files to package
+		 list.
+	- Test: Attempt to create package.
+	- PF Criteria: Package will be created with a package list containing
+		       the dummy files, and the mtree file; the associated
+		       comments, description, and mtree files will be added to
+		       the package with the ownership and appropriate modes
+		       according to the mtree file.
+
+	Mtree file - missing files:
+	- Type: Positive
+	- Setup: Create basic comments, description, and mtree files (in
+		 particular add a directory that isn't actually present in
+		 the package itself); create dummy files; add dummy files to
+		 package list. Create package.
+	- Test: Install package.
+	- PF Criteria: Package will be created with a package list containing
+		       the dummy files, and the mtree file; the associated
+		       comments, description, and mtree files will be added to
+		       the package with the sane default mode (00644). The
+		       missing directory will be created when the mtree file
+		       is parsed and evaluated.
+
+Conflicts.
+
+	Conflicts - No install:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Add conflict for
+		 package A to package B.
+	- Test: Attempt to create package A.
+	- PF Criteria: Package will be created with the associated comments and
+		       description.
+
+	Conflicts - conflict not present install:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Add conflict for
+		 package A to package B. Create both packages B and C.
+	- Test: Attempt to install packages B and C.
+	- PF Criteria: Package will be created with the appropriate data.
+		       Installing package B will work, and installing package C
+		       will work as well.
+
+	Conflicts - Present conflict:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Add conflict for
+		 package A to package B. Create both packages A and B.
+	- Test: Attempt to install packages A and B.
+	- PF Criteria: Package will be created with the appropriate data.
+		       Installing package A will work, and installing package B
+		       will fail.
+
+	Conflicts - Indirect conflict:
+	- Type: Positive
+	- Setup: Create packages A, B, and C. Add conflict for package A to
+	         package C. Make package A dependent on package B, and make
+		 package B dependent on package C.
+	- Test: Attempt to install packages A and B.
+	- PF Criteria: Packages will be created with the appropriate data.
+		       Installing package A will work, and installing package B
+		       will fail due to the indirect conflict between packages A
+		       and C.
+
+	Conflicts - self-conflicted:
+	- Type: Negative
+	- Setup: Create basic comments and description files. Add conflict for
+		 package A to package A.
+	- Test: Attempt to create package A.
+	- PF Criteria: Package A won't be created because of the circular
+		       self-conflict. 
+
 Tertiary functionality
 
 	Backup package...

From owner-p4-projects@FreeBSD.ORG  Tue May 11 21:23:49 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A859E1065677; Tue, 11 May 2010 21:23: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 6C5CA106566B
	for ; Tue, 11 May 2010 21:23:49 +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 40CAD8FC1B
	for ; Tue, 11 May 2010 21:23: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 o4BLNnG5081026
	for ; Tue, 11 May 2010 21:23:49 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BLNnPU081024
	for perforce@freebsd.org; Tue, 11 May 2010 21:23:49 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 21:23:49 GMT
Message-Id: <201005112123.o4BLNnPU081024@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 178119 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, 11 May 2010 21:23:49 -0000

http://p4web.freebsd.org/@@178119?ac=10

Change 178119 by gcooper@starr-bastion on 2010/05/11 21:22:57

	Add dependency tests.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#4 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#4 (text+ko) ====

@@ -61,6 +61,46 @@
 		       missing directory will be created when the mtree file
 		       is parsed and evaluated.
 
+Dependencies.
+
+	Dependencies - fulfilled dependency:
+	- Type: Positive
+	- Setup: Create basic comments, description. Set the dependency for
+		 package A on package B. Create packages A and B.
+	- Test: Install package.
+	- PF Criteria: Packages A and B will be created with a package list
+		       containing the dummy files. Package A will be installed
+		       after package B is installed due to the fulfilled
+		       dependency order. The mode will be kosher as usual
+		       (00644).
+
+	Dependencies - missing dependency:
+	- Type: Negative
+	- Setup: Create basic comments, description, etc. Add a dependency on
+		 for package A on package B.
+	- Test: Attempt to install package A.
+	- PF Criteria: The packages will be created with the given prescribed
+		       contents; when the package A install attempt is tried,
+		       the install will fail because the dependency (package B)
+		       is unfulfilled.
+
+	Dependencies - short circular dependency:
+	- Type: Negative
+	- Setup: Create a basic comment, description, etc, and create a
+		 package. Create a dependency with A upon itself.
+	- Test: Attempt to create package.
+	- PF Criteria: Package creation will fail citing the circular
+		       dependency.
+
+	Dependencies - inherited circular dependency:
+	- Type: Negative
+	- Setup: Create packages A, B, and C. Create a dependency with A upon
+		 B, B upon C, and C upon A. Create packages.
+	- Test: Attempt to install packages.
+	- PF Criteria: Package creation will succeed for packages A, B, and C,
+		       but the package installations will fail citing the
+		       circular dependency in the set.
+
 Conflicts.
 
 	Conflicts - No install:

From owner-p4-projects@FreeBSD.ORG  Tue May 11 21:51:17 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44059106567D; Tue, 11 May 2010 21:51:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 089201065675
	for ; Tue, 11 May 2010 21:51:17 +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 D18588FC0C
	for ; Tue, 11 May 2010 21:51: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 o4BLpGlV083001
	for ; Tue, 11 May 2010 21:51:16 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4BLpGE1082999
	for perforce@freebsd.org; Tue, 11 May 2010 21:51:16 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Tue, 11 May 2010 21:51:16 GMT
Message-Id: <201005112151.o4BLpGE1082999@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 178120 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, 11 May 2010 21:51:17 -0000

http://p4web.freebsd.org/@@178120?ac=10

Change 178120 by gcooper@starr-bastion on 2010/05/11 21:51:11

	Add install script testcases.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#5 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#5 (text+ko) ====

@@ -22,6 +22,45 @@
 
 Optional package contents.
 
+*install scripts:
+
+	*install scripts - the whole enchilada:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Create a series
+		 of scripts for testing *install states (preinstall,
+		 postinstall, predeinstall, and postdeinstall). Create package.
+	- Test: Install package and delete package.
+	- PF Criteria: Package will be installed, with the preinstall script
+		       being executed prior to install and the postinstall
+		       script being executed after the install. Similarly,
+		       when the package is deleted the predeinstall script will
+		       be executed prior to the delete being executed and the
+		       postdeinstall script will be executed after the package
+		       is deleted.
+
+	*install scripts - missing deinstall scripts:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Create a series
+		 of scripts for testing *install states (preinstall,
+		 postinstall, predeinstall, and postdeinstall). Create package.
+	- Test: Install package. Delete deinstall scripts. Delete package.
+	- PF Criteria: Package will be installed, with the preinstall script
+		       being executed prior to install and the postinstall
+		       script being executed after the install. The deinstall
+		       will fail though because the deinstall scripts are
+		       missing.
+
+	*install scripts - missing postdeinstall scripts:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Create a series
+		 of scripts for testing *install states (preinstall,
+		 postinstall, predeinstall, and postdeinstall). Create package.
+	- Test: Install package. Delete postdeinstall script. Delete package.
+	- PF Criteria: Package will be installed, with the preinstall script
+		       being executed prior to install and the postinstall
+		       script being executed after the install. The deinstall
+		       will fail because the deinstall script is missing.
+
 Mtree file:
 
 	Mtree file - no action:
@@ -148,7 +187,7 @@
 	- PF Criteria: Package A won't be created because of the circular
 		       self-conflict. 
 
-Tertiary functionality
+Tertiary functionality.
 
 	Backup package...
 

From owner-p4-projects@FreeBSD.ORG  Wed May 12 00:00:27 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F68A106567D; Wed, 12 May 2010 00:00:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2D4AB1065679
	for ; Wed, 12 May 2010 00:00:27 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 12F388FC25
	for ; Wed, 12 May 2010 00:00:27 +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 o4C00QIp094701
	for ; Wed, 12 May 2010 00:00:26 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4C00QrL094699
	for perforce@freebsd.org; Wed, 12 May 2010 00:00:26 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 12 May 2010 00:00:26 GMT
Message-Id: <201005120000.o4C00QrL094699@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 178128 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, 12 May 2010 00:00:27 -0000

http://p4web.freebsd.org/@@178128?ac=10

Change 178128 by gcooper@starr-bastion on 2010/05/11 23:59:48

	
	Push tar-like -X support into pkg_create(8) again.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#5 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#16 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_bsdtar_platform.h#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_config.h#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_line_reader.c#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_line_reader.h#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_matching.c#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_matching.h#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_pathmatch.c#1 add
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/tar_pathmatch.h#1 add

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#5 (text+ko) ====

@@ -3,6 +3,8 @@
 PROG=	pkg_create
 SRCS=	main.c perform.c pl.c
 
+SRCS+=	tar_line_reader.c tar_matching.c tar_pathmatch.c 
+
 WARNS?=	3
 WFORMAT?=	1
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#16 (text+ko) ====

@@ -19,8 +19,9 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.85 2010/04/23 11:07:43 flz Exp $");
+__FBSDID("$FreeBSD$");
 
+/* XXX (gcooper): needs to come before sys/stat.h for stat(2). */
 #include 
 #include 
 #include 
@@ -36,6 +37,7 @@
 
 #include 
 #include 
+#include "tar_matching.h"
 
 #include 
 #include "create.h"
@@ -374,6 +376,7 @@
 	struct stat *sb;
 	struct archive *archive = NULL;
 	struct archive_entry *entry = NULL;
+        struct lafe_matching *match_patterns = NULL;
 	char *destbase = NULL;
 	char *destfile = NULL;
 	char *prefix = NULL;
@@ -432,6 +435,20 @@
 		error = archive_error_string(archive);
 	else {
 
+                /* 
+                 * XXX (gcooper): replace these bits with a proper callback
+                 * via archive(3) when the time rolls around.
+                 */
+                if (ExcludeFrom != NULL) {
+                        if (lafe_exclude_from_file(&match_patterns,
+                            ExcludeFrom) < 0)
+                                error = strerror(EINVAL);
+                }
+
+        }
+
+        if (error == NULL) { 
+
 		switch(Zipper) {
 		case BZIP2:
 			cname = "bzipp";
@@ -465,14 +482,6 @@
 		error = archive_error_string(archive);
 	if (error != NULL) {
 
-#ifdef NOTYET
-		/* 
-		 * XXX (gcooper): Need to fill bits for the exclude
-		 * stuff
-		 */
-		if (ExcludeFrom != NULL) ;
-#endif
-
 		if (Verbose)
 			printf("Creating %sed tar ball in '%s'\n",
 			    cname, tball);
@@ -544,7 +553,9 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-			ADD_FILE(srcfile, destfile, archive_entry_open_flags);
+                        if (lafe_excluded(match_patterns, srcfile) != 0)
+        			ADD_FILE(srcfile, destfile,
+                                    archive_entry_open_flags);
 
 			break;
 
@@ -683,16 +694,11 @@
 			warn("%s: failed to remove incomplete package - '%s'",
 			    __func__, tball);
 	}
-	if (destbase != NULL)
-		free(destbase);
-	if (destfile != NULL)
-		free(destfile);
-	if (srcbase != NULL)
-		free(srcbase);
-	if (srcfile != NULL)
-		free(srcfile);
-	if (destfile != NULL)
-		free(destfile);
+        free(destbase);
+        free(destfile);
+        free(srcbase);
+        free(srcfile);
+        free(destfile);
 
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed May 12 00:02:29 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8C7A91065673; Wed, 12 May 2010 00:02:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 51277106566B
	for ; Wed, 12 May 2010 00:02:29 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EB018FC17
	for ; Wed, 12 May 2010 00:02:29 +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 o4C02TgT094829
	for ; Wed, 12 May 2010 00:02:29 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4C02TRD094827
	for perforce@freebsd.org; Wed, 12 May 2010 00:02:29 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 12 May 2010 00:02:29 GMT
Message-Id: <201005120002.o4C02TRD094827@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 178129 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, 12 May 2010 00:02:29 -0000

http://p4web.freebsd.org/@@178129?ac=10

Change 178129 by gcooper@starr-bastion on 2010/05/12 00:02:09

	Inverted logic FTL :(...

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#17 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#17 (text+ko) ====

@@ -553,7 +553,7 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-                        if (lafe_excluded(match_patterns, srcfile) != 0)
+                        if (lafe_excluded(match_patterns, srcfile) == 0)
         			ADD_FILE(srcfile, destfile,
                                     archive_entry_open_flags);
 

From owner-p4-projects@FreeBSD.ORG  Wed May 12 01:45:12 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7740D1065673; Wed, 12 May 2010 01:45:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3BB78106566C
	for ; Wed, 12 May 2010 01:45:12 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 288058FC12
	for ; Wed, 12 May 2010 01:45:12 +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 o4C1jCIB015287
	for ; Wed, 12 May 2010 01:45:12 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4C1jCAF015285
	for perforce@freebsd.org; Wed, 12 May 2010 01:45:12 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 12 May 2010 01:45:12 GMT
Message-Id: <201005120145.o4C1jCAF015285@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 178131 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, 12 May 2010 01:45:12 -0000

http://p4web.freebsd.org/@@178131?ac=10

Change 178131 by gcooper@starr-bastion on 2010/05/12 01:45:06

	       Fix indentation, because gavin noted that 8-space tabs are _actually_
	       hard tabs. Fix a testcase, and add a testcase for the predeinstall script.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#18 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/tools/regression/usr.sbin/pkg_install/create/testplan#6 (text+ko) ====

@@ -47,9 +47,20 @@
 	- PF Criteria: Package will be installed, with the preinstall script
 		       being executed prior to install and the postinstall
 		       script being executed after the install. The deinstall
-		       will fail though because the deinstall scripts are
+		       will fail though because the postdeinstall scripts are
 		       missing.
 
+	*install scripts - missing predeinstall scripts:
+	- Type: Positive
+	- Setup: Create basic comments and description files. Create a series
+		 of scripts for testing *install states (preinstall,
+		 postinstall, predeinstall, and postdeinstall). Create package.
+	- Test: Install package. Delete predeinstall script. Delete package.
+	- PF Criteria: Package will be installed, with the preinstall script
+		       being executed prior to install and the postinstall
+		       script being executed after the install. The deinstall
+		       will fail because the predeinstall script is missing.
+
 	*install scripts - missing postdeinstall scripts:
 	- Type: Positive
 	- Setup: Create basic comments and description files. Create a series

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#18 (text+ko) ====

@@ -340,43 +340,43 @@
 {
 
 	/* XXX (gcooper): add acl and xattr support? */
-#define ADD_FILE(srcfile, destfile, archive_entry_open_flags)                 \
-	if (error == NULL) {                                                  \
-		if ((archive_entry_fd = open(srcfile,                         \
-		    archive_entry_open_flags)) == -1 ||                       \
-		    fstat(archive_entry_fd, sb) == -1) {                      \
-			error = strerror(errno);                              \
-		} else if ((archive_entry_map_addr = mmap(NULL,               \
-		    PROT_READ, sb->st_size, MAP_SHARED,                       \
-		    archive_entry_fd, 0)) == NULL) {                          \
-			error = strerror(errno);                              \
-		} else {                                                      \
-			if ((entry = archive_entry_new()) == NULL)            \
-				error = archive_error_string(archive);        \
-			else {                                                \
-				archive_entry_copy_stat(entry, sb);           \
+#define ADD_FILE(srcfile, destfile, archive_entry_open_flags)		      \
+	if (error == NULL) {						      \
+		if ((archive_entry_fd = open(srcfile,			      \
+		    archive_entry_open_flags)) == -1 ||			      \
+		    fstat(archive_entry_fd, sb) == -1) {		      \
+			error = strerror(errno);			      \
+		} else if ((archive_entry_map_addr = mmap(NULL,		      \
+		    PROT_READ, sb->st_size, MAP_SHARED,			      \
+		    archive_entry_fd, 0)) == NULL) {			      \
+			error = strerror(errno);			      \
+		} else {						      \
+			if ((entry = archive_entry_new()) == NULL)	      \
+				error = archive_error_string(archive);	      \
+			else {						      \
+				archive_entry_copy_stat(entry, sb);	      \
 				archive_entry_copy_pathname(entry, destfile); \
-				if (archive_write_header(archive,             \
-				    entry) != ARCHIVE_OK)                     \
+				if (archive_write_header(archive,	      \
+				    entry) != ARCHIVE_OK)		      \
 					error = archive_error_string(archive);\
-				else if (archive_write_data(archive,          \
-				    archive_entry_map_addr,                   \
-				    sb->st_size) != ARCHIVE_OK)               \
+				else if (archive_write_data(archive,	      \
+				    archive_entry_map_addr,		      \
+				    sb->st_size) != ARCHIVE_OK)		      \
 					error = archive_error_string(archive);\
-				(void) munmap(archive_entry_map_addr,         \
-				    sb->st_size);                             \
-				archive_entry_free(entry);                    \
-			}                                                     \
-		}                                                             \
-		if (0 <= archive_entry_fd)                                    \
-			close(archive_entry_fd);                              \
+				(void) munmap(archive_entry_map_addr,	      \
+				    sb->st_size);			      \
+				archive_entry_free(entry);		      \
+			}						      \
+		}							      \
+		if (0 <= archive_entry_fd)				      \
+			close(archive_entry_fd);			      \
 	}
 
 	PackingList p;
 	struct stat *sb;
 	struct archive *archive = NULL;
 	struct archive_entry *entry = NULL;
-        struct lafe_matching *match_patterns = NULL;
+	struct lafe_matching *match_patterns = NULL;
 	char *destbase = NULL;
 	char *destfile = NULL;
 	char *prefix = NULL;
@@ -406,10 +406,10 @@
 
 	archive_open_flags = O_WRONLY;
 
-        if (Regenerate == TRUE)
-                archive_open_flags |= O_TRUNC;
-        else
-                archive_open_flags |= O_CREAT;
+	if (Regenerate == TRUE)
+		archive_open_flags |= O_TRUNC;
+	else
+		archive_open_flags |= O_CREAT;
 
 	/* 
 	 * NOTE (gcooper): No sense in calloc'ing destfile or srcfile as the
@@ -435,19 +435,19 @@
 		error = archive_error_string(archive);
 	else {
 
-                /* 
-                 * XXX (gcooper): replace these bits with a proper callback
-                 * via archive(3) when the time rolls around.
-                 */
-                if (ExcludeFrom != NULL) {
-                        if (lafe_exclude_from_file(&match_patterns,
-                            ExcludeFrom) < 0)
-                                error = strerror(EINVAL);
-                }
+		/* 
+		 * XXX (gcooper): replace these bits with a proper callback
+		 * via archive(3) when the time rolls around.
+		 */
+		if (ExcludeFrom != NULL) {
+			if (lafe_exclude_from_file(&match_patterns,
+			    ExcludeFrom) < 0)
+				error = strerror(EINVAL);
+		}
 
-        }
+	}
 
-        if (error == NULL) { 
+	if (error == NULL) { 
 
 		switch(Zipper) {
 		case BZIP2:
@@ -542,7 +542,7 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-                        /* Same as above, if srcbase is NULL. */
+			/* Same as above, if srcbase is NULL. */
 			if (srcbase != NULL)
 				if (strlcat(srcfile, srcbase,
 				    PATH_MAX) > PATH_MAX)
@@ -553,9 +553,9 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-                        if (lafe_excluded(match_patterns, srcfile) == 0)
-        			ADD_FILE(srcfile, destfile,
-                                    archive_entry_open_flags);
+			if (lafe_excluded(match_patterns, destfile) == 0)
+	 			ADD_FILE(srcfile, destfile,
+				    archive_entry_open_flags);
 
 			break;
 
@@ -569,13 +569,13 @@
 				 * whitespace.
 				 */
 				assert(prefix != NULL);
-                                
-                                /* 
-                                 * NOTE (gcooper): strcpy is safe here so long
-                                 * as the buffers are of equal size, and also
-                                 * because the value has been sanitized below
-                                 * and because of the assert above.
-                                 */
+
+				/* 
+				 * NOTE (gcooper): strcpy is safe here so long
+				 * as the buffers are of equal size, and also
+				 * because the value has been sanitized below
+				 * and because of the assert above.
+				 */
 				strcpy(destbase, prefix);
 
 				/* Reset srcbase */
@@ -584,8 +584,8 @@
 					if (strlcpy(srcbase, BaseDir,
 					    PATH_MAX) > PATH_MAX)
 						error = strerror(ENAMETOOLONG);
-                                } 
-                                if (strlcpy(srcbase, prefix, PATH_MAX) >
+				} 
+				if (strlcpy(srcbase, prefix, PATH_MAX) >
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
@@ -599,24 +599,26 @@
 				/* First @cwd -- wewt! */
 				if (prefix == NULL) {
 
-                                        if (strlen(p->name) > PATH_MAX)
-                                                error = strerror(ENAMETOOLONG);
-                                        else {
+					if (strlen(p->name) > PATH_MAX)
+						error = strerror(ENAMETOOLONG);
+					else {
+
+						prefix = p->name;
 
-                                                prefix = p->name;
+					 	/*
+						 * Tack BaseDir on the front if
+						 * defined and this is the first
+						 * run.
+						 */
+						if (BaseDir != NULL) {
+							if (strlcpy(srcbase,
+							    BaseDir, PATH_MAX) >
+							    PATH_MAX)
+								error = strerror(ENAMETOOLONG);
+						} else
+							srcbase[0] = '\0';
 
-	        			 	/*
-		        			 * Tack BaseDir on the front if
-			        		 * defined and this is the first run.
-				        	 */
-					        if (BaseDir != NULL) {
-						        if (strlcpy(srcbase,
-                                                            BaseDir, PATH_MAX) >
-                                                            PATH_MAX)
-	        						error = strerror(ENAMETOOLONG);
-		        			} else
-			        			srcbase[0] = '\0';
-                                        }
+					}
 
 				}
 
@@ -694,11 +696,11 @@
 			warn("%s: failed to remove incomplete package - '%s'",
 			    __func__, tball);
 	}
-        free(destbase);
-        free(destfile);
-        free(srcbase);
-        free(srcfile);
-        free(destfile);
+	free(destbase);
+	free(destfile);
+	free(srcbase);
+	free(srcfile);
+	free(destfile);
 
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed May 12 13:22:51 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A00B61065677; Wed, 12 May 2010 13:22:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E0C76106575A
	for ; Wed, 12 May 2010 13:22:50 +0000 (UTC)
	(envelope-from iprebeg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id CE3E28FC0C
	for ; Wed, 12 May 2010 13:22: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 o4CDMogd011250
	for ; Wed, 12 May 2010 13:22:50 GMT
	(envelope-from iprebeg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4CDMoRS011248
	for perforce@freebsd.org; Wed, 12 May 2010 13:22:50 GMT
	(envelope-from iprebeg@freebsd.org)
Date: Wed, 12 May 2010 13:22:50 GMT
Message-Id: <201005121322.o4CDMoRS011248@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	iprebeg@freebsd.org using -f
From: Ivor Prebeg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178142 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, 12 May 2010 13:22:51 -0000

http://p4web.freebsd.org/@@178142?ac=10

Change 178142 by iprebeg@iprebeg_nxlab_login on 2010/05/12 13:22:36

	Virtualizing static vars

Affected files ...

.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#32 edit

Differences ...

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

@@ -81,7 +81,14 @@
 #include 
 __FBSDID("$FreeBSD: src/sys/netinet6/ip6_mroute.c,v 1.64 2010/04/29 11:52:42 bz Exp $");
 
-#include "opt_inet.h"
+#define VIMAGE
+#define DIAGNOSTIC
+//#define MRT6DEBUG
+//#define MRT6_OINIT
+#define PIM6_CHECKSUM
+#define UPCALL_TIMING
+
+//#include "opt_inet.h"
 #include "opt_inet6.h"
 
 #include 
@@ -158,9 +165,10 @@
 SYSCTL_DECL(_net_inet6_ip6);
 SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
 
-static struct mrt6stat mrt6stat;
-SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW,
-    &mrt6stat, mrt6stat,
+static VNET_DEFINE(struct mrt6stat, mrt6stat);
+#define V_mrt6stat		VNET(mrt6stat)
+SYSCTL_VNET_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW,
+    &VNET_NAME(mrt6stat), mrt6stat,
     "Multicast Routing Statistics (struct mrt6stat, netinet6/ip6_mroute.h)");
 
 #define NO_RTE_FOUND	0x1
@@ -177,9 +185,10 @@
 	mtx_init(&mrouter6_mtx, "IPv6 multicast forwarding", NULL, MTX_DEF)
 #define	MROUTER6_LOCK_DESTROY()	mtx_destroy(&mrouter6_mtx)
 
-static struct mf6c *mf6ctable[MF6CTBLSIZ];
+static VNET_DEFINE(struct mf6c *, mf6ctable[MF6CTBLSIZ]);
+#define V_mf6ctable		VNET(mf6ctable)
 SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mf6ctable, CTLFLAG_RD,
-    &mf6ctable, sizeof(mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]",
+    &VNET_NAME(mf6ctable), sizeof(V_mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]",
     "IPv6 Multicast Forwarding Table (struct *mf6ctable[MF6CTBLSIZ], "
     "netinet6/ip6_mroute.h)");
 
@@ -194,11 +203,13 @@
 	mtx_init(&mfc6_mtx, "IPv6 multicast forwarding cache", NULL, MTX_DEF)
 #define	MFC6_LOCK_DESTROY()	mtx_destroy(&mfc6_mtx)
 
-static u_char n6expire[MF6CTBLSIZ];
+static VNET_DEFINE(u_char, n6expire[MF6CTBLSIZ]);
+#define V_n6expire		VNET(n6expire)
 
-static struct mif6 mif6table[MAXMIFS];
+static VNET_DEFINE(struct mif6, mif6table[MAXMIFS]);
+#define V_mif6table		VNET(mif6table)
 SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mif6table, CTLFLAG_RD,
-    &mif6table, sizeof(mif6table), "S,mif6[MAXMIFS]",
+    &VNET_NAME(mif6table), sizeof(V_mif6table), "S,mif6[MAXMIFS]",
     "IPv6 Multicast Interfaces (struct mif6[MAXMIFS], netinet6/ip6_mroute.h)");
 
 static struct mtx mif6_mtx;
@@ -246,12 +257,15 @@
 /*
  * Private variables.
  */
-static mifi_t nummifs = 0;
-static mifi_t reg_mif_num = (mifi_t)-1;
+static VNET_DEFINE(mifi_t, nummifs) = 0;
+#define V_nummifs		VNET(nummifs)
+static VNET_DEFINE(mifi_t, reg_mif_num) = (mifi_t)-1;
+#define V_reg_mif_num		VNET(reg_mif_num)
 
-static struct pim6stat pim6stat;
-SYSCTL_STRUCT(_net_inet6_pim, PIM6CTL_STATS, stats, CTLFLAG_RD,
-    &pim6stat, pim6stat,
+static VNET_DEFINE(struct pim6stat, pim6stat);
+#define V_pim6stat		VNET(pim6stat)
+SYSCTL_VNET_STRUCT(_net_inet6_pim, PIM6CTL_STATS, stats, CTLFLAG_RD,
+    &VNET_NAME(pim6stat), pim6stat,
     "PIM Statistics (struct pim6stat, netinet6/pim_var.h)");
 
 static VNET_DEFINE(int, pim6);
@@ -269,9 +283,9 @@
  * Find a route for a given origin IPv6 address and Multicast group address.
  */
 #define MF6CFIND(o, g, rt) do { \
-	struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \
+	struct mf6c *_rt = V_mf6ctable[MF6CHASH(o,g)]; \
 	rt = NULL; \
-	mrt6stat.mrt6s_mfc_lookups++; \
+	V_mrt6stat.mrt6s_mfc_lookups++; \
 	while (_rt) { \
 		if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \
 		    IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \
@@ -282,7 +296,7 @@
 		_rt = _rt->mf6c_next; \
 	} \
 	if (rt == NULL) { \
-		mrt6stat.mrt6s_mfc_misses++; \
+		V_mrt6stat.mrt6s_mfc_misses++; \
 	} \
 } while (/*CONSTCOND*/ 0)
 
@@ -316,7 +330,7 @@
 #ifdef UPCALL_TIMING
 #define UPCALL_MAX	50
 static u_long upcall_data[UPCALL_MAX + 1];
-static void collate();
+static void collate(struct timeval *t);
 #endif /* UPCALL_TIMING */
 
 static int ip6_mrouter_init(struct socket *, int, int);
@@ -490,13 +504,13 @@
 
 	MIF6_LOCK();
 
-	if (mifi >= nummifs) {
+	if (mifi >= V_nummifs) {
 		ret = EINVAL;
 	} else {
-		req->icount = mif6table[mifi].m6_pkt_in;
-		req->ocount = mif6table[mifi].m6_pkt_out;
-		req->ibytes = mif6table[mifi].m6_bytes_in;
-		req->obytes = mif6table[mifi].m6_bytes_out;
+		req->icount = V_mif6table[mifi].m6_pkt_in;
+		req->ocount = V_mif6table[mifi].m6_pkt_out;
+		req->ibytes = V_mif6table[mifi].m6_bytes_in;
+		req->obytes = V_mif6table[mifi].m6_bytes_out;
 	}
 
 	MIF6_UNLOCK();
@@ -546,8 +560,8 @@
 	V_ip6_mrouter = so;
 	V_ip6_mrouter_ver = cmd;
 
-	bzero((caddr_t)mf6ctable, sizeof(mf6ctable));
-	bzero((caddr_t)n6expire, sizeof(n6expire));
+	bzero((caddr_t)V_mf6ctable, sizeof(V_mf6ctable));
+	bzero((caddr_t)V_n6expire, sizeof(V_n6expire));
 
 	V_pim6 = 0;/* used for stubbing out/in pim stuff */
 
@@ -587,14 +601,14 @@
 	 * For each phyint in use, disable promiscuous reception of all IPv6
 	 * multicasts.
 	 */
-	for (mifi = 0; mifi < nummifs; mifi++) {
-		if (mif6table[mifi].m6_ifp &&
-		    !(mif6table[mifi].m6_flags & MIFF_REGISTER)) {
-			if_allmulti(mif6table[mifi].m6_ifp, 0);
+	for (mifi = 0; mifi < V_nummifs; mifi++) {
+		if (V_mif6table[mifi].m6_ifp &&
+		    !(V_mif6table[mifi].m6_flags & MIFF_REGISTER)) {
+			if_allmulti(V_mif6table[mifi].m6_ifp, 0);
 		}
 	}
-	bzero((caddr_t)mif6table, sizeof(mif6table));
-	nummifs = 0;
+	bzero((caddr_t)V_mif6table, sizeof(V_mif6table));
+	V_nummifs = 0;
 
 	V_pim6 = 0; /* used to stub out/in pim specific code */
 
@@ -605,7 +619,7 @@
 	 */
 	MFC6_LOCK();
 	for (i = 0; i < MF6CTBLSIZ; i++) {
-		rt = mf6ctable[i];
+		rt = V_mf6ctable[i];
 		while (rt) {
 			struct mf6c *frt;
 
@@ -621,16 +635,16 @@
 			free(frt, M_MRTABLE6);
 		}
 	}
-	bzero((caddr_t)mf6ctable, sizeof(mf6ctable));
+	bzero((caddr_t)V_mf6ctable, sizeof(V_mf6ctable));
 	MFC6_UNLOCK();
 
 	/*
 	 * Reset register interface
 	 */
-	if (reg_mif_num != (mifi_t)-1 && multicast_register_if6 != NULL) {
+	if (V_reg_mif_num != (mifi_t)-1 && multicast_register_if6 != NULL) {
 		if_detach(multicast_register_if6);
 		if_free(multicast_register_if6);
-		reg_mif_num = (mifi_t)-1;
+		V_reg_mif_num = (mifi_t)-1;
 		multicast_register_if6 = NULL;
 	}
 
@@ -647,7 +661,8 @@
 	return (0);
 }
 
-static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 };
+static VNET_DEFINE(struct sockaddr_in6, sin6) = { sizeof(VNET(sin6)), AF_INET6 };
+#define V_sin6		VNET(sin6)
 
 /*
  * Add a mif to the mif table
@@ -665,7 +680,7 @@
 		MIF6_UNLOCK();
 		return (EINVAL);
 	}
-	mifp = mif6table + mifcp->mif6c_mifi;
+	mifp = V_mif6table + mifcp->mif6c_mifi;
 	if (mifp->m6_ifp != NULL) {
 		MIF6_UNLOCK();
 		return (EADDRINUSE); /* XXX: is it appropriate? */
@@ -678,14 +693,14 @@
 	ifp = ifnet_byindex(mifcp->mif6c_pifi);
 
 	if (mifcp->mif6c_flags & MIFF_REGISTER) {
-		if (reg_mif_num == (mifi_t)-1) {
+		if (V_reg_mif_num == (mifi_t)-1) {
 			ifp = if_alloc(IFT_OTHER);
 
 			if_initname(ifp, "register_mif", 0);
 			ifp->if_flags |= IFF_LOOPBACK;
 			if_attach(ifp);
 			multicast_register_if6 = ifp;
-			reg_mif_num = mifcp->mif6c_mifi;
+			V_reg_mif_num = mifcp->mif6c_mifi;
 			/*
 			 * it is impossible to guess the ifindex of the
 			 * register interface.  So mif6c_pifi is automatically
@@ -720,8 +735,8 @@
 	bzero(&mifp->m6_route, sizeof(mifp->m6_route));
 
 	/* Adjust nummifs up if the mifi is higher than nummifs */
-	if (nummifs <= mifcp->mif6c_mifi)
-		nummifs = mifcp->mif6c_mifi + 1;
+	if (V_nummifs <= mifcp->mif6c_mifi)
+		V_nummifs = mifcp->mif6c_mifi + 1;
 
 	MIF6_UNLOCK();
 
@@ -742,13 +757,13 @@
 static int
 del_m6if_locked(mifi_t *mifip)
 {
-	struct mif6 *mifp = mif6table + *mifip;
+	struct mif6 *mifp = V_mif6table + *mifip;
 	mifi_t mifi;
 	struct ifnet *ifp;
 
 	MIF6_LOCK_ASSERT();
 
-	if (*mifip >= nummifs)
+	if (*mifip >= V_nummifs)
 		return (EINVAL);
 	if (mifp->m6_ifp == NULL)
 		return (EINVAL);
@@ -758,11 +773,11 @@
 		ifp = mifp->m6_ifp;
 		if_allmulti(ifp, 0);
 	} else {
-		if (reg_mif_num != (mifi_t)-1 &&
+		if (V_reg_mif_num != (mifi_t)-1 &&
 		    multicast_register_if6 != NULL) {
 			if_detach(multicast_register_if6);
 			if_free(multicast_register_if6);
-			reg_mif_num = (mifi_t)-1;
+			V_reg_mif_num = (mifi_t)-1;
 			multicast_register_if6 = NULL;
 		}
 	}
@@ -770,14 +785,14 @@
 	bzero((caddr_t)mifp, sizeof(*mifp));
 
 	/* Adjust nummifs down */
-	for (mifi = nummifs; mifi > 0; mifi--)
-		if (mif6table[mifi - 1].m6_ifp)
+	for (mifi = V_nummifs; mifi > 0; mifi--)
+		if (V_mif6table[mifi - 1].m6_ifp)
 			break;
-	nummifs = mifi;
+	V_nummifs = mifi;
 
 #ifdef MRT6DEBUG
 	if (V_mrt6debug)
-		log(LOG_DEBUG, "del_m6if %d, nummifs %d\n", *mifip, nummifs);
+		log(LOG_DEBUG, "del_m6if %d, nummifs %d\n", *mifip, V_nummifs);
 #endif
 
 	return (0);
@@ -817,7 +832,8 @@
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & DEBUG_MFC) {
 		    log(LOG_DEBUG,
-			"add_m6fc no upcall h %d o %s g %s p %x\n",
+			"add_m6fc no upcall h %d o %s g %s p %p\n",
+			hash,
 			ip6_sprintf(ip6bufo, &mfccp->mf6cc_origin.sin6_addr),
 			ip6_sprintf(ip6bufg, &mfccp->mf6cc_mcastgrp.sin6_addr),
 			mfccp->mf6cc_parent);
@@ -836,7 +852,7 @@
 	 */
 	hash = MF6CHASH(mfccp->mf6cc_origin.sin6_addr,
 			mfccp->mf6cc_mcastgrp.sin6_addr);
-	for (rt = mf6ctable[hash], nstl = 0; rt; rt = rt->mf6c_next) {
+	for (rt = V_mf6ctable[hash], nstl = 0; rt; rt = rt->mf6c_next) {
 		if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr,
 				       &mfccp->mf6cc_origin.sin6_addr) &&
 		    IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr,
@@ -874,7 +890,7 @@
 			rt->mf6c_wrong_if   = 0;
 
 			rt->mf6c_expire = 0;	/* Don't clean this guy up */
-			n6expire[hash]--;
+			V_n6expire[hash]--;
 
 			/* free packets Qed at the end of this entry */
 			for (rte = rt->mf6c_stall; rte != NULL; ) {
@@ -905,7 +921,7 @@
 			mfccp->mf6cc_parent);
 #endif
 
-		for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
+		for (rt = V_mf6ctable[hash]; rt; rt = rt->mf6c_next) {
 
 			if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr,
 					       &mfccp->mf6cc_origin.sin6_addr)&&
@@ -922,7 +938,7 @@
 				rt->mf6c_wrong_if   = 0;
 
 				if (rt->mf6c_expire)
-					n6expire[hash]--;
+					V_n6expire[hash]--;
 				rt->mf6c_expire	   = 0;
 			}
 		}
@@ -948,8 +964,8 @@
 			rt->mf6c_stall = NULL;
 
 			/* link into table */
-			rt->mf6c_next  = mf6ctable[hash];
-			mf6ctable[hash] = rt;
+			rt->mf6c_next  = V_mf6ctable[hash];
+			V_mf6ctable[hash] = rt;
 		}
 	}
 
@@ -1010,7 +1026,7 @@
 
 	MFC6_LOCK();
 
-	nptr = &mf6ctable[hash];
+	nptr = &V_mf6ctable[hash];
 	while ((rt = *nptr) != NULL) {
 		if (IN6_ARE_ADDR_EQUAL(&origin.sin6_addr,
 				       &rt->mf6c_origin.sin6_addr) &&
@@ -1144,7 +1160,7 @@
 		GET_TIME(tp);
 #endif /* UPCALL_TIMING */
 
-		mrt6stat.mrt6s_no_route++;
+		V_mrt6stat.mrt6s_no_route++;
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & (DEBUG_FORWARD | DEBUG_MFC))
 			log(LOG_DEBUG, "ip6_mforward: no rte s %s g %s\n",
@@ -1178,7 +1194,7 @@
 
 		/* is there an upcall waiting for this packet? */
 		hash = MF6CHASH(ip6->ip6_src, ip6->ip6_dst);
-		for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
+		for (rt = V_mf6ctable[hash]; rt; rt = rt->mf6c_next) {
 			if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_src,
 					       &rt->mf6c_origin.sin6_addr) &&
 			    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
@@ -1219,7 +1235,7 @@
 			/*
 			 * Send message to routing daemon
 			 */
-			sin6.sin6_addr = ip6->ip6_src;
+			V_sin6.sin6_addr = ip6->ip6_src;
 
 			im = NULL;
 #ifdef MRT6_OINIT
@@ -1252,8 +1268,8 @@
 				    "getting the iif info in the kernel\n");
 #endif
 
-			for (mifp = mif6table, mifi = 0;
-			     mifi < nummifs && mifp->m6_ifp != ifp;
+			for (mifp = V_mif6table, mifi = 0;
+			     mifi < V_nummifs && mifp->m6_ifp != ifp;
 			     mifp++, mifi++)
 				;
 
@@ -1268,10 +1284,10 @@
 				break;
 			}
 
-			if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
+			if (socket_send(V_ip6_mrouter, mm, &V_sin6) < 0) {
 				log(LOG_WARNING, "ip6_mforward: ip6_mrouter "
 				    "socket queue full\n");
-				mrt6stat.mrt6s_upq_sockfull++;
+				V_mrt6stat.mrt6s_upq_sockfull++;
 				free(rte, M_MRTABLE6);
 				m_freem(mb0);
 				free(rt, M_MRTABLE6);
@@ -1279,7 +1295,7 @@
 				return (ENOBUFS);
 			}
 
-			mrt6stat.mrt6s_upcalls++;
+			V_mrt6stat.mrt6s_upcalls++;
 
 			/* insert new entry at head of hash chain */
 			bzero(rt, sizeof(*rt));
@@ -1290,12 +1306,12 @@
 			rt->mf6c_mcastgrp.sin6_len = sizeof(struct sockaddr_in6);
 			rt->mf6c_mcastgrp.sin6_addr = ip6->ip6_dst;
 			rt->mf6c_expire = UPCALL_EXPIRE;
-			n6expire[hash]++;
+			V_n6expire[hash]++;
 			rt->mf6c_parent = MF6C_INCOMPLETE_PARENT;
 
 			/* link into table */
-			rt->mf6c_next  = mf6ctable[hash];
-			mf6ctable[hash] = rt;
+			rt->mf6c_next  = V_mf6ctable[hash];
+			V_mf6ctable[hash] = rt;
 			/* Add this entry to the end of the queue */
 			rt->mf6c_stall = rte;
 		} else {
@@ -1305,7 +1321,7 @@
 
 			for (p = &rt->mf6c_stall; *p != NULL; p = &(*p)->next)
 				if (++npkts > MAX_UPQ6) {
-					mrt6stat.mrt6s_upq_ovflw++;
+					V_mrt6stat.mrt6s_upq_ovflw++;
 					free(rte, M_MRTABLE6);
 					m_freem(mb0);
 					MFC6_UNLOCK();
@@ -1342,9 +1358,9 @@
 
 	MFC6_LOCK();
 	for (i = 0; i < MF6CTBLSIZ; i++) {
-		if (n6expire[i] == 0)
+		if (V_n6expire[i] == 0)
 			continue;
-		nptr = &mf6ctable[i];
+		nptr = &V_mf6ctable[i];
 		while ((mfc = *nptr) != NULL) {
 			rte = mfc->mf6c_stall;
 			/*
@@ -1374,8 +1390,8 @@
 					free(rte, M_MRTABLE6);
 					rte = n;
 				} while (rte != NULL);
-				mrt6stat.mrt6s_cache_cleanups++;
-				n6expire[i]--;
+				V_mrt6stat.mrt6s_cache_cleanups++;
+				V_n6expire[i]--;
 
 				*nptr = mfc->mf6c_next;
 				free(mfc, M_MRTABLE6);
@@ -1421,16 +1437,16 @@
 	 * for its origin.
 	 */
 	mifi = rt->mf6c_parent;
-	if ((mifi >= nummifs) || (mif6table[mifi].m6_ifp != ifp)) {
+	if ((mifi >= V_nummifs) || (V_mif6table[mifi].m6_ifp != ifp)) {
 		/* came in the wrong interface */
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & DEBUG_FORWARD)
 			log(LOG_DEBUG,
 			    "wrong if: ifid %d mifi %d mififid %x\n",
 			    ifp->if_index, mifi,
-			    mif6table[mifi].m6_ifp->if_index);
+			    V_mif6table[mifi].m6_ifp->if_index);
 #endif
-		mrt6stat.mrt6s_wrong_if++;
+		V_mrt6stat.mrt6s_wrong_if++;
 		rt->mf6c_wrong_if++;
 		/*
 		 * If we are doing PIM processing, and we are forwarding
@@ -1438,15 +1454,13 @@
 		 * routing daemon.
 		 */
 		/* have to make sure this is a valid mif */
-		if (mifi < nummifs && mif6table[mifi].m6_ifp)
+		if (mifi < V_nummifs && V_mif6table[mifi].m6_ifp)
 			if (V_pim6 && (m->m_flags & M_LOOP) == 0) {
 				/*
 				 * Check the M_LOOP flag to avoid an
 				 * unnecessary PIM assert.
 				 * XXX: M_LOOP is an ad-hoc hack...
 				 */
-				static struct sockaddr_in6 sin6 =
-				{ sizeof(sin6), AF_INET6 };
 
 				struct mbuf *mm;
 				struct mrt6msg *im;
@@ -1484,8 +1498,8 @@
 					return (EINVAL);
 				}
 
-				for (mifp = mif6table, iif = 0;
-				     iif < nummifs && mifp &&
+				for (mifp = V_mif6table, iif = 0;
+				     iif < V_nummifs && mifp &&
 					     mifp->m6_ifp != ifp;
 				     mifp++, iif++)
 					;
@@ -1494,23 +1508,23 @@
 #ifdef MRT6_OINIT
 				case MRT6_OINIT:
 					oim->im6_mif = iif;
-					sin6.sin6_addr = oim->im6_src;
+					V_sin6.sin6_addr = oim->im6_src;
 					break;
 #endif
 				case MRT6_INIT:
 					im->im6_mif = iif;
-					sin6.sin6_addr = im->im6_src;
+					V_sin6.sin6_addr = im->im6_src;
 					break;
 				}
 
-				mrt6stat.mrt6s_upcalls++;
+				V_mrt6stat.mrt6s_upcalls++;
 
-				if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
+				if (socket_send(V_ip6_mrouter, mm, &V_sin6) < 0) {
 #ifdef MRT6DEBUG
 					if (V_mrt6debug)
 						log(LOG_WARNING, "mdq, ip6_mrouter socket queue full\n");
 #endif
-					++mrt6stat.mrt6s_upq_sockfull;
+					++V_mrt6stat.mrt6s_upq_sockfull;
 					return (ENOBUFS);
 				}	/* if socket Q full */
 			}		/* if PIM */
@@ -1520,11 +1534,11 @@
 	/* If I sourced this packet, it counts as output, else it was input. */
 	if (m->m_pkthdr.rcvif == NULL) {
 		/* XXX: is rcvif really NULL when output?? */
-		mif6table[mifi].m6_pkt_out++;
-		mif6table[mifi].m6_bytes_out += plen;
+		V_mif6table[mifi].m6_pkt_out++;
+		V_mif6table[mifi].m6_bytes_out += plen;
 	} else {
-		mif6table[mifi].m6_pkt_in++;
-		mif6table[mifi].m6_bytes_in += plen;
+		V_mif6table[mifi].m6_pkt_in++;
+		V_mif6table[mifi].m6_bytes_in += plen;
 	}
 	rt->mf6c_pkt_cnt++;
 	rt->mf6c_byte_cnt += plen;
@@ -1540,7 +1554,7 @@
 		V_ip6stat.ip6s_badscope++;
 		return (error);
 	}
-	for (mifp = mif6table, mifi = 0; mifi < nummifs; mifp++, mifi++) {
+	for (mifp = V_mif6table, mifi = 0; mifi < V_nummifs; mifp++, mifi++) {
 		if (IF_ISSET(mifi, &rt->mf6c_ifset)) {
 			/*
 			 * check if the outgoing packet is going to break
@@ -1548,12 +1562,12 @@
 			 * XXX For packets through PIM register tunnel
 			 * interface, we believe a routing daemon.
 			 */
-			if (!(mif6table[rt->mf6c_parent].m6_flags &
+			if (!(V_mif6table[rt->mf6c_parent].m6_flags &
 			      MIFF_REGISTER) &&
-			    !(mif6table[mifi].m6_flags & MIFF_REGISTER)) {
-				if (in6_setscope(&src0, mif6table[mifi].m6_ifp,
+			    !(V_mif6table[mifi].m6_flags & MIFF_REGISTER)) {
+				if (in6_setscope(&src0, V_mif6table[mifi].m6_ifp,
 				    &oszone) ||
-				    in6_setscope(&dst0, mif6table[mifi].m6_ifp,
+				    in6_setscope(&dst0, V_mif6table[mifi].m6_ifp,
 				    &odzone) ||
 				    iszone != oszone ||
 				    idzone != odzone) {
@@ -1616,7 +1630,7 @@
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & DEBUG_XMIT)
 			log(LOG_DEBUG, "phyint_send on mif %d err %d\n",
-			    mifp - mif6table, error);
+			    mifp - V_mif6table, error);
 #endif
 		return;
 	}
@@ -1650,7 +1664,7 @@
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & DEBUG_XMIT)
 			log(LOG_DEBUG, "phyint_send on mif %d err %d\n",
-			    mifp - mif6table, error);
+			    mifp - V_mif6table, error);
 #endif
 	} else {
 		/*
@@ -1678,13 +1692,12 @@
 		}
 	}
 }
-
+	
 static int
 register_send(struct ip6_hdr *ip6, struct mif6 *mif, struct mbuf *m)
 {
 	struct mbuf *mm;
 	int i, len = m->m_pkthdr.len;
-	static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 };
 	struct mrt6msg *im6;
 
 #ifdef MRT6DEBUG
@@ -1695,7 +1708,7 @@
 		    ip6_sprintf(ip6bufd, &ip6->ip6_dst));
 	}
 #endif
-	++pim6stat.pim6s_snd_registers;
+	++V_pim6stat.pim6s_snd_registers;
 
 	/* Make a copy of the packet to send to the user level process */
 	MGETHDR(mm, M_DONTWAIT, MT_HEADER);
@@ -1721,24 +1734,24 @@
 	/*
 	 * Send message to routing daemon
 	 */
-	sin6.sin6_addr = ip6->ip6_src;
+	V_sin6.sin6_addr = ip6->ip6_src;
 
 	im6 = mtod(mm, struct mrt6msg *);
 	im6->im6_msgtype      = MRT6MSG_WHOLEPKT;
 	im6->im6_mbz          = 0;
 
-	im6->im6_mif = mif - mif6table;
+	im6->im6_mif = mif - V_mif6table;
 
 	/* iif info is not given for reg. encap.n */
-	mrt6stat.mrt6s_upcalls++;
+	V_mrt6stat.mrt6s_upcalls++;
 
-	if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
+	if (socket_send(V_ip6_mrouter, mm, &V_sin6) < 0) {
 #ifdef MRT6DEBUG
 		if (V_mrt6debug)
 			log(LOG_WARNING,
 			    "register_send: ip6_mrouter socket queue full\n");
 #endif
-		++mrt6stat.mrt6s_upq_sockfull;
+		++V_mrt6stat.mrt6s_upq_sockfull;
 		return (ENOBUFS);
 	}
 	return (0);
@@ -1779,7 +1792,7 @@
 	int minlen;
 	int off = *offp;
 
-	++pim6stat.pim6s_rcv_total;
+	++V_pim6stat.pim6s_rcv_total;
 
 	ip6 = mtod(m, struct ip6_hdr *);
 	pimlen = m->m_pkthdr.len - *offp;
@@ -1788,7 +1801,7 @@
 	 * Validate lengths
 	 */
 	if (pimlen < PIM_MINLEN) {
-		++pim6stat.pim6s_rcv_tooshort;
+		++V_pim6stat.pim6s_rcv_tooshort;
 #ifdef MRT6DEBUG
 		if (V_mrt6debug & DEBUG_PIM)
 			log(LOG_DEBUG,"pim6_input: PIM packet too short\n");
@@ -1821,7 +1834,7 @@
 #else
 	IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen);
 	if (pim == NULL) {
-		pim6stat.pim6s_rcv_tooshort++;
+		V_pim6stat.pim6s_rcv_tooshort++;
 		return (IPPROTO_DONE);
 	}
 #endif
@@ -1841,7 +1854,7 @@
 			cksumlen = pimlen;
 
 		if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) {
-			++pim6stat.pim6s_rcv_badsum;
+			++V_pim6stat.pim6s_rcv_badsum;
 #ifdef MRT6DEBUG
 			if (V_mrt6debug & DEBUG_PIM)
 				log(LOG_DEBUG,
@@ -1855,7 +1868,7 @@
 
 	/* PIM version check */
 	if (pim->pim_ver != PIM_VERSION) {
-		++pim6stat.pim6s_rcv_badversion;
+		++V_pim6stat.pim6s_rcv_badversion;
 #ifdef MRT6DEBUG
 		log(LOG_ERR,
 		    "pim6_input: incorrect version %d, expecting %d\n",
@@ -1881,14 +1894,14 @@
 		char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
 #endif
 
-		++pim6stat.pim6s_rcv_registers;
+		++V_pim6stat.pim6s_rcv_registers;
 
-		if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) {
+		if ((V_reg_mif_num >= V_nummifs) || (V_reg_mif_num == (mifi_t) -1)) {
 #ifdef MRT6DEBUG
 			if (V_mrt6debug & DEBUG_PIM)
 				log(LOG_DEBUG,
 				    "pim6_input: register mif not set: %d\n",
-				    reg_mif_num);
+				    V_reg_mif_num);
 #endif
 			m_freem(m);
 			return (IPPROTO_DONE);
@@ -1903,8 +1916,8 @@
 		 * Validate length
 		 */
 		if (pimlen < PIM6_REG_MINLEN) {
-			++pim6stat.pim6s_rcv_tooshort;
-			++pim6stat.pim6s_rcv_badregisters;
+			++V_pim6stat.pim6s_rcv_tooshort;
+			++V_pim6stat.pim6s_rcv_badregisters;
 #ifdef MRT6DEBUG
 			log(LOG_ERR,
 			    "pim6_input: register packet size too "
@@ -1928,7 +1941,7 @@
 
 		/* verify the version number of the inner packet */
 		if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) {
-			++pim6stat.pim6s_rcv_badregisters;
+			++V_pim6stat.pim6s_rcv_badregisters;
 #ifdef MRT6DEBUG
 			log(LOG_DEBUG, "pim6_input: invalid IP version (%d) "
 			    "of the inner packet\n",
@@ -1940,7 +1953,7 @@
 
 		/* verify the inner packet is destined to a mcast group */
 		if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) {
-			++pim6stat.pim6s_rcv_badregisters;
+			++V_pim6stat.pim6s_rcv_badregisters;
 #ifdef MRT6DEBUG
 			if (V_mrt6debug & DEBUG_PIM)
 				log(LOG_DEBUG,
@@ -1977,11 +1990,11 @@
 			    "src %s, dst %s, mif %d\n",
 			    ip6_sprintf(ip6bufs, &eip6->ip6_src),
 			    ip6_sprintf(ip6bufd, &eip6->ip6_dst),
-			    reg_mif_num);
+			    V_reg_mif_num);
 		}
 #endif
 
-		rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m,
+		rc = if_simloop(V_mif6table[V_reg_mif_num].m6_ifp, m,
 				dst.sin6_family, 0);
 
 		/* prepare the register head to send to the mrouting daemon */
@@ -1999,6 +2012,25 @@
 	return (IPPROTO_DONE);
 }
 
+static void
+vnet_mroute6_init(const void *unused __unused)
+{
+
+}
+
+VNET_SYSINIT(vnet_mroute6_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_mroute6_init,
+        NULL);
+                
+static void
+vnet_mroute6_uninit(const void *unused __unused)
+{
+
+        X_ip6_mrouter_done();
+}
+
+VNET_SYSUNINIT(vnet_mroute6_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE,
+        vnet_mroute6_uninit, NULL);
+
 static int
 ip6_mroute_modevent(module_t mod, int type, void *unused)
 {
@@ -2035,7 +2067,7 @@
 			encap_detach(pim6_encap_cookie);
 			pim6_encap_cookie = NULL;
 		}
-		X_ip6_mrouter_done();
+		// moving to uninit()  X_ip6_mrouter_done();
 		ip6_mforward = NULL;
 		ip6_mrouter_done = NULL;
 		ip6_mrouter_get = NULL;

From owner-p4-projects@FreeBSD.ORG  Wed May 12 14:14:43 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 631A0106566B; Wed, 12 May 2010 14:14:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1C3671065674
	for ; Wed, 12 May 2010 14:14:43 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 09B038FC16
	for ; Wed, 12 May 2010 14:14:43 +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 o4CEEgDj016554
	for ; Wed, 12 May 2010 14:14:42 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4CEEgeg016550
	for perforce@freebsd.org; Wed, 12 May 2010 14:14:42 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 12 May 2010 14:14:42 GMT
Message-Id: <201005121414.o4CEEgeg016550@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 178144 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, 12 May 2010 14:14:43 -0000

http://p4web.freebsd.org/@@178144?ac=10

Change 178144 by rene@rene_eee on 2010/05/12 14:13:50

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#78 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/Makefile#5 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/faq230.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/gnome/index.xsl#6 integrate
.. //depot/projects/docproj_nl/www/en/gnome/news.xml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#7 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#24 integrate

Differences ...

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

@@ -1,7 +1,7 @@
 
 
 /usr/ports/INDEX
 	  (see ).  However, even more
-	  trivial commands such as make -V maintainer
+	  trivial commands such as make maintainer
 	  also fail in this scenario.  This is not acceptable.
 
 	

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 devel/gnome2-hacker-tools (development tools)
 		
 
-		
    Upgrading to GNOME 2.28?
    
+		
    Upgrading to GNOME 2.30?
    
 
-		
    If you are upgrading from GNOME 2.26 to GNOME 2.28, read the
-		  Upgrade FAQ for upgrade
+		
    If you are upgrading from GNOME 2.28 to GNOME 2.30, read the
+		  Upgrade FAQ for upgrade
 		  instructions.
    
 
               
    State of the port
    

==== //depot/projects/docproj_nl/www/en/gnome/news.xml#6 (text+ko) ====

@@ -19,10 +19,94 @@
 
   
-    $FreeBSD: www/en/gnome/news.xml,v 1.151 2009/11/29 21:03:51 marcus Exp $
+    $FreeBSD: www/en/gnome/news.xml,v 1.152 2010/05/10 19:33:23 kwm Exp $
   
 
   
+    2010
+
+    
+      May
+
+      
+        10
+
+        
+        Announcing GNOME 2.30.1. for FreeBSD!
+
+        
    Presenting GNOME 2.30.1 for FreeBSD. The offical release
+        notes for this release can be found at 
+        
+        http://library.gnome.org/misc/release-notes/2.30/
    
+
+        
    This release brings initial PackageKit support, Upower (replaces 
+        power management part of hal), cuse4bsd integration with HAL and cheese,
+        and a faster Evolution.
    
+
+        
    Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support.
+        This will also be the last of the 2.x releases. The next release will 
+        be the highly-anticipated GNOME 3.0 which will bring with it a new UI 
+        experience.
    
+
+        
    Currently, there are a few bugs with GNOME 2.30 that may be of note 
+        for our users. Be sure to consult the 2.30 upgrade FAQ at 
+        
+        http://www.freebsd.org/gnome/docs/faq230.html>
+        for specific upgrading instructions, and the up-to-date list of known 
+        issues.
    
+
+        
    This release features commits by: avl, ahze, bland, marcus, mezz 
+        and myself.
    
+
+        
    The FreeBSD GNOME Team would like to thank Anders F Bjorklund for
+        doing the initual packagekit porting.
    
+
+        
    And the following contributors and testers for there help with this 
+        release:
    
+
+        
    
+        Eric L. Chen
+        
    
+
+        Vladimir Grebenschikov
+        
    
+
+        Sergio de Almeida Lenzi
+        
    
+
+        DomiX
+        
    
+
+        walder
+        
    
+
+        crsd
+        
    
+
+        Kevin Oberman
+        
    
+
+        Michal Varga
+        
    
+
+        Pavel Plesov
+        
    
+
+        Bapt
+        
    
+
+        kevin
+        
    
+
+        and Ion-Mihai Tetcu for running two exp-runs for us.
+        
    
+        
    
+            
+          
+        
+      
+
+ 
     2009
 
     

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#7 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 FreeBSD/GNOME
       
  '>

==== //depot/projects/docproj_nl/www/share/sgml/release.ent#24 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
@@ -122,7 +122,7 @@
     
  • &os;/GNOME
       
  '>

From owner-p4-projects@FreeBSD.ORG  Wed May 12 22:03:44 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A528D1065679; Wed, 12 May 2010 22:03:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 69BF11065674
	for ; Wed, 12 May 2010 22:03:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 583868FC08
	for ; Wed, 12 May 2010 22:03: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 o4CM3iEk084950
	for ; Wed, 12 May 2010 22:03:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4CM3iBc084948
	for perforce@freebsd.org; Wed, 12 May 2010 22:03:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 12 May 2010 22:03:44 GMT
Message-Id: <201005122203.o4CM3iBc084948@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 178173 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, 12 May 2010 22:03:44 -0000

http://p4web.freebsd.org/@@178173?ac=10

Change 178173 by hselasky@hselasky_laptop001 on 2010/05/12 22:03:11

	USB serial:
		- fix possibly wrong bit masking
		- reported by: Nick Hibma

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#5 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/uhso.c#5 (text+ko) ====

@@ -1339,7 +1339,7 @@
 	if (onoff)
 		sc->sc_line |= UCDC_LINE_DTR;
 	else
-		sc->sc_line &= UCDC_LINE_DTR;
+		sc->sc_line &= ~UCDC_LINE_DTR;
 
 	uhso_bs_cfg(sc);
 }
@@ -1355,7 +1355,7 @@
 	if (onoff)
 		sc->sc_line |= UCDC_LINE_RTS;
 	else
-		sc->sc_line &= UCDC_LINE_DTR;
+		sc->sc_line &= ~UCDC_LINE_RTS;
 
 	uhso_bs_cfg(sc);
 }

From owner-p4-projects@FreeBSD.ORG  Thu May 13 03:38:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 046DB1065675; Thu, 13 May 2010 03:38: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 AF020106566C
	for ; Thu, 13 May 2010 03:38:22 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AC038FC22
	for ; Thu, 13 May 2010 03:38: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 o4D3cMp1026839
	for ; Thu, 13 May 2010 03:38:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4D3cMms026837
	for perforce@freebsd.org; Thu, 13 May 2010 03:38:22 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 03:38:22 GMT
Message-Id: <201005130338.o4D3cMms026837@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 178188 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, 13 May 2010 03:38:23 -0000

http://p4web.freebsd.org/@@178188?ac=10

Change 178188 by gcooper@starr-bastion on 2010/05/13 03:38:14

	- Take the useful bits out of the ADD_FILE macro and move it into a real function called add_file.
	- Clean up create_from_installed_recursive so that it's style-compliant and the flow is easier to
	follow.
	- Fix some delightful bugs with wild pointers because it's been sufficiently long since I've used
	*stat and I made the time old mistake of not allocating sb beforehand, etc, etc. Thanks to the
	folks who replied on hackers@ for noting my stupid mistake.
	- Need to determine what to do about adding +CONTENTS, etc 
	- Disable mmap(2) for now because it doesn't work; need to determine why not.
	
	Need to determine what to do about adding +CONTENTS, etc in make_dist since it's added twice today
	if Prefix is NULL and we're bootstrapping a package which isn't installed on the disk :(.
	
	The metadata files should be at the top of the archive because it would speed up pkg_info, and
	regular metadata reads when reading from a package archive opposed to reading data directly off
	the disk in $PKG_PREFIX.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#20 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#20 (text+ko) ====

@@ -43,6 +43,8 @@
 #include "create.h"
 
 static void sanity_check(void);
+static const char* add_file(struct archive *, const char *, const char *,
+		const int);
 static void make_dist(const char *, const char *, const char *, Package *);
 static int create_from_installed_recursive(const char *, const char *);
 static int create_from_installed(const char *, const char *, const char *);
@@ -262,7 +264,7 @@
     /* mark_plist(&plist); */
 
     /* Now put the release specific items in */
-    if (!Prefix)
+    if (Prefix == NULL)
 	add_plist(&plist, PLIST_CWD, ".");
 
     write_file(COMMENT_FNAME, Comment);
@@ -274,38 +276,38 @@
     add_plist(&plist, PLIST_FILE, DESC_FNAME);
     add_cksum(&plist, plist.tail, DESC_FNAME);
 
-    if (Install) {
+    if (Install != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, INSTALL_FNAME);
 	add_cksum(&plist, plist.tail, INSTALL_FNAME);
     }
-    if (PostInstall) {
+    if (PostInstall != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME);
 	add_cksum(&plist, plist.tail, POST_INSTALL_FNAME);
     }
-    if (DeInstall) {
+    if (DeInstall != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME);
 	add_cksum(&plist, plist.tail, DEINSTALL_FNAME);
     }
-    if (PostDeInstall) {
+    if (PostDeInstall != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME);
 	add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME);
     }
-    if (Require) {
+    if (Require != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, REQUIRE_FNAME);
 	add_cksum(&plist, plist.tail, REQUIRE_FNAME);
     }
-    if (Display) {
+    if (Display != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, DISPLAY_FNAME);
 	add_cksum(&plist, plist.tail, DISPLAY_FNAME);
 	add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME);
     }
-    if (Mtree) {
+    if (Mtree != NULL) {
 	add_plist(&plist, PLIST_IGNORE, NULL);
 	add_plist(&plist, PLIST_FILE, MTREE_FNAME);
 	add_cksum(&plist, plist.tail, MTREE_FNAME);
@@ -324,7 +326,7 @@
 	err(2, "%s: error occurred when closing %s", __func__, CONTENTS_FNAME);
     }
 
-    /* And stick it into a tar ball */
+    /* And stick it into a tarball */
     make_dist(home, pkg, suf, &plist);
 
     /* Cleanup */
@@ -335,47 +337,110 @@
     return TRUE;	/* Success */
 }
 
+static const char* 
+add_file(struct archive *archive, const char *srcfile, const char *destfile,
+	const int archive_entry_open_flags)
+{
+
+/*
+ * XXX (gcooper):
+ * The mmap code below doesn't function with archive(3) today; need to
+ * determine why as no diags are fed back as to why it doesn't work, because
+ * it would probably be a performance boost to map the pages for the backing
+ * files into memory and just do one read as opposed to many small reads.
+ *
+ * #define BROKEN_MMAP
+ */
+
+	struct archive_entry *entry = NULL;
+	struct stat sb;
+	const char *error = NULL;
+	int archive_entry_fd;
+#ifdef BROKEN_MMAP
+	void *archive_entry_map_addr = NULL;
+#else
+	char archive_entry_buf[BUFSIZ];
+	size_t len;
+#endif
+
+	if (Verbose)
+		printf("C - %s\n", srcfile);
+
+	if ((archive_entry_fd = open(srcfile, archive_entry_open_flags)) == -1)
+		error = strerror(errno);
+	else if (fstat(archive_entry_fd, &sb) == -1) 
+		error = strerror(errno);
+#ifdef BROKEN_MMAP
+	else if ((archive_entry_map_addr = mmap(NULL, sb.st_size, PROT_READ,
+	    MAP_SHARED, archive_entry_fd, 0)) == NULL)
+		error = strerror(errno);
+#endif
+	else {
+
+		if ((entry = archive_entry_new()) == NULL)
+			error = archive_error_string(archive);
+		else {
+
+			archive_entry_copy_stat(entry, &sb);
+			archive_entry_copy_pathname(entry, destfile);
+			if (archive_write_header(archive, entry) != ARCHIVE_OK)
+				error = archive_error_string(archive);
+#ifdef BROKEN_MMAP
+			/* 
+			 * XXX (gcooper): fails to write data here with mmap(2)
+			 * enabled.
+			 */
+			else if (archive_write_data(archive,
+			    archive_entry_map_addr, sb.st_size) != ARCHIVE_OK)
+				error = archive_error_string(archive);
+			(void) munmap(archive_entry_map_addr, sb.st_size);
+#else
+			else if (error != NULL) {
+
+				do {
+
+					len = read(archive_entry_fd,
+					    archive_entry_buf,
+					    sizeof(archive_entry_buf));
+
+					if (archive_write_data(archive,
+					    archive_entry_buf,
+					    sizeof(archive_entry_buf)) !=
+					    ARCHIVE_OK)
+						error = archive_error_string(archive);
+
+				} while (error == NULL && len > 0);
+
+			}
+
+#endif
+			archive_entry_free(entry);
+
+		}
+
+	}
+
+	if (0 <= archive_entry_fd)
+		close(archive_entry_fd);
+
+	return error;
+
+}
+
 static void
 make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist)
 {
 
-	/* XXX (gcooper): add acl and xattr support? */
-#define ADD_FILE(srcfile, destfile, archive_entry_open_flags)		      \
-	if (error == NULL) {						      \
-		if ((archive_entry_fd = open(srcfile,			      \
-		    archive_entry_open_flags)) == -1 ||			      \
-		    fstat(archive_entry_fd, sb) == -1) {		      \
-			error = strerror(errno);			      \
-		} else if ((archive_entry_map_addr = mmap(NULL,		      \
-		    PROT_READ, sb->st_size, MAP_SHARED,			      \
-		    archive_entry_fd, 0)) == NULL) {			      \
-			error = strerror(errno);			      \
-		} else {						      \
-			if ((entry = archive_entry_new()) == NULL)	      \
-				error = archive_error_string(archive);	      \
-			else {						      \
-				archive_entry_copy_stat(entry, sb);	      \
-				archive_entry_copy_pathname(entry, destfile); \
-				if (archive_write_header(archive,	      \
-				    entry) != ARCHIVE_OK)		      \
-					error = archive_error_string(archive);\
-				else if (archive_write_data(archive,	      \
-				    archive_entry_map_addr,		      \
-				    sb->st_size) != ARCHIVE_OK)		      \
-					error = archive_error_string(archive);\
-				(void) munmap(archive_entry_map_addr,	      \
-				    sb->st_size);			      \
-				archive_entry_free(entry);		      \
-			}						      \
-		}							      \
-		if (0 <= archive_entry_fd)				      \
-			close(archive_entry_fd);			      \
-	}
+#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS)				\
+	do {								\
+		if (error == NULL) {					\
+			error = add_file(archive, SRCFILE, DESTFILE,	\
+			    OPEN_FLAGS);				\
+		}							\
+	} while (0)
 
 	PackingList p;
-	struct stat *sb;
 	struct archive *archive = NULL;
-	struct archive_entry *entry = NULL;
 	struct lafe_matching *match_patterns = NULL;
 	char *destbase = NULL;
 	char *destfile = NULL;
@@ -388,11 +453,9 @@
 	const char *error = NULL;
 	int archive_fd = -1;
 	int archive_open_flags;
-	int archive_entry_fd = -1;
 	int archive_entry_open_flags;
 	int archive_metadata_open_flags;
 	int destbase_len, srcbase_len;
-	void *archive_entry_map_addr;
 
 	if (*pkg == '/')
 		snprintf(tball, sizeof(tball), "%s.%s", pkg, suff);
@@ -740,41 +803,40 @@
 static int
 create_from_installed_recursive(const char *pkg, const char *suf)
 {
-    FILE *fp;
-    Package plist;
-    PackingList p;
-    char tmp[PATH_MAX];
-    int rval;
+	FILE *fp;
+	Package plist;
+	PackingList p;
+	char tmp[PATH_MAX];
+	int rval;
 
-    if (!create_from_installed(InstalledPkg, pkg, suf))
-	return FALSE;
-    snprintf(tmp, sizeof(tmp), "%s/%s/%s", LOG_DIR, InstalledPkg, CONTENTS_FNAME);
-    if (!fexists(tmp)) {
-	warnx("can't find package '%s' installed!", InstalledPkg);
-	return FALSE;
-    }
-    /* Suck in the contents list */
-    plist.head = plist.tail = NULL;
-    fp = fopen(tmp, "r");
-    if (!fp) {
-	warnx("unable to open %s file", tmp);
-	return FALSE;
-    }
-    read_plist(&plist, fp);
-    fclose(fp);
-    rval = TRUE;
-    for (p = plist.head; p ; p = p->next) {
-	if (p->type != PLIST_PKGDEP)
-	    continue;
-	if (Verbose)
-	    printf("Creating package %s\n", p->name);
-	if (!create_from_installed(p->name, p->name, suf)) {
-	    rval = FALSE;
-	    break;
+	if (!create_from_installed(InstalledPkg, pkg, suf))
+		return FALSE;
+	snprintf(tmp, sizeof(tmp), "%s/%s/%s",
+	    LOG_DIR, InstalledPkg, CONTENTS_FNAME);
+	if (!fexists(tmp)) {
+		warnx("can't find package '%s' installed!", InstalledPkg);
+		return FALSE;
+	}
+	/* Suck in the contents list */
+	plist.head = plist.tail = NULL;
+	fp = fopen(tmp, "r");
+	if (fp == NULL) {
+		warnx("unable to open %s file", tmp);
+		return FALSE;
+	}
+	read_plist(&plist, fp);
+	fclose(fp);
+	rval = TRUE;
+	for (p = plist.head; p != NULL && rval == TRUE; p = p->next) {
+		if (p->type == PLIST_PKGDEP) {
+			if (Verbose)
+				printf("Creating package %s\n", p->name);
+			if (!create_from_installed(p->name, p->name, suf))
+				rval = FALSE;
+		}
 	}
-    }
-    free_plist(&plist);
-    return rval;
+	free_plist(&plist);
+	return rval;
 }
 
 static int

From owner-p4-projects@FreeBSD.ORG  Thu May 13 03:40:25 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F3B61065675; Thu, 13 May 2010 03:40:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7F68106566B
	for ; Thu, 13 May 2010 03:40:24 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C51488FC13
	for ; Thu, 13 May 2010 03:40:24 +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 o4D3eO1Z027037
	for ; Thu, 13 May 2010 03:40:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4D3eOuv027035
	for perforce@freebsd.org; Thu, 13 May 2010 03:40:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 03:40:24 GMT
Message-Id: <201005130340.o4D3eOuv027035@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 178189 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, 13 May 2010 03:40:25 -0000

http://p4web.freebsd.org/@@178189?ac=10

Change 178189 by gcooper@starr-bastion on 2010/05/13 03:40:24

	Nuke all of the ad hoc duplicated metadata add code that was in make_dist.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#21 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#21 (text+ko) ====

@@ -541,42 +541,6 @@
 	if (error == NULL &&
 	    archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK)
 		error = archive_error_string(archive);
-	if (error == NULL) {
-
-		if (Verbose)
-			printf("Creating %sed tar ball in '%s'\n",
-			    cname, tball);
-
-		ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME,
-		    archive_metadata_open_flags);
-		ADD_FILE(COMMENT_FNAME, COMMENT_FNAME,
-		    archive_metadata_open_flags);
-		ADD_FILE(DESC_FNAME, DESC_FNAME,
-		    archive_metadata_open_flags);
-
-		if (Install)
-			ADD_FILE(Install, INSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (PostInstall)
-			ADD_FILE(PostInstall, POST_INSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (DeInstall)
-			ADD_FILE(DeInstall, DEINSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (PostDeInstall)
-			ADD_FILE(PostDeInstall, POST_DEINSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (Require)
-			ADD_FILE(Require, REQUIRE_FNAME,
-			    archive_metadata_open_flags);
-		if (Display)
-			ADD_FILE(Display, DISPLAY_FNAME,
-			    archive_metadata_open_flags);
-		if (Mtree)
-			ADD_FILE(Mtree, MTREE_FNAME,
-			    archive_metadata_open_flags);
-
-	}
 
 	for (p = plist->head; error == NULL && p != NULL; p = p->next)
 		switch(p->type) {

From owner-p4-projects@FreeBSD.ORG  Thu May 13 04:57:43 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BC311065673; Thu, 13 May 2010 04:57:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9924106564A
	for ; Thu, 13 May 2010 04:57:42 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D7ADF8FC0A
	for ; Thu, 13 May 2010 04:57: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 o4D4vgMZ044464
	for ; Thu, 13 May 2010 04:57:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4D4vgIp044462
	for perforce@freebsd.org; Thu, 13 May 2010 04:57:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 04:57:42 GMT
Message-Id: <201005130457.o4D4vgIp044462@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 178192 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, 13 May 2010 04:57:43 -0000

http://p4web.freebsd.org/@@178192?ac=10

Change 178192 by gcooper@starr-bastion on 2010/05/13 04:56:45

	
	Add unpack_to_buffer API for unpacking a file from a package to a buffer.
	
	The way that this is called today is backwards, but it will be sorted out
	eventually.
	
	Also update comments here and there to remove implicitness and to make
	things more concrete.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#7 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#3 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#7 (text+ko) ====

@@ -344,6 +344,58 @@
 				 ARCHIVE_EXTRACT_FFLAGS|ARCHIVE_EXTRACT_XATTR)
 
 /*
+ * Unpack a single file, denoted by file, to a buffer; this call uses
+ * unpack_file_to_fd to first open the file, and once that has been completed
+ * it opens the file and proceeds to read it into the buffer -- either
+ * specified by buffer if buffer is not NULL, or attempts to allocate memory
+ * which will need to be freed by the user at a later date.
+ *
+ * Returns an address to a buffer with the contents of *file if successful, or
+ * returns NULL on failure.
+ */
+char*
+unpack_file_to_buffer(char *buffer, const char *pkg, const char *file)
+{
+
+	FILE *fd = NULL;
+	char *buf = buffer;
+	struct stat sb;
+
+	if ((fd = unpack_file_to_fd(pkg, file)) != NULL) {
+
+		if (fstat(fileno(fd), &sb) == 0) {
+
+			/*
+			 * User either passed in a non-NULL value or we need
+			 * to malloc on the fly and let the user deal with it
+			 * later.
+			 */
+			if (buf != NULL)
+				buf = malloc(sb.st_size);
+			if (buf != NULL) {
+
+				if (fread(buf, sb.st_size, 1, fd) !=
+				    sb.st_size) {
+
+					/* 
+					 * Don't try to free user specified
+					 * memory.
+					 */
+					if (buffer == NULL)
+						free(buf);
+
+				}	
+
+			}
+
+		}
+	}
+
+	return buffer;
+
+}
+
+/*
  * Unpack a single file from a tar-file to a file descriptor; this is written
  * like so as an optimization to abbreviate the extract to *open step, as well
  * as to reduce the number of required steps needed when unpacking a tarball on
@@ -361,8 +413,7 @@
  *
  * [The return code info will eventually be...]
  *
- * Return -1 on failure, a value greater than 0 on success [in accordance with
- * open(2)].
+ * Return -1 on failure, a value greater than 0 on success.
  */
 FILE*
 unpack_file_to_fd(const char *pkg, const char *file)
@@ -474,7 +525,8 @@
  * Return 0 on success, 1 on failure
  *
  * NOTE: the exit code is 0 / 1 so that this can be fed directly into exit
- * when doing piped tar commands for copying hierarchies *hint*, *hint*.
+ * when doing piped tar commands for copying hierarchies *hint*, *hint* -- this
+ * use may be short-lived though, so don't depend on the return value, mmk?
  */
 int
 unpack(const char *pkg, const char *file_expr)

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#3 (text+ko) ====

@@ -189,7 +189,8 @@
 void		copy_hierarchy(const char *, const char *, Boolean);
 int		delete_hierarchy(const char *, Boolean, Boolean);
 int		unpack(const char *, const char *);
-FILE*		unpack_file_to_fd(const char *pkg, const char *file);
+char*		unpack_file_to_buffer(char *, const char *, const char *);
+FILE*		unpack_file_to_fd(const char *, const char *);
 void		format_cmd(char *, int, const char *, const char *, const char *);
 
 /* Msg */

From owner-p4-projects@FreeBSD.ORG  Thu May 13 14:37:33 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D058F1065672; Thu, 13 May 2010 14:37: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 88086106564A
	for ; Thu, 13 May 2010 14:37:32 +0000 (UTC)
	(envelope-from gpf@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 75B4A8FC15
	for ; Thu, 13 May 2010 14:37: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 o4DEbWH7018722
	for ; Thu, 13 May 2010 14:37:32 GMT
	(envelope-from gpf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DEbWOG018720
	for perforce@freebsd.org; Thu, 13 May 2010 14:37:32 GMT
	(envelope-from gpf@FreeBSD.org)
Date: Thu, 13 May 2010 14:37:32 GMT
Message-Id: <201005131437.o4DEbWOG018720@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gpf@FreeBSD.org using -f
From: Efstratios Karatzas 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178200 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, 13 May 2010 14:37:33 -0000

http://p4web.freebsd.org/@@178200?ac=10

Change 178200 by gpf@gpf_desktop on 2010/05/13 14:36:42

	- Add 2 files: vn_fullpath_nocache.c is a lkm for 
	developing and testing vn_fullpath_nocache(9) +
	the makefile used for building it.
	
	Its job is to actualy reconstruct a full fs path 
	from a vnode without use of the name cache.
	
	I've managed to recreate fs paths for files in case we 
	supply a directory hint and for regular dirs without
	using the name cache. This code is heavily dependant on 
	VOP_VPTOCNP(9). It also works only for UFS. 
	Read the code + comments for more info.
	
	TODO: still haven't done the exhaustive search in case
	we are not supplied with a directory hint and our target 
	vnode is not a directory; for NFS, this hint will be kept
	inside the file handle so it should speed things up except 
	for a few cornercases.
	
	This is the first rough draft, be kind. style(9) is ignored 
	on some places, dummy error codes are returned and there are 
	probably a few locks missing here and there; will fix.

Affected files ...

.. //depot/projects/soc2010/gpf_audit/Makefile#1 add
.. //depot/projects/soc2010/gpf_audit/vn_fullpath_nocache.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Thu May 13 15:44:40 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FC0D1065674; Thu, 13 May 2010 15:44:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFE8A1065679
	for ; Thu, 13 May 2010 15:44:39 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD2D58FC13
	for ; Thu, 13 May 2010 15:44: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 o4DFidI0024726
	for ; Thu, 13 May 2010 15:44:39 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DFiduq024724
	for perforce@freebsd.org; Thu, 13 May 2010 15:44:39 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 13 May 2010 15:44:39 GMT
Message-Id: <201005131544.o4DFiduq024724@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 178203 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, 13 May 2010 15:44:40 -0000

http://p4web.freebsd.org/@@178203?ac=10

Change 178203 by rene@rene_eee on 2010/05/13 15:43:56

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#58 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#22 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/marck.key#4 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#26 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#30 integrate
.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#14 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -3509,7 +3509,7 @@
 	Bring up the wireless interface but don't set up any IP
 	  address on it:
 
-        &prompt.root; ifconfig create wlan0 wlandev iwn0 ssid my_router up
+        &prompt.root; ifconfig wlan0 create wlandev iwn0 ssid my_router up
 
 	Create the &man.lagg.4; interface with bge0
 	  as master, and failover to wlan0 if

==== //depot/projects/docproj_nl/share/pgpkeys/marck.key#4 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
@@ -56,7 +56,10 @@
 oY1sF5XePs7jBtc8HuQ5RwCgpfpzfsH9F16M41eM3DAPWbLpM8+IRgQQEQIABgUC
 R5ZYAAAKCRBZxqJbrEANAufLAJ4lqSYjzrYabYUEG19D+B6ZlP3doACfVnkEb3T+
 bIJNiPP9e0HXQ9gdo9iIRgQQEQIABgUCSHJXhAAKCRA96g22+4pu9M5rAJ96Flw/
-ggrRWZH08gtU+yb8ObzHxQCcCDAzVaAJtOA9RG3TRXoHBDy4Ua+0JURtaXRyeSBN
+ggrRWZH08gtU+yb8ObzHxQCcCDAzVaAJtOA9RG3TRXoHBDy4Ua+IRgQTEQIABgUC
+S+PTfQAKCRCM7sbrcHLLx3yaAJ0QWQaq1u/ua/lMkuN5wL1q1yysRACdHAPqF9eL
+PQReuoEf+AQQJWL7RpWIRgQQEQIABgUCS+h6ZQAKCRBbKpGsdxBZOVH6AKCEjS47
+7ohLEhZDHQO7WFIIs+BrUQCfen+ap4YibZ6/aSw4VZUVwmKPd3e0JURtaXRyeSBN
 b3Jvem92c2t5IDxtYXJja0BGcmVlQlNELm9yZz6IXgQTEQIAHgUCQRh3SwIbAwYL
 CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCF1FBFa2kbAxEQAJ9p3vcTJCOwssNVA//w
 iyUximGelgCggaS4vscpI4GjDjz/5MAbpZdk7kGIRgQQEQIABgUCQzlXOAAKCRDs
@@ -96,7 +99,10 @@
 BAMVAwIDFgIBAheAAAoJEIXUUEVraRsDU1cAn3W3KI6pFIZ3Tqv2X5FUzRV/StQT
 AKCC+oelCEntN8wlOYx6/jy24NfijYhaBBMRAgAaBQsHCgMEAxUDAgMWAgECF4AF
 AkEYjrUCGQEACgkQhdRQRWtpGwN77QCghQMNJImV8v37n32a+5FCELO9c+kAniw2
-TeeriYrXOMC3DGJPX9GCuN6MuQINBDtYTm4QCADV+Uzv3A1miqiGkkc+Dco06R4L
+TeeriYrXOMC3DGJPX9GCuN6MiEYEExECAAYFAkvj030ACgkQjO7G63Byy8fF1QCe
+NFSMvIb6/ykzLuW9cgDxhTiKtfcAnRiWZHk6ztqKToZ0ALMcWYwrt8i7iEYEEBEC
+AAYFAkvjdc4ACgkQEXdldgLwkvfcAQCdFgHU+Xw/X5LO2ukpC4L7jFDS7+wAoJFQ
+bKkdbcjZWfcwkt8wFM6MVXJquQINBDtYTm4QCADV+Uzv3A1miqiGkkc+Dco06R4L
 SA0Kc0/A/eCjp0Zmj9AeOqXDcT+tvs0VyD94hxSkxorbNhKBqrMP9mPkuEcbS/+u
 vcpMW+Fu07QcBxvZlxLIKIhKJeXspSoTRzntmVMJuQSKtz0z8sLnnoTDAewOHKoP
 pPjwy8om88+pb2Cq6aFb2l3s31/JOrzpokSFsms4RBtyjo4kt358yPqmFx1Iolox
@@ -109,6 +115,6 @@
 eE5cWv6KXSK5mXIc5NBE3WD8v7egH2yfmr2yGx/KyVHeon25aylKhsq3PoCeeN+U
 92KMBlRqVVUWUMsn4LkT/giDiEYEGBECAAYFAjtYTm4ACgkQhdRQRWtpGwObegCf
 QdJWlqxZ8kb1RqPzVUB5r+sZCocAmwaOcis0koAFKX84wMOTyluPNU+o
-=M8uk
+=yCgd
 -----END PGP PUBLIC KEY BLOCK-----
 ]]>

==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#26 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.497 2010/03/20 14:30:33 hrs Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.499 2010/05/12 19:23:26 brueffer Exp $
 -->
 
 
@@ -3661,6 +3661,7 @@
 
 
 
+
 
 
 
@@ -3685,6 +3686,7 @@
 
 
 
+
 
 
 

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

@@ -1,6 +1,6 @@
 
-
+
 
 
  %developers;
@@ -2722,6 +2722,37 @@
      Received 
   
 
+  
+     jmallett 
+     Cavium Octeon MIPS 
+     gonzo 
+     Received 
+  
+
+  
+     Raymond Vetter 
+     Sitecom CN-500 
+     itetcu 
+     received 
+  
+
+  
+     Raymond Vetter
+     3xIDE cables
    
+	 FDD cable
    
+	 VGA cable
    
+	 serial cable
    
+	 2xCAT7 ethernet cable
     
+     romain 
+     received 
+  
+
+  
+     ds 
+     memory modules and hard disks 
+     pgj 
+     received 
+  
 
 
 &footer;

==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#14 (text+ko) ====

@@ -1,4 +1,4 @@
-

From owner-p4-projects@FreeBSD.ORG  Thu May 13 17:40:41 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A52E1065677; Thu, 13 May 2010 17:40: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 D3C6A1065670
	for ; Thu, 13 May 2010 17:40:40 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C18988FC15
	for ; Thu, 13 May 2010 17:40: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 o4DHeeAK045817
	for ; Thu, 13 May 2010 17:40:40 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DHeeQb045815
	for perforce@freebsd.org; Thu, 13 May 2010 17:40:40 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 17:40:40 GMT
Message-Id: <201005131740.o4DHeeQb045815@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 178213 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, 13 May 2010 17:40:41 -0000

http://p4web.freebsd.org/@@178213?ac=10

Change 178213 by gcooper@starr-bastion on 2010/05/13 17:40:01

	
	Avoid potential issues if the API contract with libarchive changes someday
	with the -X code that was ported over by first ensuring that
	matching == NULL or != NULL.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#22 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#22 (text+ko) ====

@@ -578,7 +578,9 @@
 				    PATH_MAX)
 					error = strerror(ENAMETOOLONG);
 
-			if (lafe_excluded(match_patterns, destfile) == 0)
+			/* Exclude the file according to the */
+			if (match_patterns != NULL &&
+			    lafe_excluded(match_patterns, destfile) == 0)
 	 			ADD_FILE(srcfile, destfile,
 				    archive_entry_open_flags);
 

From owner-p4-projects@FreeBSD.ORG  Thu May 13 17:51:53 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70F5E1065674; Thu, 13 May 2010 17:51: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 358A4106566C
	for ; Thu, 13 May 2010 17:51:53 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 233718FC14
	for ; Thu, 13 May 2010 17:51: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 o4DHppgP046607
	for ; Thu, 13 May 2010 17:51:51 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DHppR0046605
	for perforce@freebsd.org; Thu, 13 May 2010 17:51:51 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 17:51:51 GMT
Message-Id: <201005131751.o4DHppR0046605@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 178214 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, 13 May 2010 17:51:53 -0000

http://p4web.freebsd.org/@@178214?ac=10

Change 178214 by gcooper@starr-bastion on 2010/05/13 17:51:29

	Remove the do-while(0). It's not required as this block of code does not
	require this as it's already properly partitioned off with an
	if-statement. 

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#23 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#23 (text+ko) ====

@@ -431,13 +431,11 @@
 make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist)
 {
 
-#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS)				\
-	do {								\
-		if (error == NULL) {					\
-			error = add_file(archive, SRCFILE, DESTFILE,	\
-			    OPEN_FLAGS);				\
-		}							\
-	} while (0)
+#define ADD_FILE(SRCFILE, DESTFILE, OPEN_FLAGS)			\
+	if (error == NULL) {					\
+		error = add_file(archive, SRCFILE, DESTFILE,	\
+		    OPEN_FLAGS);				\
+	}
 
 	PackingList p;
 	struct archive *archive = NULL;

From owner-p4-projects@FreeBSD.ORG  Thu May 13 18:08:08 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BFEB1065674; Thu, 13 May 2010 18:08: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 50A17106566B
	for ; Thu, 13 May 2010 18:08:08 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E9858FC12
	for ; Thu, 13 May 2010 18:08: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 o4DI88Wo048718
	for ; Thu, 13 May 2010 18:08:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DI88i8048716
	for perforce@freebsd.org; Thu, 13 May 2010 18:08:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 18:08:08 GMT
Message-Id: <201005131808.o4DI88i8048716@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 178215 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, 13 May 2010 18:08:08 -0000

http://p4web.freebsd.org/@@178215?ac=10

Change 178215 by gcooper@starr-bastion on 2010/05/13 18:07:19

	Properly bound the buffer to len with the read for the archive_write*
	call.
	Cordon off the mmap(2) include. 

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#24 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#24 (text+ko) ====

@@ -23,7 +23,10 @@
 
 /* XXX (gcooper): needs to come before sys/stat.h for stat(2). */
 #include 
+/* Read comment below in add_file. */
+#ifdef BROKEN_MMAP
 #include 
+#endif
 #include 
 #include 
 #include 
@@ -403,9 +406,9 @@
 					    archive_entry_buf,
 					    sizeof(archive_entry_buf));
 
-					if (archive_write_data(archive,
-					    archive_entry_buf,
-					    sizeof(archive_entry_buf)) !=
+					if (len > 0 &&
+					    archive_write_data(archive,
+					    archive_entry_buf, len) !=
 					    ARCHIVE_OK)
 						error = archive_error_string(archive);
 

From owner-p4-projects@FreeBSD.ORG  Thu May 13 19:28:30 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82A521065675; Thu, 13 May 2010 19:28: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 47494106566B
	for ; Thu, 13 May 2010 19:28:30 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 352A48FC1A
	for ; Thu, 13 May 2010 19:28: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 o4DJSU3X055645
	for ; Thu, 13 May 2010 19:28:30 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4DJSU5p055643
	for perforce@freebsd.org; Thu, 13 May 2010 19:28:30 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 13 May 2010 19:28:30 GMT
Message-Id: <201005131928.o4DJSU5p055643@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 178217 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, 13 May 2010 19:28:30 -0000

http://p4web.freebsd.org/@@178217?ac=10

Change 178217 by rene@rene_eee on 2010/05/13 19:27:37

	MFen handbook/advanced-networking 1.429 -> 1.430

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#46 edit

Differences ...

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

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.20 2010/05/05 21:41:52 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
-     %SRCID%   1.429
+     %SRCID%   1.430
 -->
 
 
@@ -3798,7 +3798,7 @@
 	Activeer het draadloze interface maar geef er nog geen IP-adres
 	  aan:
 
-	&prompt.root; ifconfig create wlan0 wlandev iwn0 ssid mijn_router up
+	&prompt.root; ifconfig wlan0 create wlandev iwn0 ssid mijn_router up
 
 	Maak het &man.lagg.4;-interface aan met
 	  bge0 als meester, en met failover naar

From owner-p4-projects@FreeBSD.ORG  Fri May 14 01:01:04 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 636EC1065675; Fri, 14 May 2010 01:01:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 284661065672
	for ; Fri, 14 May 2010 01:01:04 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 163658FC0A
	for ; Fri, 14 May 2010 01:01:04 +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 o4E113KG006939
	for ; Fri, 14 May 2010 01:01:03 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E113OD006937
	for perforce@freebsd.org; Fri, 14 May 2010 01:01:03 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 01:01:03 GMT
Message-Id: <201005140101.o4E113OD006937@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178227 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, 14 May 2010 01:01:04 -0000

http://p4web.freebsd.org/@@178227?ac=10

Change 178227 by lz@gnehzuil-freebsd on 2010/05/14 01:00:52

	       Modify the reservation window structure.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#5 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#5 (text+ko) ====

@@ -63,22 +63,11 @@
 }
 RB_PROTOTYPE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp);
 
-/*
- * Reservation window information
- */
-struct ext2_rsv_win_info {
-	struct ext2_rsv_win rwi_entry;
-#if 0
-	u_int32_t rwi_last_logical_blk;  /* Last allocated logical block */
-	u_int32_t rwi_last_physical_blk; /* Last allocated physical block */
-#endif
-};
-
+struct inode;
 /* ext2_alloc.c */
-struct inode;
-void ext2_init_rsv_win_info(struct inode *ip);
-void ext2_discard_rsv_win(struct inode *ip);
-int ext2_alloc_rsv(struct inode *, int32_t, int32_t,
-			int, struct ucred *, int32_t *);
+void    ext2_init_rsv(struct inode *ip);
+void    ext2_discard_rsv(struct inode *ip);
+int     ext2_alloc_rsv(struct inode *, int32_t, int32_t,
+                       int, struct ucred *, int32_t *);
 
 #endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */

From owner-p4-projects@FreeBSD.ORG  Fri May 14 01:08:11 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B34331065674; Fri, 14 May 2010 01:08:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77AAC106566B
	for ; Fri, 14 May 2010 01:08:11 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 65BAF8FC08
	for ; Fri, 14 May 2010 01:08:11 +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 o4E18BDe008410
	for ; Fri, 14 May 2010 01:08:11 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E18BLg008408
	for perforce@freebsd.org; Fri, 14 May 2010 01:08:11 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 01:08:11 GMT
Message-Id: <201005140108.o4E18BLg008408@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178228 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, 14 May 2010 01:08:11 -0000

http://p4web.freebsd.org/@@178228?ac=10

Change 178228 by lz@gnehzuil-freebsd on 2010/05/14 01:08:05

	       Improved the naming.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2fs.h#3 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2fs.h#3 (text+ko) ====

@@ -177,8 +177,8 @@
 	off_t e2fs_maxfilesize;
 	struct ext2_gd *e2fs_gd; /* Group Descriptors */
 
-	struct mtx e2fs_rsv_win_lock; /* Protect reservation window RB tree */
-	struct ext2_rsv_win_tree e2fs_tree;  /* Reservation window index */
+	struct mtx e2fs_rsv_lock;               /* Protect reservation window RB tree */
+	struct ext2_rsv_win_tree e2fs_rsv_tree; /* Reservation window index */
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Fri May 14 01:11:15 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E02F81065673; Fri, 14 May 2010 01:11:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F110106564A
	for ; Fri, 14 May 2010 01:11:14 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D2DA8FC18
	for ; Fri, 14 May 2010 01:11:14 +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 o4E1BEPe008731
	for ; Fri, 14 May 2010 01:11:14 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E1BEaZ008729
	for perforce@freebsd.org; Fri, 14 May 2010 01:11:14 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 01:11:14 GMT
Message-Id: <201005140111.o4E1BEaZ008729@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178229 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, 14 May 2010 01:11:15 -0000

http://p4web.freebsd.org/@@178229?ac=10

Change 178229 by lz@gnehzuil-freebsd on 2010/05/14 01:11:12

	       Add a lock to protect the ext2_rsv_win.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#3 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#3 (text+ko) ====

@@ -102,7 +102,8 @@
 	u_int32_t	i_uid;		/* File owner. */
 	u_int32_t	i_gid;		/* File group. */
 
-	struct ext2_rsv_win_info *i_rsv_winp; /* Reservation window info */
+        struct mtx          i_rsv_lock; /* Protects i_rsv */
+	struct ext2_rsv_win i_rsv;      /* Reservation window */
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Fri May 14 01:35:39 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 311651065675; Fri, 14 May 2010 01:35: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 E9B351065672
	for ; Fri, 14 May 2010 01:35:38 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D7A8E8FC13
	for ; Fri, 14 May 2010 01:35: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 o4E1Zcke010668
	for ; Fri, 14 May 2010 01:35:38 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E1ZcdO010666
	for perforce@freebsd.org; Fri, 14 May 2010 01:35:38 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 01:35:38 GMT
Message-Id: <201005140135.o4E1ZcdO010666@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178230 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, 14 May 2010 01:35:39 -0000

http://p4web.freebsd.org/@@178230?ac=10

Change 178230 by lz@gnehzuil-freebsd on 2010/05/14 01:35:16

	       Initialize inode rsv lock.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#4 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#4 (text+ko) ====

@@ -582,10 +582,10 @@
 		goto out;
 
 	/* Initial reservation window index and lock */
-	bzero(&ump->um_e2fs->e2fs_rsv_win_lock, sizeof(struct mtx));
-	mtx_init(&ump->um_e2fs->e2fs_rsv_win_lock,
-		 "reservation window lock", NULL, MTX_SPIN);
-	RB_INIT(&ump->um_e2fs->e2fs_tree);
+	bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx));
+	mtx_init(&ump->um_e2fs->e2fs_rsv_lock,
+            "rsv tree lock", NULL, MTX_SPIN);
+	RB_INIT(&ump->um_e2fs->e2fs_rsv_tree);
 
 	brelse(bp);
 	bp = NULL;
@@ -686,7 +686,7 @@
 	g_topology_unlock();
 	PICKUP_GIANT();
 	vrele(ump->um_devvp);
-	mtx_destroy(&fs->e2fs_rsv_win_lock);
+	mtx_destroy(&fs->e2fs_rsv_lock);
 	free(fs->e2fs_gd, M_EXT2MNT);
 	free(fs->e2fs_contigdirs, M_EXT2MNT);
 	free(fs->e2fs, M_EXT2MNT);
@@ -891,8 +891,11 @@
 	ip->i_e2fs = fs = ump->um_e2fs;
 	ip->i_ump  = ump;
 	ip->i_number = ino;
+
 	/* lazily initialize reservation window */
-	ip->i_rsv_winp = NULL;
+	bzero(&ip->i_rsv_lock, sizeof(struct mtx));
+	mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF);
+	ip->i_rsv = NULL;
 
 	lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL);
 	error = insmntque(vp, mp);

From owner-p4-projects@FreeBSD.ORG  Fri May 14 04:16:20 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54E7E1065678; Fri, 14 May 2010 04:16: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 10A65106566C
	for ; Fri, 14 May 2010 04:16:20 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F1D6D8FC1D
	for ; Fri, 14 May 2010 04:16: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 o4E4GJrW025527
	for ; Fri, 14 May 2010 04:16:19 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E4GJ09025525
	for perforce@freebsd.org; Fri, 14 May 2010 04:16:19 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 04:16:19 GMT
Message-Id: <201005140416.o4E4GJ09025525@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178234 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, 14 May 2010 04:16:20 -0000

http://p4web.freebsd.org/@@178234?ac=10

Change 178234 by lz@gnehzuil-freebsd on 2010/05/14 04:16:10

	       Implement reservation window mechanism.
	
	        * Algorithm:
	          1. When a file need to allocate a block with a uninitialized reservation
	             window, we will first initialize this file's reservation window, try
	             to allocate a window and add it to rb tree according to bpref. Then
	             allocate a block.
	          2. If a file which has a window, then we will ignore bpref and try to
	             allocate a block according to window's start and hit.
	          3. If a file's window has no free block, then window will be remove from
	             rb tree and try to allocate a new window according to bpref.
	          4. If above attempts failed, we try to allocate using old hashalloc algorithm.
	
	        * Problem:
	          1. dbench -D dir 4 and copy a large file, such as 600MB, it prints vm_fault. I
	             think there are some errors in synchronization.
	
	        * To be done:
	          1. Dynamically increase the window size.
	          2. Do not use old hashalloc algorithm when we try to allocate a block in reservation
	             window. It just need to allocate a free block in other cylinder groups.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#7 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#4 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#3 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#6 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#4 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#7 (text+ko) ====

@@ -63,12 +63,16 @@
 
 /* For reservation window */
 static void	ext2_add_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *);
-static int	ext2_alloc_new_rsv(struct inode *, struct m_ext2fs *, int, int32_t, int);
-static daddr_t	ext2_alloccg_rsv(struct inode *, int, daddr_t, int);
-static u_long	ext2_mapsearch_rsv(struct m_ext2fs *, char *, daddr_t);
-static int	ext2_in_rsv(struct ext2_rsv_win *, int32_t);
+static u_long   ext2_alloc_blk(struct m_ext2fs *, struct inode *, int cg,
+                                struct buf *, int32_t, struct ext2_rsv_win *);
+static int      ext2_alloc_new_rsv_win(struct inode *, struct ext2_rsv_win *, int32_t,
+                                struct m_ext2fs *, int, struct buf *);
+static int      ext2_find_next_rsv_win(struct ext2_rsv_win *, struct ext2_rsv_win *,
+                                struct m_ext2fs *, int32_t, int);
 static void	ext2_remove_rsv_win(struct m_ext2fs *, struct ext2_rsv_win *);
-static int	ext2_search_rsv_win(struct inode *, struct m_ext2fs *, int, int32_t, int);
+static u_long   ext2_rsvalloc(struct m_ext2fs *, struct inode *, int,
+                                struct buf *, int32_t, int);
+struct ext2_rsv_win *ext2_search_rsv_win(struct ext2_rsv_win_tree *, int32_t);
 
 RB_GENERATE(ext2_rsv_win_tree, ext2_rsv_win, rw_link, ext2_rsv_win_cmp);
 
@@ -79,28 +83,26 @@
  * info structure will be initialized.
  */
 void
-ext2_init_rsv_win_info(struct inode *ip)
+ext2_init_rsv(struct inode *ip)
 {
-	struct ext2_rsv_win *rwp;
-	struct ext2_rsv_win_info *rwip;
+	struct ext2_rsv_win *rp;
 
-	rwip = malloc(sizeof(struct ext2_rsv_win_info),
-			M_EXT2NODE, M_NOWAIT | M_ZERO);
+	rp = malloc(sizeof(struct ext2_rsv_win),
+	    M_EXT2NODE, M_WAITOK | M_ZERO);
 
 	/* If malloc failed, we just do not use
 	 * reservation window mechanism
 	 */
-	if (rwip == NULL)
+	if (rp == NULL)
 		return;
 
-	rwp = &rwip->rwi_entry;
-	rwp->rw_start = EXT2_RWI_NOT_ALLOCATED;
-	rwp->rw_end = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_start = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_end = EXT2_RWI_NOT_ALLOCATED;
 
-	rwp->rw_goal_size = EXT2_RWI_DEFAULT_RESERVE_BLKS;
-	rwp->rw_alloc_hit = 0;
+	rp->rw_goal_size = EXT2_RWI_DEFAULT_RESERVE_BLKS;
+	rp->rw_alloc_hit = 0;
 
-	ip->i_rsv_winp = rwip;
+	ip->i_rsv = rp;
 } 
 
 /*
@@ -112,186 +114,282 @@
  * 3. truncate a file
  */
 void
-ext2_discard_rsv_win(struct inode *ip)
+ext2_discard_rsv(struct inode *ip)
 {
-	struct ext2_rsv_win *rwp;
+	struct ext2_rsv_win *rp;
 
 	/* do not use reservation window */
-	if (ip->i_rsv_winp == NULL)
-		return;
+	if (ip->i_rsv == NULL) 
+                return;
 
+	rp = ip->i_rsv;
 
-	rwp = &ip->i_rsv_winp->rwi_entry;
-	if (rwp->rw_end == EXT2_RWI_NOT_ALLOCATED)
-		/* reservation window is empty */
-		return;
+        /* If reservation window is empty, nothing to do */
+	if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED)
+                return;
 
-	mtx_lock_spin(&ip->i_e2fs->e2fs_rsv_win_lock);
-	if (rwp->rw_end != EXT2_RWI_NOT_ALLOCATED)
-		ext2_remove_rsv_win(ip->i_e2fs, rwp);
-	mtx_unlock_spin(&ip->i_e2fs->e2fs_rsv_win_lock);
+	if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
+		ext2_remove_rsv_win(ip->i_e2fs, rp);
 }
 
 /*
  * Add a ext2_rsv_win struct to RB tree.
  */
-static void ext2_add_rsv_win(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp)
+static void
+ext2_add_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
 {
-	RB_INSERT(ext2_rsv_win_tree, &sbp->e2fs_tree, rwp);
+	RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
 }
 
 /*
  * Remove a ext2_rsv_win structure from RB tree.
  */
 static void
-ext2_remove_rsv_win(struct m_ext2fs *sbp, struct ext2_rsv_win *rwp)
+ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
 {
-	rwp->rw_start = EXT2_RWI_NOT_ALLOCATED;
-	rwp->rw_end = EXT2_RWI_NOT_ALLOCATED;
-	rwp->rw_alloc_hit = 0;
-	RB_REMOVE(ext2_rsv_win_tree, &sbp->e2fs_tree, rwp);
+	rp->rw_start = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_end = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_alloc_hit = 0;
+	RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
 }
 
 /*
- * Check bpref in reservation window.
+ * Find a reservation window which can includes the bpref,
+ * or the previous one if bpref is not in any window.
  */
-static int
-ext2_in_rsv(struct ext2_rsv_win *rwp, int32_t bpref)
+struct ext2_rsv_win *
+ext2_search_rsv_win(struct ext2_rsv_win_tree *root, int32_t bpref)
 {
-	if (bpref < rwp->rw_start || bpref > rwp->rw_end)
-		return 0;
+        struct ext2_rsv_win *next, *prev;
+
+        next = RB_ROOT(root);
+        do {
+                prev = next;
+                if (bpref < next->rw_start)
+                        next = RB_LEFT(next, rw_link);
+                else if (bpref > next->rw_end)
+                        next = RB_RIGHT(next, rw_link);
+                else
+                        return next;
+        } while(next != NULL);
+
+        if (next == NULL || next->rw_start > bpref)
+                next = prev;
 
-	return 1;
+        return next;
 }
 
 /*
- * Find a reservation window which includes bpref.
+ * Find a space to store a reservation window.
  */
 static int
-ext2_search_rsv_win(struct inode *ip, struct m_ext2fs *sbp, int cg, int32_t bpref, int size)
+ext2_find_next_rsv_win(struct ext2_rsv_win *search, struct ext2_rsv_win *rp,
+    struct m_ext2fs *fs, int32_t bpref, int cg)
 {
-	struct buf *bp;
-	struct ext2mount *ump;
-	struct ext2_rsv_win *rwp;
-	int error;
-	char *bbp;
+        struct ext2_rsv_win *rsv, *prev, *next;
+        int32_t cur;
+        int size = EXT2_RWI_DEFAULT_RESERVE_BLKS;
+
+        cur = bpref;
+        rsv = search;
+        prev = NULL;
+        if (search == NULL)
+                return -1;
+
+        while (1) {
+                if (cur <= rsv->rw_end)
+                        cur = rsv->rw_end + 1;
 
-	ump = ip->i_ump;
-	if (sbp->e2fs_gd[cg].ext2bgd_nbfree == 0)
-		return (0);
-	EXT2_UNLOCK(ump);
-	error = bread(ip->i_devvp, fsbtodb(sbp,
-		sbp->e2fs_gd[cg].ext2bgd_b_bitmap),
-		(int)sbp->e2fs_bsize, NOCRED, &bp);
-	if (error) {
-		brelse(bp);
-		EXT2_LOCK(ump);
-		return (0);
-	}
+                if (dtog(fs, cur) != cg)
+                        return -1;
 
-	bbp = (char *)bp->b_data;
+                prev = rsv;
+                next = RB_NEXT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rsv);
+                rsv = next;
 
-	mtx_lock_spin(&sbp->e2fs_rsv_win_lock);
+                if (next == NULL);
+                        break;
 
-	/* If RB tree is empty, then it just need to search a free block and allocate it.
-	 * else we need to traverse tree to find a space.
-	 */
-	if (RB_EMPTY(&sbp->e2fs_tree)) {
-		if (!ext2_mapsearch_rsv(sbp, bbp, bpref))
-			goto failed;
+                if (cur + size <= rsv->rw_start)
+                        break;
+        }
 
-		rwp = &ip->i_rsv_winp->rwi_entry;
-		rwp->rw_start = bpref;
-		rwp->rw_end = bpref + rwp->rw_goal_size - 1;
-		ext2_add_rsv_win(sbp, rwp);
+        if (prev != rp && rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
+                ext2_remove_rsv_win(fs, rp);
 
-		goto success;
-	} else {
-		int32_t curr;
-		struct ext2_rsv_win *search;
-		struct ext2_rsv_win *prev;
+        rp->rw_start = cur;
+        rp->rw_end = cur + size - 1;
+        rp->rw_alloc_hit = 0;
 
-		search = RB_ROOT(&sbp->e2fs_tree);
-		do {
-			prev = search;
-			if (bpref < search->rw_start)
-				search = RB_LEFT(search, rw_link);
-			else if (bpref > search->rw_end)
-				search = RB_RIGHT(search, rw_link);
-			else
-				break;
-		} while (search);
+        if (prev != rp) {
+                ext2_add_rsv_win(fs, rp);
+        }
 
-		/* get bpref's previous reservation window */
-		if (search == NULL)
-			search = prev;
+        return 0;
+}
 
-		curr = bpref;
-		while (1) {
-			if (curr <= search->rw_end)
-				curr = search->rw_end + 1;
+/*
+ * Try to allocate a new reservation window.
+ */
+static int
+ext2_alloc_new_rsv_win(struct inode *ip, struct ext2_rsv_win *rp, int32_t bpref,
+    struct m_ext2fs *fs, int cg, struct buf *bp)
+{
+        struct ext2_rsv_win *search_rsv;
+        int size, ret;
+        int start, end, loc;
+        char *bbp;
 
-			if (curr > sbp->e2fs->e2fs_first_dblock +
-					cg * EXT2_BLOCKS_PER_GROUP(sbp))
-				goto failed;
+        bbp = (char *)bp->b_data;
+        bpref = bpref;
+        size = rp->rw_goal_size;
 
-			search = RB_NEXT(ext2_rsv_win_tree, &sbp->e2fs_tree, search);
+        mtx_lock_spin(&fs->e2fs_rsv_lock);
 
-			/* reach the last reservation window */
-			if (search == NULL)
-				break;
+        /* If tree is empty, then try to alloc according to bpref */
+        if (RB_EMPTY(&fs->e2fs_rsv_tree)) {
+                mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                /* bpref is not in this cylinder group.
+                 * So try to allocate it in other group.
+                 */
+                if (dtog(fs, bpref) != cg)
+                        return -1;
+                if (bpref != 0) {
+                        bpref = dtogd(fs, bpref);
+                        if (isclr(bbp, bpref))
+                                goto gotit;
+                }
+                if (bpref)
+                        start = dtogd(fs, bpref) / NBBY;
+                else
+                        start = 0;
+                end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start;
+                for (loc = start; loc < end; loc++) {
+                        if (bbp[loc] == 0) {
+                                bpref = loc * NBBY;
+                                goto gotit;
+                        }
+                }
 
-			/* found a space */
-			if (curr + size < search->rw_start)
-				break;
-		}
+                for (loc = start; loc < start; loc++) {
+                        if (bbp[loc] == 0) {
+                                bpref = loc * NBBY;
+                                goto gotit;
+                        }
+                }
+        } else {
+repeat:
+                search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref);
 
-		if (!ext2_mapsearch_rsv(sbp, bbp, bpref))
-			goto failed;
+                ret = ext2_find_next_rsv_win(search_rsv, rp, fs, bpref, cg);
+                if (ret < 0) {
+                        if (rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
+                                ext2_remove_rsv_win(fs, rp);
+                        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                        return 0;
+                }
+                mtx_unlock_spin(&fs->e2fs_rsv_lock);
 
-		rwp = &ip->i_rsv_winp->rwi_entry;
-		rwp->rw_start = bpref;
-		rwp->rw_end = bpref + rwp->rw_goal_size - 1;
-		ext2_add_rsv_win(sbp, rwp);
+                if (isclr(bbp, bpref) &&
+                    bpref >= rp->rw_start &&
+                    bpref < rp->rw_end)
+                        return 0;
 
-		goto success;
-	}
+                start = dtogd(fs, bpref) / NBBY;
+                end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start;
+                for (loc = start; loc < end; loc++) {
+                        if (bbp[loc] == 0 &&
+                            loc * NBBY >= rp->rw_start &&
+                            loc * NBBY < rp->rw_end) {
+                                return 0;
+                        }
+                }
 
-success:
-	mtx_unlock_spin(&sbp->e2fs_rsv_win_lock);
-	EXT2_LOCK(ump);
-	return 1;
+                if (loc == end) {
+                        mtx_lock_spin(&fs->e2fs_rsv_lock);
+                        search_rsv = rp;
+                        goto repeat;
+                }
+        }
 
-failed:
-	mtx_unlock_spin(&sbp->e2fs_rsv_win_lock);
-	EXT2_LOCK(ump);
-	return 0;
+gotit:
+        rp->rw_start = bpref + cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock;
+        rp->rw_end = rp->rw_start + size - 1;
+        rp->rw_alloc_hit = 0;
+        mtx_lock_spin(&fs->e2fs_rsv_lock);
+        ext2_add_rsv_win(fs, rp);
+        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+        return 0;
 }
 
 /*
- * Allocate a new reservation window.
+ * Allocate a free block.
  */
-static int
-ext2_alloc_new_rsv(struct inode *ip, struct m_ext2fs *sbp, int cg, int32_t bpref, int size)
+static u_long
+ext2_alloc_blk(struct m_ext2fs *fs, struct inode *ip, int cg,
+    struct buf *bp, int32_t bpref, struct ext2_rsv_win *rp)
 {
-	struct ext2_rsv_win *rwp;
+        struct ext2mount *ump;
+        u_long start, end;
+        char *bbp;
+        u_long bno;
+
+        ump = ip->i_ump;
+        bbp = (char *)bp->b_data;
+        if (rp != NULL && rp->rw_end != EXT2_RWI_NOT_ALLOCATED) {
+                start = dtogd(fs, rp->rw_start + rp->rw_alloc_hit) / NBBY;
+                end = dtogd(fs, rp->rw_end) / NBBY;
+        } else {
+                start = dtogd(fs, bpref) / NBBY;
+                end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start;
+        }
+
+        if (bbp[start * NBBY] == 0) {
+                bno = start * NBBY;
+                goto gotit;
+        }
+
+        return 0;
 
-	rwp = &ip->i_rsv_winp->rwi_entry;
+gotit:
+        bno += rp->rw_alloc_hit++;
+        setbit(bbp, (daddr_t)bno);
+        EXT2_LOCK(ump);
+        fs->e2fs->e2fs_fbcount--;
+        fs->e2fs_gd[cg].ext2bgd_nbfree--;
+        fs->e2fs_fmod = 1;
+        EXT2_UNLOCK(ump);
+        bdwrite(bp);
+        return cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bno;
+}
 
-	/* delete old reservation window */
-	if (rwp->rw_end != EXT2_RWI_NOT_ALLOCATED) {
-		mtx_lock_spin(&sbp->e2fs_rsv_win_lock);
-		ext2_remove_rsv_win(sbp, &ip->i_rsv_winp->rwi_entry);
-		mtx_unlock_spin(&sbp->e2fs_rsv_win_lock);
-	}
+/*
+ * Allocate a free block from reservation window.
+ */
+static u_long
+ext2_rsvalloc(struct m_ext2fs *fs, struct inode *ip, int cg,
+    struct buf *bp, int32_t bpref, int size)
+{
+        struct ext2_rsv_win *rp;
+        int32_t ret;
 
-	/* try to allocate a new reservation window in cg's group */
-	if (ext2_search_rsv_win(ip, sbp, cg, bpref, size))
-		return 1;
+        rp = ip->i_rsv;
 
-	/* TODO: force to allocate a new reservation window in next group */
+        /* If window is empty or bpref is not in reservation window,
+         * we will try to allocate a new reservation window.
+         * Then we try to allocate a free block.
+         */
+        if (rp->rw_end == EXT2_RWI_NOT_ALLOCATED) {
+                ret = ext2_alloc_new_rsv_win(ip, rp, bpref, fs, cg, bp);
+                if (ret < 0)
+                        return 0;
+        } else if (rp->rw_start + rp->rw_alloc_hit - 1 == rp->rw_end) {
+                ret = ext2_alloc_new_rsv_win(ip, rp, rp->rw_end, fs, cg, bp);
+                if (ret < 0)
+                        return 0;
+        }
 
-	return 0;
+        return ext2_alloc_blk(fs, ip, cg, bp, bpref, rp);
 }
 
 /*
@@ -301,24 +399,23 @@
  */
 int
 ext2_alloc_rsv(struct inode *ip, int32_t lbn, int32_t bpref,
-		int size, struct ucred *cred, int32_t *bnp)
+    int size, struct ucred *cred, int32_t *bnp)
 {
 	struct m_ext2fs *fs;
 	struct ext2mount *ump;
-	struct ext2_rsv_win_info *rwip;
-	int32_t bno;
-	int cg;	
+        struct buf *bp;
+	int32_t bno = 0;
+	int i, cg, error;
 
 	*bnp = 0;
 	fs = ip->i_e2fs;
 	ump = ip->i_ump;
-	rwip = ip->i_rsv_winp;
 	mtx_assert(EXT2_MTX(ump), MA_OWNED);
 
 	if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0)
 		goto nospace;
 	if (cred->cr_uid != 0 && 
-			fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount)
+	    fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount)
 		goto nospace;
 
 	if (bpref >= fs->e2fs->e2fs_bcount)
@@ -328,22 +425,53 @@
 	else
 		cg = dtog(fs, bpref);
 
-	/* If bpref is in reservation window and window has free block, then alloc it.
-	 * Otherwise, try to allocate a new reservation window.
-	 */
-	if (rwip->rwi_entry.rw_end == EXT2_RWI_NOT_ALLOCATED ||
-		!ext2_in_rsv(&rwip->rwi_entry, bpref))
-		if (!ext2_alloc_new_rsv(ip, fs, cg, bpref, size))
-			goto nospace;
+        /* TODO: If cg doesn't have enought blocks, do not use reservation window */
+
+        /* If cg has some free blocks, then try to allocate a free block from this cg */
+        if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) {
+                /* Read block bitmap from buffer */
+                EXT2_UNLOCK(ump);
+                error = bread(ip->i_devvp,
+                    fsbtodb(fs, fs->e2fs_gd[cg].ext2bgd_b_bitmap),
+                    (int)fs->e2fs_bsize, NOCRED, &bp);
+                if (error) {
+                        brelse(bp);
+                        goto ioerror;
+                }
+
+                EXT2_IRSV_LOCK(ip);
+                /* Try to allocate from reservation window */
+                bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size);
+                EXT2_IRSV_UNLOCK(ip);
+                if (bno > 0)
+                        goto allocated;
+
+                brelse(bp);
+                EXT2_LOCK(ump);
+        }
+
+        /* TODO: Just need to try to allocate a free block from rest groups.
+         * Now just use old allocation algorihtm.
+         */
+/*
+        for (i = cg + 1; i < fs->e2fs_gcount; i++) {
+        }
+*/
+        i = 1;
+        bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, ext2_alloccg);
 
-	bno = ext2_alloccg_rsv(ip, cg, bpref, size);
+allocated:
+        if (bno > 0) {
+                ip->i_blocks += btodb(fs->e2fs_bsize);
+                ip->i_flag |= IN_CHANGE | IN_UPDATE;
+                *bnp = bno;
+                return (0);
+        }
 
-	if (bno > 0) {
-		ip->i_blocks += btodb(fs->e2fs_bsize);
-		ip->i_flag |= IN_CHANGE | IN_UPDATE;
-		*bnp = bno;
-		return (0);
-	}
+ioerror:
+        ext2_fserr(fs, cred->cr_uid, "file system IO error");
+        uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt);
+        return EIO;
 
 nospace:
 	EXT2_UNLOCK(ump);
@@ -439,7 +567,7 @@
  * Reallocate a sequence of blocks into a contiguous sequence of blocks.
  *
  * The vnode and an array of buffer pointers for a range of sequential
- * logical blocks to be made contiguous is given. The allocator attempts
+ * logicar blocks to be made contiguous is given. The allocator attempts
  * to find a range of sequential blocks starting as close as possible to
  * an fs_rotdelay offset from the end of the allocation for the logical
  * block immediately preceding the current range. If successful, the
@@ -925,66 +1053,6 @@
  *
  * Check to see if a block of the appropriate size is available,
  * and if it is, allocate it.
- *
- * NOTE: This function will replace the ext2_alloccg() function.
- */
-static daddr_t
-ext2_alloccg_rsv(struct inode *ip, int cg, daddr_t bpref, int size)
-{
-	struct m_ext2fs *fs;
-	struct buf *bp;
-	struct ext2mount *ump;
-	int error, bno;
-	char *bbp;
-
-	fs = ip->i_e2fs;
-	ump = ip->i_ump;
-	if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0)
-		return (0);
-	EXT2_UNLOCK(ump);
-	error = bread(ip->i_devvp, fsbtodb(fs,
-		fs->e2fs_gd[cg].ext2bgd_b_bitmap),
-		(int)fs->e2fs_bsize, NOCRED, &bp);
-	if (error) {
-		brelse(bp);
-		EXT2_LOCK(ump);
-		return (0);
-	}
-	bbp = (char *)bp->b_data;
-
-	if (dtog(fs, bpref) != cg)
-		bpref = 0;
-	if (bpref != 0) {
-		bpref = dtogd(fs, bpref);
-		/*
-		 * if the requested block is available, use it
-		 */
-		if (isclr(bbp, bpref)) {
-			bno = bpref;
-			goto gotit;
-		}
-	}
-
-	brelse(bp);
-	EXT2_LOCK(ump);
-	return (0);
-
-gotit:
-	setbit(bbp, (daddr_t)bno);
-	EXT2_LOCK(ump);
-	fs->e2fs->e2fs_fbcount--;
-	fs->e2fs_gd[cg].ext2bgd_nbfree--;
-	fs->e2fs_fmod = 1;
-	EXT2_UNLOCK(ump);
-	bdwrite(bp);
-	return (cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bno);
-}
-
-/*
- * Determine whether a block can be allocated.
- *
- * Check to see if a block of the appropriate size is available,
- * and if it is, allocate it.
  */
 static daddr_t
 ext2_alloccg(struct inode *ip, int cg, daddr_t bpref, int size)
@@ -1219,9 +1287,11 @@
 		panic("ext2_vfree: range: devvp = %p, ino = %d, fs = %s",
 		    pip->i_devvp, ino, fs->e2fs_fsmnt);
 
-	ext2_discard_rsv_win(pip);
-	free(pip->i_rsv_winp, M_EXT2NODE);
-	pip->i_rsv_winp = NULL;
+        EXT2_IRSV_LOCK(pip);
+	ext2_discard_rsv(pip);
+	/*free(pip->i_rsv, M_EXT2NODE);*/
+	/*pip->i_rsv = NULL;*/
+        EXT2_IRSV_UNLOCK(pip);
 
 	cg = ino_to_cg(fs, ino);
 	error = bread(pip->i_devvp,
@@ -1254,47 +1324,6 @@
 }
 
 /*
- * Search a free block from bpref.
- *
- * NOTE: This function will replace the ext2_mapsearch() function.
- */
-static u_long ext2_mapsearch_rsv(struct m_ext2fs *sbp, char *bbp, daddr_t bpref)
-{
-	daddr_t bno;
-	int start, len, loc, i, map;
-
-	/*
-	 * find the fragment by searching through the free block
-	 * map for an appropriate bit pattern
-	 */
-	if (bpref)
-		start = dtogd(sbp, bpref) / NBBY;
-	else
-		start = 0;
-	len = howmany(sbp->e2fs->e2fs_fpg, NBBY) - start;
-	loc = skpc(0xff, len, &bbp[start]);
-	if (loc == 0) {
-		len = start + 1;
-		start = 0;
-		loc = skpc(0xff, len, &bbp[start]);
-		if (loc == 0) {
-			printf("start = %d, len = %d, fs = %s\n",
-				start, len, sbp->e2fs_fsmnt);
-			panic("ext2fs_alloccg: map corrupted");
-			/* NOTREACHED */
-		}
-	}
-	i = start + len - loc;
-	map = bbp[i];
-	bno = i * NBBY;
-	for (i = 1; i < (1 << NBBY); i <<= 1, bno++) {
-		if ((map & i) == 0)
-			return 1;
-	}
-	return 0;
-}
-
-/*
  * Find a block in the specified cylinder group.
  *
  * It is a panic if a request is made to find a block if none are

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_balloc.c#4 (text+ko) ====

@@ -79,11 +79,11 @@
 	fs = ip->i_e2fs;
 	ump = ip->i_ump;
 
-	/*
-	 * lazily initialize the reservation window info in inode
-	 */
-	if (ip->i_rsv_winp == NULL)
-		ext2_init_rsv_win_info(ip);
+	/* lazily initialize the reservation window info in inode */
+        EXT2_IRSV_LOCK(ip);
+	if (ip->i_rsv == NULL)
+		ext2_init_rsv(ip);
+        EXT2_IRSV_UNLOCK(ip);
 
 	/*
 	 * check if this is a sequential block allocation. 

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode.c#3 (text+ko) ====

@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int,
 	    long *);
@@ -153,7 +154,11 @@
 	}
 	fs = oip->i_e2fs;
 	osize = oip->i_size;
-	ext2_discard_rsv_win(oip);
+
+        EXT2_IRSV_LOCK(oip);
+	ext2_discard_rsv(oip);
+        EXT2_IRSV_UNLOCK(oip);
+
 	/*
 	 * Lengthen the size of the file. We must ensure that the
 	 * last byte of the file is allocated. Since the smallest
@@ -485,6 +490,10 @@
 	if (prtactive && vrefcnt(vp) != 0)
 		vprint("ext2_inactive: pushing active", vp);
 
+        EXT2_IRSV_LOCK(ip);
+        ext2_discard_rsv(ip);
+        EXT2_IRSV_UNLOCK(ip);
+
 	/*
 	 * Ignore inodes related to stale file handles.
 	 */
@@ -527,11 +536,15 @@
 		vprint("ufs_reclaim: pushing active", vp);
 	ip = VTOI(vp);
 
-	ext2_discard_rsv_win(ip);
-	if (ip->i_rsv_winp != NULL) {
-		free(ip->i_rsv_winp, M_EXT2NODE);
-		ip->i_rsv_winp = NULL;
+#if 0
+        EXT2_IRSV_LOCK(ip);
+	if (ip->i_rsv != NULL) {
+		free(ip->i_rsv, M_EXT2NODE);
+		ip->i_rsv = NULL;
 	}
+        EXT2_IRSV_UNLOCK(ip);
+        mtx_destroy(&ip->i_rsv_lock);
+#endif
 
 	if (ip->i_flag & IN_LAZYMOD) {
 		ip->i_flag |= IN_MODIFIED;

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_rsv_win.h#6 (text+ko) ====

@@ -35,6 +35,9 @@
 
 #define EXT2_MAX_RSV_WIN_BLKS 1027
 
+#define EXT2_IRSV_LOCK(ip)   mtx_lock(&ip->i_rsv_lock)
+#define EXT2_IRSV_UNLOCK(ip) mtx_unlock(&ip->i_rsv_lock)
+
 /*
  * Reservation window entry
  */

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/inode.h#4 (text+ko) ====

@@ -103,7 +103,7 @@
 	u_int32_t	i_gid;		/* File group. */
 
         struct mtx          i_rsv_lock; /* Protects i_rsv */
-	struct ext2_rsv_win i_rsv;      /* Reservation window */
+	struct ext2_rsv_win *i_rsv;     /* Reservation window */
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Fri May 14 16:17:14 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 395991065675; Fri, 14 May 2010 16:17:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F1D031065674
	for ; Fri, 14 May 2010 16:17:13 +0000 (UTC)
	(envelope-from gpf@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DF2F98FC1A
	for ; Fri, 14 May 2010 16:17:13 +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 o4EGHDii023246
	for ; Fri, 14 May 2010 16:17:13 GMT
	(envelope-from gpf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EGHDj2023244
	for perforce@freebsd.org; Fri, 14 May 2010 16:17:13 GMT
	(envelope-from gpf@FreeBSD.org)
Date: Fri, 14 May 2010 16:17:13 GMT
Message-Id: <201005141617.o4EGHDj2023244@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gpf@FreeBSD.org using -f
From: Efstratios Karatzas 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178254 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, 14 May 2010 16:17:14 -0000

http://p4web.freebsd.org/@@178254?ac=10

Change 178254 by gpf@gpf_desktop on 2010/05/14 16:16:47

	- implemented exhaustive search(?):
	I tried to use the mnt_nvnodelist field of the
	mounted fs that the vnode belongs to and working my way 
	through the entire list of vnodes till I can find
	a directory that contains the vnode that is our target.
	Seemed the fastest way that I could go about doing this 
	search buuut,
	
	It seems that acquiring a ilock 
	on the mp thus: "MNT_ILOCK(mp);" will cause a kernel panic
	when the thread will try to sleep, e.g. because of VOP_READDIR.
	The thread can't sleep while holding this lock.
	
	So, unless there's a way to work around this issue, I think 
	the only solution left is to implement a recursive function 
	that will visit each directory of the fs, this sucks.
	Anyhoo, I did the effort so here it is.
	
	- fixed a tinny error at the license; should have been more 
	careful when I c/p although I'm not even sure if I 
	have to include a license since this is a temporary file.
	
	- I cut off the code that searches a directory through its 
	vnodep to find a file with a certain id, and I created another 
	function, that does this dir_ilookup().
	
	- Made sure that all locks are released and all reference 
	counters are ok no matter what the case. Fixed a few 
	bugs on this matter.
	
	- functions now return relative errors and the path is now returned 
	through fullpath, freepath can be used to check if something 
	useful exists in fullpath and then free the buffer, example in
	vfn_entry().
	
	- removed a few debuging comments & uprintf()s.

Affected files ...

.. //depot/projects/soc2010/gpf_audit/vn_fullpath_nocache.c#2 edit

Differences ...

==== //depot/projects/soc2010/gpf_audit/vn_fullpath_nocache.c#2 (text+ko) ====

@@ -13,7 +13,7 @@
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND
+ * THIS SOFTWARE IS PROVIDED BY me AND ITS 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 APPLE OR ITS CONTRIBUTORS BE LIABLE FOR
@@ -46,7 +46,100 @@
 #include 
 
 #define PARENT_HINT 0x0001
+#define EXHAUSTIVE_SEARCH 0x0002
+
+/*
+ * find the name that is used to reference vp inside the directory vnode dvp 
+ * locks: dvp must be locked on entry and will still be locked on exit
+ * 
+ * works for UFS
+ * 
+ * returns:
+ * 	- ENOENT	a file that corresponds to vp was not found inside dvp
+ * 	- EIO		error occured while reading the directory
+ * 	- EOVERFLOW	result does not fit in buffer "name"
+ */
+static int
+dir_ilookup(struct vnode *vp, struct vnode *dvp, char *name, int *namelen)
+{
+	struct uio io;
+	struct iovec iov;
+	struct dirent *dp, *edp;
+	struct thread *td;
+	char *dirbuf;	
+	u_int64_t dirbuflen;
+	int error, eofflag;
+	char foundit;
+	
+	KASSERT("vp != NULL", "dir_ilookup: vp == NULL");
+	KASSERT("dvp != NULL", "dir_ilookup: dvp == NULL");
+	KASSERT("name != NULL", "dir_ilookup: name == NULL");
+
+	foundit = 0;
+	dirbuflen = ((struct inode *)dvp->v_data)->i_size;
+	dirbuf = malloc(dirbuflen, M_TEMP, M_WAITOK);
+	td = curthread;
+	
+	iov.iov_base = dirbuf;
+	iov.iov_len = dirbuflen;
+	io.uio_iov = &iov;
+	io.uio_iovcnt = 1;
+	io.uio_offset = 0;
+	io.uio_resid = dirbuflen;
+	io.uio_segflg = UIO_SYSSPACE;
+	io.uio_rw = UIO_READ;
+	io.uio_td = td;
+	eofflag = 0;
+	
+	error = VOP_READDIR(dvp, &io, td->td_ucred, &eofflag, NULL, NULL);
+	if (error) {
+		uprintf("VOP_READDIR failure %d\n", error);
+		error = EIO;
+		goto out;
+	}
+	
+	/* search for the correct inode number inside the directory */
+	edp = (struct dirent *)&dirbuf[dirbuflen - io.uio_resid];
+	for (dp = (struct dirent *)dirbuf; dp < edp; ) {
+		if (dp->d_reclen > 0) {	
+			/* found it */
+			if ( ((struct inode *)vp->v_data)->i_number == ((struct dirent *)dp)->d_fileno) {
+				char *pch;
+				int len;
+
+				pch = ((struct dirent *)dp)->d_name;
+				len = strlen(pch);
+				
+				if (len >= *namelen) {
+					error = EOVERFLOW;
+					goto out;
+				}
+
+				strlcpy(name, ((struct dirent *)dp)->d_name, *namelen);
+				*namelen -= len + 1;
+				foundit = 1;
+				break;
+			}
+			dp = (struct dirent *)((char *)dp + dp->d_reclen);
+		} 
+		else {
+			error = EIO;
+			break;
+		}
+	}
 
+out:	
+	if (dirbuf != NULL) {
+		free(dirbuf, M_TEMP);
+	}
+	
+	if (foundit == 0 && error != 0) {
+		error = ENOENT;
+	}
+	
+	return error;
+}
+
 /*
  * vn_fullpath_nocache
  * 
@@ -55,36 +148,37 @@
  * - A directory hint (UFS file_id of the directory that contains the vnode) may be 
  *   supplied to facilitate the search is our target is not a directory itself.
  * - flags should be set to PARENT_HINT, if the directory hint is supplied
+ *   and to EXHAUSTIVE_SEARCH, if we are willing to go intro great trouble to get this path
  * 
  * Author's note: This only works for UFS filesystems (for now).
+ * Oh, also EXHAUSTIVE_SEARCH will kernel panic :-D
  */
 static int
 vn_fullpath_nocache(struct vnode *vp, char **fullpath, char **freepath, ino_t directory_hint, char flags)
-{
-	struct uio io;
-	struct iovec iov;
-	struct dirent *dp, *edp;
+{	
 	struct vnode *dvp, *upper_dvp;
+	struct mount *mp;
 	struct thread * td;
-	char *buf;
-	char *dirbuf;
-	int error, buflen, eofflag, vfslocked;
-	u_int64_t dirbuflen;
+	char *buf, *pch;
+	char fname[MNAMELEN];
+	int error, buflen, vfslocked, fnamelen;
 
 	KASSERT("vp != NULL", "vn_fullpath_nocache: vp == NULL");
 	
 	dvp = NULL;
+	buf = NULL;
 	*freepath = NULL;
-	dirbuf = NULL;
 	
 	if (vp->v_type == VBAD) {
-		/* XXXgpf: should return an actual error code */
-		return 1;
+		error = ENOENT;
+		goto out;
 	}
 	
 	vref(vp);
 	error = 0;
 	td = curthread;
+	mp = vp->v_mount;
+	fnamelen = sizeof(fname);
 	buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
 	buflen = MAXPATHLEN - 1;
 	buf[MAXPATHLEN-1] = '\0';
@@ -93,10 +187,7 @@
 	 * - If our target is a directory, move on to the part where we traverse the '..' entries.
 	 * - If not, either use the directory_hint if it's available or do an exhaustive search on the fs (xD) so
 	 *   that we can connect the vp with 'a' parent directory.
-	 * 
-	 * XXXgpf: for now, let's assume that a parent_hint is available if our target is not a dir
-	 */
-	
+	 */	
 	if (vp->v_type != VDIR) {
 		/* grab the parent directory using the directory_hint */
 		if ((flags & PARENT_HINT) && vp->v_type != VDIR) {
@@ -107,67 +198,70 @@
 				uprintf("VFS_VGET failure %d\n", error);
 				dvp = NULL;
 			}
-		}
+			else {
+				/* grab the name that is being used to reference vp */
+				error = dir_ilookup(vp, dvp, fname, &fnamelen);
+				if (error) {
+					vput(dvp);
+					goto out;
+				}
+			}
+		}		
 		
 		/* 
 		 * if our target is not a directory and we haven't found 'a' parent directory, 
 		 * do an exhaustive search on the filesystem
 		 */
-		if (dvp == NULL && vp->v_type != VDIR) {
-			uprintf("todo: implement exhaustive search, lalalalalala\n");
-			/*temp*/ error = 1;
-			goto out;
-			/* XXXgpf: if even this fails, quit */
+		if ((flags & EXHAUSTIVE_SEARCH) && dvp == NULL) {
+			/*
+			 * XXXgpf: this actually does not work because when the thread will try to sleep,
+			 * e.g. in VOP_READDIR the kernel will panic because we have ilocked mp >.<
+			 */
+			MNT_ILOCK(mp);
+			if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) {
+				struct vnode *tvp;
+
+				TAILQ_FOREACH(tvp, &mp->mnt_nvnodelist, v_nmntvnodes) {
+					if (tvp->v_type == VDIR) {
+						vn_lock(tvp, LK_EXCLUSIVE);
+						/* grab the name that is being used to reference vp */
+						error = dir_ilookup(vp, tvp, fname, &fnamelen);
+						
+						/* found it */
+						if (error == 0) {
+							dvp = tvp;
+							vref(dvp);
+							break;
+						}
+						VOP_UNLOCK(tvp, 0);
+					}
+				}
+			}
+			MNT_IUNLOCK(mp);
+			
+			/* we failed to find a directory that contains the vnode, exit */
+			if (error != 0) {
+				error = ENOENT;
+				goto out;
+			}
 		}
-		
-		/* find the name that is used to reference the file inside this directory */
-		dirbuflen = ((struct inode *)dvp->v_data)->i_size;
-		dirbuf = malloc(dirbuflen, M_TEMP, M_WAITOK);
-		
-		iov.iov_base = dirbuf;
-		iov.iov_len = dirbuflen;
-		io.uio_iov = &iov;
-		io.uio_iovcnt = 1;
-		io.uio_offset = 0;
-		io.uio_resid = dirbuflen;
-		io.uio_segflg = UIO_SYSSPACE;
-		io.uio_rw = UIO_READ;
-		io.uio_td = td;
-		eofflag = 0;
-		
-		error = VOP_READDIR(dvp, &io, td->td_ucred, &eofflag, NULL, NULL);
-		if (error) {
-			uprintf("VOP_READDIR failure %d\n", error);
-			vput(dvp);
+		/* we failed to find a directory that contains the vnode, exit */
+		else if (dvp == NULL) {
+			error = ENOENT;
 			goto out;
 		}
-		
-		/* search for the correct inode number inside the directory */
-		edp = (struct dirent *)&dirbuf[dirbuflen - io.uio_resid];
-		for (dp = (struct dirent *)dirbuf; dp < edp; ) {
-			if (dp->d_reclen > 0) {	
-				/* found it */
-				if ( ((struct inode *)vp->v_data)->i_number == ((struct dirent *)dp)->d_fileno) {
-					char *pch;
-					
-					pch = buf + buflen - ((struct dirent *)dp)->d_namlen;
-					if (pch < buf) {
-						/* should return a real error code */
-						error = 1;
-						goto out;
-					}
-					strcpy(pch, ((struct dirent *)dp)->d_name);
-					buflen -= ((struct dirent *)dp)->d_namlen;
-					buf[--buflen] = '/';
-				}
-				dp = (struct dirent *)((char *)dp + dp->d_reclen);
-			} 
-			else {
-				error = EIO;
+
+		/* we have found a parent directory and a name for our vnode, save the name */
+		pch = buf + buflen - strlen(fname);
+		if (pch < buf) {
+			error = EOVERFLOW;
+			if (dvp != NULL)
 				vput(dvp);
-				goto out;
-			}
+			goto out;
 		}
+		strcpy(pch, fname);
+		buflen -= strlen(fname);
+		buf[--buflen] = '/';		
 	} /* if not VDIR */
 	/* if our target is a dir, do the initial preparation */
 	else {
@@ -193,8 +287,7 @@
 			int fs_path_len;
 			
 			vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
-			
-			uprintf("bazinga!\t");
+
 			*fullpath = buf + buflen;
 			
 			fs_path = dvp->v_mount->mnt_stat.f_mntonname;
@@ -202,8 +295,8 @@
 			
 			if (buflen - fs_path_len - 1 < 0) {
 				vput(dvp);
-				/* todo: return an actual error code */
-				error = 1;
+				error = EOVERFLOW;
+				VFS_UNLOCK_GIANT(vfslocked);
 				goto out;
 			}
 			
@@ -229,27 +322,26 @@
 		dvp = upper_dvp;
 		vn_lock(dvp, LK_EXCLUSIVE);
 		vref(dvp);
-	}
+	} /* while */
 
-	uprintf("out!\n");
 	vput(dvp);	
 	*fullpath = buf + buflen;
-	/* XXXgpf: for now, just print the path here */
-	uprintf("path %s\n", *fullpath);
+	*freepath = buf;
 
 out:
-	if (dirbuf != NULL)
-		free(dirbuf, M_TEMP);
-
-	/* XXXgpf: no matter the case, we release this buffer - this is just temporary */
-	if (buf != NULL)
-		free(buf, M_TEMP);
-	
+	if (error != 0) {
+		*freepath = NULL;
+		if (buf != NULL)
+			free(buf, M_TEMP);
+	}	
 	vrele(vp);
 		
 	return error;
 }
 
+/*
+ * entry point for the lkm - preps & makes a call to vn_fullpath_nocache()
+ */
 static int
 vfn_entry(module_t mod, int what, void *arg)
 {
@@ -291,7 +383,13 @@
 	
 	error = vn_fullpath_nocache(vp, &fullpath, &freepath, directory_hint, PARENT_HINT);
 
-	return error;
+	uprintf("vn_fullpath_nocache() returned %d\n", error);
+	if (freepath != NULL) {
+		uprintf("path: %s\n", fullpath);
+		free(freepath, M_TEMP);
+	}
+
+	return 0;
 }
 
 /* Basic module data */

From owner-p4-projects@FreeBSD.ORG  Fri May 14 17:16:13 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 78001106566B; Fri, 14 May 2010 17:16:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CA841065680
	for ; Fri, 14 May 2010 17:16:13 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C9AAF8FC12
	for ; Fri, 14 May 2010 17:16:12 +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 o4EHGCk2039318
	for ; Fri, 14 May 2010 17:16:12 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EHGCRq039316
	for perforce@freebsd.org; Fri, 14 May 2010 17:16:12 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Fri, 14 May 2010 17:16:12 GMT
Message-Id: <201005141716.o4EHGCRq039316@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 178256 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, 14 May 2010 17:16:13 -0000

http://p4web.freebsd.org/@@178256?ac=10

Change 178256 by gcooper@starr-bastion on 2010/05/14 17:15:31

	Return the correct buffer in unpack_to_buffer.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#8 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#8 (text+ko) ====

@@ -391,7 +391,7 @@
 		}
 	}
 
-	return buffer;
+	return buf;
 
 }
 

From owner-p4-projects@FreeBSD.ORG  Fri May 14 18:54:52 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 92377106567E; Fri, 14 May 2010 18:54:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55DFE1065679
	for ; Fri, 14 May 2010 18:54:52 +0000 (UTC)
	(envelope-from iprebeg@freebsd.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 41FA78FC1D
	for ; Fri, 14 May 2010 18:54:52 +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 o4EIsqRL047572
	for ; Fri, 14 May 2010 18:54:52 GMT
	(envelope-from iprebeg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EIsptj047570
	for perforce@freebsd.org; Fri, 14 May 2010 18:54:51 GMT
	(envelope-from iprebeg@freebsd.org)
Date: Fri, 14 May 2010 18:54:51 GMT
Message-Id: <201005141854.o4EIsptj047570@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	iprebeg@freebsd.org using -f
From: Ivor Prebeg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178260 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, 14 May 2010 18:54:52 -0000

http://p4web.freebsd.org/@@178260?ac=10

Change 178260 by iprebeg@iprebeg_nxlab_login on 2010/05/14 18:53:52

	IFC@178258

Affected files ...

.. //depot/projects/vimage/src/share/man/man3/fpgetround.3#2 integrate
.. //depot/projects/vimage/src/share/man/man4/ae.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/ahb.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/amdtemp.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/ataraid.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/cmx.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/cpuctl.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/ed.4#6 integrate
.. //depot/projects/vimage/src/share/man/man4/ef.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/en.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/fpa.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/fxp.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/geom_fox.4#4 integrate
.. //depot/projects/vimage/src/share/man/man4/harp.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/hatm.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/hifn.4#4 integrate
.. //depot/projects/vimage/src/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/inet.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/kbdmux.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/ksyms.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/cs.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/ie.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/mse.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/pnp.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/pnpbios.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/vx.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.i386/wl.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/clkbrd.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/creator.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/machfb.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/ofw_console.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/openfirm.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.sparc64/openprom.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/mfi.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/mpt.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/natm.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/nve.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/patm.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/psm.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/run.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/splash.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/syscons.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/twa.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/ucom.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/uhso.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/vkbd.4#3 integrate
.. //depot/projects/vimage/src/share/man/man4/wpi.4#4 integrate
.. //depot/projects/vimage/src/share/man/man5/boot.config.5#2 integrate
.. //depot/projects/vimage/src/share/man/man5/fdescfs.5#2 integrate
.. //depot/projects/vimage/src/share/man/man5/linsysfs.5#2 integrate
.. //depot/projects/vimage/src/share/man/man5/make.conf.5#4 integrate
.. //depot/projects/vimage/src/share/man/man5/reiserfs.5#2 integrate
.. //depot/projects/vimage/src/share/man/man5/xfs.5#2 integrate
.. //depot/projects/vimage/src/share/man/man9/fail.9#4 integrate
.. //depot/projects/vimage/src/share/man/man9/mbpool.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/namei.9#4 integrate
.. //depot/projects/vimage/src/share/man/man9/uio.9#4 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#6 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#16 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#21 integrate
.. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/include/disassem.h#2 integrate
.. //depot/projects/vimage/src/sys/arm/include/md_var.h#5 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf.5#4 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#9 integrate
.. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfsimpl.h#5 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/dnlc.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#20 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#6 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#6 integrate
.. //depot/projects/vimage/src/sys/conf/options#62 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate
.. //depot/projects/vimage/src/sys/ddb/db_output.c#4 integrate
.. //depot/projects/vimage/src/sys/ddb/ddb.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#23 integrate
.. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#21 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/usb/net/uhso.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#21 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#18 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#58 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_run.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_runreg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/wlan/if_runvar.h#3 integrate
.. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mutex.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_default.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/vimage/src/sys/kern/vnode_if.src#17 integrate
.. //depot/projects/vimage/src/sys/mips/adm5120/if_admsw.c#8 integrate
.. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#60 integrate
.. //depot/projects/vimage/src/sys/net/flowtable.c#13 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#66 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#31 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#67 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#39 integrate
.. //depot/projects/vimage/src/sys/sys/eventhandler.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/lock.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#30 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man3/fpgetround.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fpgetround.3	1.0 (Berkeley) 9/23/93
-.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.15 2005/07/15 17:35:25 hrs Exp $
+.\" $FreeBSD: src/share/man/man3/fpgetround.3,v 1.16 2010/05/13 12:08:11 uqs Exp $
 .\"
 .Dd August 23, 1993
 .Dt FPGETROUND 3
@@ -170,10 +170,10 @@
 .Sh SEE ALSO
 .Xr fenv 3 ,
 .Xr isnan 3
+.Sh HISTORY
+These routines are based on SysV/386 routines of the same name.
 .Sh CAVEATS
 After a floating point exception and before a mask is set, the sticky
 flags must be reset.
 If another exception occurs before the sticky
 flags are reset, then a wrong exception type may be signaled.
-.Sh HISTORY
-These routines are based on SysV/386 routines of the same name.

==== //depot/projects/vimage/src/share/man/man4/ae.4#3 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ae.4,v 1.3 2009/01/04 15:48:38 stas Exp $
+.\" $FreeBSD: src/share/man/man4/ae.4,v 1.4 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd October 4, 2008
 .Dt AE 4
@@ -133,6 +133,14 @@
 .Xr ng_ether 4 ,
 .Xr vlan 4 ,
 .Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+driver and this manual page was written by
+.An Stanislav Sedov
+.Aq stas@FreeBSD.org .
+It first appeared in
+.Fx 7.1 .
 .Sh BUGS
 The Attansic L2 FastEthernet contoller supports DMA but does not use a
 descriptor based transfer mechanism via scatter-gather DMA.
@@ -142,11 +150,3 @@
 This may introduce a high CPU load on systems with heavy network activity.
 Luckily enough this should not be a problem on modern hardware as L2 does
 not support speeds faster than 100Mbps.
-.Sh HISTORY
-The
-.Nm
-driver and this manual page was written by
-.An Stanislav Sedov
-.Aq stas@FreeBSD.org .
-It first appeared in
-.Fx 7.1 .

==== //depot/projects/vimage/src/share/man/man4/ahb.4#2 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ahb.4,v 1.24 2006/05/20 09:39:28 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ahb.4,v 1.25 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd July 4, 2004
 .Dt AHB 4
@@ -70,13 +70,6 @@
 .It
 Adaptec AHA-1742A
 .El
-.Sh CAVEATS
-The Adaptec 174X is very sensitive to SCSI bus termination and cable
-length.
-It may also have difficulties operating with some modern devices
-that, due to their speed, expose timing problems in the controller.
-There are no known mechanisms for working around device incompatibilities of
-this nature.
 .Sh SEE ALSO
 .Xr aha 4 ,
 .Xr ahc 4 ,
@@ -90,3 +83,10 @@
 .Nm
 driver was written by
 .An Justin T. Gibbs .
+.Sh CAVEATS
+The Adaptec 174X is very sensitive to SCSI bus termination and cable
+length.
+It may also have difficulties operating with some modern devices
+that, due to their speed, expose timing problems in the controller.
+There are no known mechanisms for working around device incompatibilities of
+this nature.

==== //depot/projects/vimage/src/share/man/man4/amdtemp.4#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/amdtemp.4,v 1.2 2010/03/12 10:01:06 uqs Exp $
+.\" $FreeBSD: src/share/man/man4/amdtemp.4,v 1.3 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd April 8, 2008
 .Dt AMDTEMP 4
@@ -64,9 +64,6 @@
 For the K10 and K11 families, the driver creates
 .Va dev.cpu.%d.temperature
 with the temperature of each core.
-.Sh BUGS
-AMD K9 is not supported because temperature reporting has been replaced
-by Maltese.
 .Sh SEE ALSO
 .Xr sysctl 8
 .Sh HISTORY
@@ -77,3 +74,6 @@
 .Sh AUTHORS
 .An Rui Paulo Aq rpaulo@FreeBSD.org
 .An Norikatsu Shigemura Aq nork@FreeBSD.org
+.Sh BUGS
+AMD K9 is not supported because temperature reporting has been replaced
+by Maltese.

==== //depot/projects/vimage/src/share/man/man4/ataraid.4#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.10 2006/09/18 15:24:18 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ataraid.4,v 1.11 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd February 17, 2006
 .Dt ATARAID 4
@@ -135,9 +135,6 @@
 .Sh SEE ALSO
 .Xr ata 4 ,
 .Xr atacontrol 8
-.Sh CAVEATS
-RAID5 is not supported at this time.
-Code exists, but it neither uses nor maintains parity information.
 .Sh AUTHORS
 .An -nosplit
 The
@@ -146,3 +143,6 @@
 .An S\(/oren Schmidt Aq sos@FreeBSD.org .
 This manual page was written by
 .An Christian Brueffer Aq brueffer@FreeBSD.org .
+.Sh CAVEATS
+RAID5 is not supported at this time.
+Code exists, but it neither uses nor maintains parity information.

==== //depot/projects/vimage/src/share/man/man4/cmx.4#2 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/cmx.4,v 1.2 2008/03/06 08:47:16 rink Exp $
+.\" $FreeBSD: src/share/man/man4/cmx.4,v 1.3 2010/05/13 12:08:11 uqs Exp $
 .\"
 .Dd July 7, 2007
 .Dt CMX 4
@@ -67,11 +67,6 @@
 are supported and work as expected.  An open file descriptor
 will always be ready for writing, but only ready for reading
 if the device indicates that it has data available.
-.Sh COMPATIBILITY
-Userland smartcard code written for the vendor's Linux drivers
-should work with the
-.Nm
-driver without modification.
 .Sh FILES
 .Bl -tag -width /usr/ports/security/openct -compact
 .It Pa /dev/cmx\fBn\fP
@@ -91,6 +86,11 @@
 .\".Nm
 .\"devices.
 .El
+.Sh COMPATIBILITY
+Userland smartcard code written for the vendor's Linux drivers
+should work with the
+.Nm
+driver without modification.
 .Sh SEE ALSO
 .Xr pccard 4
 .Sh HISTORY

==== //depot/projects/vimage/src/share/man/man4/cpuctl.4#5 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.7 2009/06/30 12:35:47 stas Exp $
+.\" $FreeBSD: src/share/man/man4/cpuctl.4,v 1.8 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd June 30, 2009
 .Dt CPUCTL 4
@@ -148,10 +148,10 @@
 .Nm
 driver first appeared in
 .Fx 7.2 .
-.Sh BUGS
-Yes, probably, report if any.
 .Sh AUTHORS
 The
 .Nm
 module and this manual page were written by
 .An Stanislav Sedov Aq stas@FreeBSD.org .
+.Sh BUGS
+Yes, probably, report if any.

==== //depot/projects/vimage/src/share/man/man4/ed.4#6 (text+ko) ====

@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ed.4,v 1.63 2009/09/09 21:51:54 brooks Exp $
+.\" $FreeBSD: src/share/man/man4/ed.4,v 1.64 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd April 9, 2009
 .Dt ED 4
@@ -370,6 +370,24 @@
 This indicates a coding error in the PC Card attachment, because a PHY
 is required for the chips that generate this error message.
 .El
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr device.hints 5 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 1.0 .
+.Sh AUTHORS
+The
+.Nm
+device driver and this manual page were written by
+.An David Greenman .
 .Sh CAVEATS
 Early revision DS8390 chips have problems.
 They lock up whenever the receive
@@ -393,24 +411,6 @@
 undocumented.
 Neither the NE2000 nor the WD83x0 drivers work with this card.
 .Pp
-.Sh SEE ALSO
-.Xr altq 4 ,
-.Xr arp 4 ,
-.Xr miibus 4 ,
-.Xr netintro 4 ,
-.Xr ng_ether 4 ,
-.Xr device.hints 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 1.0 .
-.Sh AUTHORS
-The
-.Nm
-device driver and this manual page were written by
-.An David Greenman .
 .Sh BUGS
 The
 .Nm

==== //depot/projects/vimage/src/share/man/man4/ef.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ef.4,v 1.11 2004/12/21 01:09:34 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ef.4,v 1.12 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd June 20, 1999
 .Dt EF 4
@@ -100,12 +100,12 @@
 .Dl ifconfig_ed2f1_ipx="ipx 0x102"
 .Sh DIAGNOSTICS
 None.
-.Sh CAVEATS
-Avoid to configure the parent Ethernet device for the IPX protocol, after the
-.Nm
-driver is loaded.
 .Sh SEE ALSO
 .Xr ipx 3 ,
 .Xr ifconfig 8
 .Sh AUTHORS
 .An Boris Popov Aq bp@FreeBSD.org .
+.Sh CAVEATS
+Avoid to configure the parent Ethernet device for the IPX protocol, after the
+.Nm
+driver is loaded.

==== //depot/projects/vimage/src/share/man/man4/en.4#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/share/man/man4/en.4,v 1.22 2005/10/07 02:32:15 trhodes Exp $
+.\" $FreeBSD: src/share/man/man4/en.4,v 1.23 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd July 16, 2005
 .Dt EN 4
@@ -60,10 +60,6 @@
 en0: maximum DMA burst length = 64 bytes
 en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated
 .Ed
-.Sh CAVEATS
-The driver extensively uses DMA on PCI.
-The first
-generation PCI chipsets do not work or exhibit poor performance.
 .Sh SEE ALSO
 .Xr natm 4 ,
 .Xr natmip 4 ,
@@ -76,3 +72,7 @@
 .Nm
 driver in 1996 for
 .Nx .
+.Sh CAVEATS
+The driver extensively uses DMA on PCI.
+The first
+generation PCI chipsets do not work or exhibit poor performance.

==== //depot/projects/vimage/src/share/man/man4/fpa.4#2 (text+ko) ====

@@ -2,7 +2,7 @@
 .\" Copyright (c) 1995, Matt Thomas
 .\" All rights reserved.
 .\"
-.\" $FreeBSD: src/share/man/man4/fpa.4,v 1.22 2003/12/17 10:23:14 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/fpa.4,v 1.23 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd March 13, 1995
 .Dt FPA 4
@@ -40,11 +40,6 @@
 The ECU (EISA Configuration
 Utility) will need to be run to change the settings.
 .El
-.Sh CAVEATS
-Normally, the device driver will not enable the reception of SMT frames.
-However if the IFF_LINK1 flag is set, the device driver will enable the
-reception of SMT frames and pass them up to the Berkeley Packet Filter for
-processing.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -56,3 +51,8 @@
 .Nm fea
 device drivers and this manual page were written by
 .An Matt Thomas .
+.Sh CAVEATS
+Normally, the device driver will not enable the reception of SMT frames.
+However if the IFF_LINK1 flag is set, the device driver will enable the
+reception of SMT frames and pass them up to the Berkeley Packet Filter for
+processing.

==== //depot/projects/vimage/src/share/man/man4/fxp.4#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/fxp.4,v 1.41 2008/12/15 14:07:07 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/fxp.4,v 1.42 2010/05/12 16:59:58 yongari Exp $
 .\"
-.Dd December 15, 2008
+.Dd May 12, 2010
 .Dt FXP 4
 .Os
 .Sh NAME
@@ -62,23 +62,25 @@
 The
 .Nm
 driver supports the following media types:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It autoselect
-Enable autoselection of the media type and options
-.It 10baseT/UTP
-Set 10Mbps operation
-.It 100baseTX
-Set 100Mbps (Fast Ethernet) operation
+.Bl -tag -width "10baseT/UTP"
+.It Cm autoselect
+Enable autoselection of the media type and options.
+The autoselected mode can be overridden by adding the media options to
+.Xr rc.conf 5 .
+.It Cm 10baseT/UTP
+Set 10Mbps operation.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
 .El
 .Pp
 The
 .Nm
 driver supports the following media options:
-.Pp
-.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
-.It full-duplex
-Set full duplex operation
+.Bl -tag -width "full-duplex"
+.It Cm full-duplex
+Force full duplex operation.
+.It Cm half-duplex
+Force half duplex operation.
 .El
 .Pp
 Note that 100baseTX media type is not available on the Pro/10.
@@ -143,6 +145,43 @@
 .It
 Many on-board network interfaces on Intel motherboards
 .El
+.Sh LOADER TUNABLES
+Tunables can be set at the
+.Xr loader 8
+prompt before booting the kernel or stored in
+.Xr loader.conf 5 .
+The following variables are available as both
+.Xr loader 8
+tunables and
+.Xr sysctl 8
+variables:
+.Bl -tag -width "xxxxxx"
+.It Va dev.fxp.%d.int_delay
+Maximum amount of time, in microseconds, that an interrupt may
+be delayed in an attempt to coalesce interrupts.
+This is only effective if the Intel microcode is loaded.
+The accepted range is 300 to 3000, the default is 1000.
+.It Va dev.fxp.%d.bundle_max
+Number of packets that will be bundled, before an interrupt is
+generated.
+This is only effective if the Intel microcode is loaded.
+The accepted range is 1 to 65535, the default is 6.
+.It Va dev.fxp.%d.noflow
+Controls whether flow control should be used or not.
+The default is 1 (no flow control).
+.El
+.Sh SYSCTL VARIABLES
+The following variables are available as
+.Xr sysctl 8
+variables.
+.Bl -tag -width "xxxxxx"
+.It Va dev.fxp.%d.rnr
+This is a read-only variable and shows the number of events of
+RNR (resource not ready).
+.It Va dev.fxp.%d.stats
+This is a read-only variable and displays useful MAC counters
+maintained in the driver.
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "fxp%d: couldn't map memory"

==== //depot/projects/vimage/src/share/man/man4/geom_fox.4#4 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/geom_fox.4,v 1.5 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/share/man/man4/geom_fox.4,v 1.6 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd January 2, 2005
 .Dt GEOM_FOX 4
@@ -177,6 +177,14 @@
 .Xr GEOM 4 ,
 .Xr geom 8 ,
 .Xr gmultipath 8
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+This manual page was written by
+.An "Wilko Bulte" Aq wilko@FreeBSD.org .
 .Sh CAVEATS
 The
 .Nm
@@ -193,14 +201,6 @@
 For FibreChannel devices it is suggested to use the Port WWN of the device.
 The World Wide Name is guaranteed to be worldwide unique per the
 FibreChannel standard.
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
-This manual page was written by
-.An "Wilko Bulte" Aq wilko@FreeBSD.org .
 .Sh BUGS
 The
 .Nm

==== //depot/projects/vimage/src/share/man/man4/harp.4#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt 
 .\"
-.\" $FreeBSD: src/share/man/man4/harp.4,v 1.3 2004/06/17 19:51:17 ru Exp $
+.\" $FreeBSD: src/share/man/man4/harp.4,v 1.4 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd July 21, 2003
 .Dt HARP 4
@@ -56,11 +56,11 @@
 .Xr ng_atm 4 ,
 .Xr patm 4 ,
 .Xr atm 8
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 When
 .Xr fatm 4
 is used, it must be started before
 .Nm
 is loaded, to get the correct configuration for the HARP physical interface.
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org

==== //depot/projects/vimage/src/share/man/man4/hatm.4#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\"
 .\" Author: Hartmut Brandt 
 .\"
-.\" $FreeBSD: src/share/man/man4/hatm.4,v 1.9 2005/01/21 08:36:37 ru Exp $
+.\" $FreeBSD: src/share/man/man4/hatm.4,v 1.10 2010/05/13 12:07:55 uqs Exp $
 .\"
 .\" hatm(4) man page
 .\"
@@ -252,6 +252,19 @@
 Maximum number of memory pages allocated to small external mbufs.
 This must not be zero and not larger than 65536.
 .El
+.Sh DIAGNOSTICS
+.Bd -literal
+hatm0:  mem 0xd2600000-0xd26fffff irq 9 at device 15.0 on pci2
+hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
+.Ed
+.Sh SEE ALSO
+.Xr natm 4 ,
+.Xr natmip 4 ,
+.Xr utopia 4 ,
+.Xr ifconfig 8 ,
+.Xr route 8
+.Sh AUTHORS
+.An Harti Brandt Aq harti@FreeBSD.org
 .Sh CAVEATS
 When putting a HE155 into a 64-bit 66MHz PCI slot the machine may hang.
 This occurs very early in the POST so that even the display does not turn on.
@@ -267,16 +280,3 @@
 arguments the
 .Nx
 function has.
-.Sh DIAGNOSTICS
-.Bd -literal
-hatm0:  mem 0xd2600000-0xd26fffff irq 9 at device 15.0 on pci2
-hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
-.Ed
-.Sh SEE ALSO
-.Xr natm 4 ,
-.Xr natmip 4 ,
-.Xr utopia 4 ,
-.Xr ifconfig 8 ,
-.Xr route 8
-.Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org

==== //depot/projects/vimage/src/share/man/man4/hifn.4#4 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/hifn.4,v 1.9 2009/10/19 14:36:12 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/hifn.4,v 1.10 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd October 19, 2009
 .Dt HIFN 4
@@ -107,6 +107,15 @@
 .Xr ipsec 4 ,
 .Xr random 4 ,
 .Xr crypto 9
+.Sh HISTORY
+The
+.Nm
+device driver appeared in
+.Ox 2.7 .
+The
+.Nm
+device driver was imported to
+.Fx 5.0 .
 .Sh CAVEATS
 The Hifn 9751 shares the same PCI ID.
 This chip is basically a 7751, but with the cryptographic functions missing.
@@ -116,15 +125,6 @@
 .Pp
 Support for the 7955 and 7956 is incomplete; the asymmetric crypto
 facilities are to be added and the performance is suboptimal.
-.Sh HISTORY
-The
-.Nm
-device driver appeared in
-.Ox 2.7 .
-The
-.Nm
-device driver was imported to
-.Fx 5.0 .
 .Sh BUGS
 The 7751 chip starts out at initialization by only supporting compression.
 A proprietary algorithm, which has been reverse engineered, is required to

==== //depot/projects/vimage/src/share/man/man4/hwpmc.4#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/hwpmc.4,v 1.23 2008/09/22 14:31:24 jkoshy Exp $
+.\" $FreeBSD: src/share/man/man4/hwpmc.4,v 1.24 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd September 22, 2008
 .Dt HWPMC 4
@@ -450,42 +450,6 @@
 before
 .Nm
 is loaded.
-.Sh SECURITY CONSIDERATIONS
-PMCs may be used to monitor the actual behavior of the system on hardware.
-In situations where this constitutes an undesirable information leak,
-the following options are available:
-.Bl -enum
-.It
-Set the
-.Xr sysctl 8
-tunable
-.Va security.bsd.unprivileged_syspmcs
-to 0.
-This ensures that unprivileged processes cannot allocate system-wide
-PMCs and thus cannot observe the hardware behavior of the system
-as a whole.
-This tunable may also be set at boot time using
-.Xr loader 8 ,
-or with
-.Xr kenv 1
-prior to loading the
-.Nm
-driver into the kernel.
-.It
-Set the
-.Xr sysctl 8
-tunable
-.Va security.bsd.unprivileged_proc_debug
-to 0.
-This will ensure that an unprivileged process cannot attach a PMC
-to any process other than itself and thus cannot observe the hardware
-behavior of other processes with the same credentials.
-.El
-.Pp
-System administrators should note that on IA-32 platforms
-.Fx
-makes the content of the IA-32 TSC counter available to all processes
-via the RDTSC instruction.
 .Sh IMPLEMENTATION NOTES
 .Ss SMP Symmetry
 The kernel driver requires all physical CPUs in an SMP system to have
@@ -831,3 +795,39 @@
 such systems
 .Nm
 will not support sampling PMCs.
+.Sh SECURITY CONSIDERATIONS
+PMCs may be used to monitor the actual behavior of the system on hardware.
+In situations where this constitutes an undesirable information leak,
+the following options are available:
+.Bl -enum
+.It
+Set the
+.Xr sysctl 8
+tunable
+.Va security.bsd.unprivileged_syspmcs
+to 0.
+This ensures that unprivileged processes cannot allocate system-wide
+PMCs and thus cannot observe the hardware behavior of the system
+as a whole.
+This tunable may also be set at boot time using
+.Xr loader 8 ,
+or with
+.Xr kenv 1
+prior to loading the
+.Nm
+driver into the kernel.
+.It
+Set the
+.Xr sysctl 8
+tunable
+.Va security.bsd.unprivileged_proc_debug
+to 0.
+This will ensure that an unprivileged process cannot attach a PMC
+to any process other than itself and thus cannot observe the hardware
+behavior of other processes with the same credentials.
+.El
+.Pp
+System administrators should note that on IA-32 platforms
+.Fx
+makes the content of the IA-32 TSC counter available to all processes
+via the RDTSC instruction.

==== //depot/projects/vimage/src/share/man/man4/inet.4#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man4/inet.4,v 1.39 2006/12/14 16:40:57 mpp Exp $
+.\" $FreeBSD: src/share/man/man4/inet.4,v 1.40 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd April 9, 2005
 .Dt INET 4
@@ -280,12 +280,6 @@
 .%B PS1
 .%N 8
 .Re
-.Sh CAVEATS
-The Internet protocol support is subject to change as
-the Internet protocols develop.
-Users should not depend
-on details of the current implementation, but rather
-the services exported.
 .Sh HISTORY
 The
 .Nm
@@ -295,3 +289,9 @@
 .Dq protocol cloning
 code appeared in
 .Fx 2.1 .
+.Sh CAVEATS
+The Internet protocol support is subject to change as
+the Internet protocols develop.
+Users should not depend
+on details of the current implementation, but rather
+the services exported.

==== //depot/projects/vimage/src/share/man/man4/kbdmux.4#3 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" $Id: kbdmux.4,v 1.1 2005/07/14 20:32:10 max Exp $
-.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.6 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/share/man/man4/kbdmux.4,v 1.7 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd July 12, 2005
 .Dt KBDMUX 4
@@ -35,6 +35,13 @@
 .Xr atkbd 4 ,
 .Xr syscons 4 ,
 .Xr ukbd 4
+.Sh HISTORY
+The
+.Nm
+module was implemented in
+.Fx 6.0 .
+.Sh AUTHORS
+.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
@@ -47,10 +54,3 @@
 The
 .Nm
 keyboard is logically equivalent to one keyboard with lots of duplicated keys.
-.Sh HISTORY
-The
-.Nm
-module was implemented in
-.Fx 6.0 .
-.Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com

==== //depot/projects/vimage/src/share/man/man4/ksyms.4#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ksyms.4,v 1.1 2009/05/26 21:39:09 sson Exp $
+.\" $FreeBSD: src/share/man/man4/ksyms.4,v 1.2 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd April 5, 2009
 .Dt KSYMS 4
@@ -130,6 +130,12 @@
 .Fx 8.0
 to support 
 .Xr lockstat 1 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Stacey Son
+.Aq sson@freebsd.org .
 .Sh BUGS
 Because files can be dynamically linked into the kernel at any time the symbol 
 information can vary.  When you open the
@@ -150,9 +156,3 @@
 save kernel memory. 
 .Xr mmap 2
 may also be used but it will map it to another address. 
-.Sh AUTHORS
-The 
-.Nm
-driver was written by 
-.An Stacey Son
-.Aq sson@freebsd.org .

==== //depot/projects/vimage/src/share/man/man4/man4.i386/cs.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/man4.i386/cs.4,v 1.22 2006/02/01 14:33:14 joel Exp $
+.\" $FreeBSD: src/share/man/man4/man4.i386/cs.4,v 1.23 2010/05/13 12:07:55 uqs Exp $
 .\"
 .Dd July 16, 2005
 .Dt CS 4 i386
@@ -129,12 +129,6 @@
 The adapter
 may not function.
 .El
-.Sh CAVEATS
-The CS89x0 family of adapters have a very small RAM buffer (4K).
-This may
-cause problems with extremely high network loads or bursty network traffic.
-In particular, NFS operations should be limited to 1k read/write transactions
-in order to avoid overruns.
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,

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

From owner-p4-projects@FreeBSD.ORG  Fri May 14 19:21:19 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 381371065676; Fri, 14 May 2010 19:21:19 +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 F0C101065670
	for ; Fri, 14 May 2010 19:21:18 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C55698FC12
	for ; Fri, 14 May 2010 19:21: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 o4EJLIxE050708
	for ; Fri, 14 May 2010 19:21:18 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EJLITx050706
	for perforce@freebsd.org; Fri, 14 May 2010 19:21:18 GMT
	(envelope-from jona@FreeBSD.org)
Date: Fri, 14 May 2010 19:21:18 GMT
Message-Id: <201005141921.o4EJLITx050706@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 178261 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, 14 May 2010 19:21:19 -0000

http://p4web.freebsd.org/@@178261?ac=10

Change 178261 by jona@jona-belle-freebsd8 on 2010/05/14 19:20:31

	Allow fstatat()

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#27 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#47 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#30 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#27 (text+ko) ====

@@ -38,7 +38,7 @@
 ## - sys_exit(2), abort2(2) and close(2) are very important.
 ## - Sorted alphabetically, please keep it that way.
 ##
-## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#26 $
+## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#27 $
 ##
 
 ##
@@ -457,6 +457,7 @@
 ## files which are not "under" the directory FD given to the syscall.
 ##
 faccessat
+fstatat
 fchmodat
 futimesat
 mkdirat

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#47 (text+ko) ====

@@ -527,7 +527,7 @@
 	{ AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, SYF_CAPENABLED },	/* 490 = fchmodat */
 	{ AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 },	/* 491 = fchownat */
 	{ AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED },	/* 492 = fexecve */
-	{ AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 },	/* 493 = fstatat */
+	{ AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED },	/* 493 = fstatat */
 	{ AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED },	/* 494 = futimesat */
 	{ AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 },	/* 495 = linkat */
 	{ AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED },	/* 496 = mkdirat */

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#30 (text+ko) ====

@@ -2425,9 +2425,9 @@
 	if (flag & ~AT_SYMLINK_NOFOLLOW)
 		return (EINVAL);
 
-	NDINIT_AT(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW :
+	NDINIT_ATRIGHTS(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW :
 	    FOLLOW) | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg,
-	    path, fd, td);
+	    path, fd, CAP_FSTAT | CAP_ATBASE, td);
 
 	if ((error = namei(&nd)) != 0)
 		return (error);

From owner-p4-projects@FreeBSD.ORG  Fri May 14 19:24:22 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BCB31065674; Fri, 14 May 2010 19:24: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 106711065672
	for ; Fri, 14 May 2010 19:24:22 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F28C98FC18
	for ; Fri, 14 May 2010 19:24: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 o4EJOL9C050892
	for ; Fri, 14 May 2010 19:24:21 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EJOLwJ050890
	for perforce@freebsd.org; Fri, 14 May 2010 19:24:21 GMT
	(envelope-from jona@FreeBSD.org)
Date: Fri, 14 May 2010 19:24:21 GMT
Message-Id: <201005141924.o4EJOLwJ050890@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 178262 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, 14 May 2010 19:24:22 -0000

http://p4web.freebsd.org/@@178262?ac=10

Change 178262 by jona@jona-belle-freebsd8 on 2010/05/14 19:24:03

	Only set *relative_name if relative_name != NULL

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#8 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#13 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 $
  */
 
 #include 
@@ -402,7 +402,8 @@
 
 	/* try to find the file itself in the FD list */
 	size_t len = strlen(filename);
-	*relative_name = filename + len;
+	if (relative_name)
+		*relative_name = filename + len;
 
 	while (fd == -1)
 	{

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

@@ -226,6 +226,7 @@
     struct link_map linkmap;	/* For GDB and dlinfo() */
     Objlist dldags;		/* Object belongs to these dlopened DAGs (%) */
     Objlist dagmembers;		/* DAG has these members (%) */
+    int fd;			/* Object's file descriptor */
     dev_t dev;			/* Object's filesystem's device */
     ino_t ino;			/* Object's inode number */
     void *priv;			/* Platform-dependant */

From owner-p4-projects@FreeBSD.ORG  Sat May 15 01:44:47 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D82B51065674; Sat, 15 May 2010 01:44: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 8448E1065670
	for ; Sat, 15 May 2010 01:44:46 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 69DB18FC16
	for ; Sat, 15 May 2010 01:44: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 o4F1ikxj007291
	for ; Sat, 15 May 2010 01:44:46 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F1ikYA007289
	for perforce@freebsd.org; Sat, 15 May 2010 01:44:46 GMT
	(envelope-from lz@FreeBSD.org)
Date: Sat, 15 May 2010 01:44:46 GMT
Message-Id: <201005150144.o4F1ikYA007289@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178280 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: Sat, 15 May 2010 01:44:47 -0000

http://p4web.freebsd.org/@@178280?ac=10

Change 178280 by lz@gnehzuil-freebsd on 2010/05/15 01:43:48

	       Fix two bugs.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#8 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#8 (text+ko) ====

@@ -133,24 +133,24 @@
 }
 
 /*
- * Add a ext2_rsv_win struct to RB tree.
+ * Remove a ext2_rsv_win structure from RB tree.
  */
 static void
-ext2_add_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
+ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
 {
-	RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
+	rp->rw_start = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_end = EXT2_RWI_NOT_ALLOCATED;
+	rp->rw_alloc_hit = 0;
+	RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
 }
 
 /*
- * Remove a ext2_rsv_win structure from RB tree.
+ * Add a ext2_rsv_win struct to RB tree.
  */
 static void
-ext2_remove_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
+ext2_add_rsv_win(struct m_ext2fs *fs, struct ext2_rsv_win *rp)
 {
-	rp->rw_start = EXT2_RWI_NOT_ALLOCATED;
-	rp->rw_end = EXT2_RWI_NOT_ALLOCATED;
-	rp->rw_alloc_hit = 0;
-	RB_REMOVE(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
+	RB_INSERT(ext2_rsv_win_tree, &fs->e2fs_rsv_tree, rp);
 }
 
 /*
@@ -162,6 +162,9 @@
 {
         struct ext2_rsv_win *next, *prev;
 
+        if (RB_EMPTY(root))
+                return NULL;
+
         next = RB_ROOT(root);
         do {
                 prev = next;
@@ -170,11 +173,11 @@
                 else if (bpref > next->rw_end)
                         next = RB_RIGHT(next, rw_link);
                 else
-                        return next;
+                        return prev;
         } while(next != NULL);
 
-        if (next == NULL || next->rw_start > bpref)
-                next = prev;
+        if (prev->rw_start > bpref)
+                prev = RB_PREV(ext2_rsv_win_tree, root, prev);
 
         return next;
 }
@@ -330,21 +333,18 @@
     struct buf *bp, int32_t bpref, struct ext2_rsv_win *rp)
 {
         struct ext2mount *ump;
-        u_long start, end;
+        u_long start;
         char *bbp;
         u_long bno;
 
         ump = ip->i_ump;
         bbp = (char *)bp->b_data;
-        if (rp != NULL && rp->rw_end != EXT2_RWI_NOT_ALLOCATED) {
+        if (rp != NULL && rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
                 start = dtogd(fs, rp->rw_start + rp->rw_alloc_hit) / NBBY;
-                end = dtogd(fs, rp->rw_end) / NBBY;
-        } else {
-                start = dtogd(fs, bpref) / NBBY;
-                end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start;
-        }
+        else
+                return 0;
 
-        if (bbp[start * NBBY] == 0) {
+        if (bbp[start] == 0) {
                 bno = start * NBBY;
                 goto gotit;
         }
@@ -425,8 +425,6 @@
 	else
 		cg = dtog(fs, bpref);
 
-        /* TODO: If cg doesn't have enought blocks, do not use reservation window */
-
         /* If cg has some free blocks, then try to allocate a free block from this cg */
         if (fs->e2fs_gd[cg].ext2bgd_nbfree > 0) {
                 /* Read block bitmap from buffer */

From owner-p4-projects@FreeBSD.ORG  Sat May 15 03:20:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A37111065676; Sat, 15 May 2010 03:20: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 571B71065674
	for ; Sat, 15 May 2010 03:20:23 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4564C8FC19
	for ; Sat, 15 May 2010 03:20:23 +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 o4F3KMBX016319
	for ; Sat, 15 May 2010 03:20:22 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F3KMrk016317
	for perforce@freebsd.org; Sat, 15 May 2010 03:20:22 GMT
	(envelope-from jona@FreeBSD.org)
Date: Sat, 15 May 2010 03:20:22 GMT
Message-Id: <201005150320.o4F3KMrk016317@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 178281 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: Sat, 15 May 2010 03:20:23 -0000

http://p4web.freebsd.org/@@178281?ac=10

Change 178281 by jona@jona-belle-freebsd8 on 2010/05/15 03:20:09

	Only do relative naming if the retrieved filename has length > 0

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#15 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#15 $
  */
 
 #include 
@@ -433,6 +433,14 @@
 			return (-1);
 
 		len = strlen(dirname);
+
+		/* if there is no filename, we can't do relative naming */
+		if (len == 0)
+		{
+			fd = -1;
+			continue;
+		}
+
 		if (strncmp(dirname, filename, len)) fd = -1;
 		else
 		{

From owner-p4-projects@FreeBSD.ORG  Sat May 15 04:39:43 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 83A181065672; Sat, 15 May 2010 04:39:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43DD5106566B
	for ; Sat, 15 May 2010 04:39:43 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 174D28FC15
	for ; Sat, 15 May 2010 04:39:43 +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 o4F4dg2f023209
	for ; Sat, 15 May 2010 04:39:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F4dgl5023207
	for perforce@freebsd.org; Sat, 15 May 2010 04:39:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 04:39:42 GMT
Message-Id: <201005150439.o4F4dgl5023207@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 178284 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: Sat, 15 May 2010 04:39:43 -0000

http://p4web.freebsd.org/@@178284?ac=10

Change 178284 by gcooper@starr-bastion on 2010/05/15 04:38:48

	Abbreviate unpack API names.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#9 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#4 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#9 (text+ko) ====

@@ -345,7 +345,7 @@
 
 /*
  * Unpack a single file, denoted by file, to a buffer; this call uses
- * unpack_file_to_fd to first open the file, and once that has been completed
+ * unpack_to_fd to first open the file, and once that has been completed
  * it opens the file and proceeds to read it into the buffer -- either
  * specified by buffer if buffer is not NULL, or attempts to allocate memory
  * which will need to be freed by the user at a later date.
@@ -354,14 +354,14 @@
  * returns NULL on failure.
  */
 char*
-unpack_file_to_buffer(char *buffer, const char *pkg, const char *file)
+unpack_to_buffer(char *buffer, const char *pkg, const char *file)
 {
 
 	FILE *fd = NULL;
 	char *buf = buffer;
 	struct stat sb;
 
-	if ((fd = unpack_file_to_fd(pkg, file)) != NULL) {
+	if ((fd = unpack_to_fd(pkg, file)) != NULL) {
 
 		if (fstat(fileno(fd), &sb) == 0) {
 
@@ -416,7 +416,7 @@
  * Return -1 on failure, a value greater than 0 on success.
  */
 FILE*
-unpack_file_to_fd(const char *pkg, const char *file)
+unpack_to_fd(const char *pkg, const char *file)
 {
 	struct archive *archive;
 	struct archive_entry *archive_entry;

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#4 (text+ko) ====

@@ -189,8 +189,9 @@
 void		copy_hierarchy(const char *, const char *, Boolean);
 int		delete_hierarchy(const char *, Boolean, Boolean);
 int		unpack(const char *, const char *);
-char*		unpack_file_to_buffer(char *, const char *, const char *);
-FILE*		unpack_file_to_fd(const char *, const char *);
+char*		unpack_to_buffer(struct archive *archive, const char *,
+		    const char *);
+FILE*		unpack_to_fd(const char *, const char *);
 void		format_cmd(char *, int, const char *, const char *, const char *);
 
 /* Msg */

From owner-p4-projects@FreeBSD.ORG  Sat May 15 04:39:44 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C7CB1065746; Sat, 15 May 2010 04:39:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55BFF106566C
	for ; Sat, 15 May 2010 04:39:43 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 43A0D8FC16
	for ; Sat, 15 May 2010 04:39:43 +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 o4F4dgs8023214
	for ; Sat, 15 May 2010 04:39:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F4dgsJ023212
	for perforce@freebsd.org; Sat, 15 May 2010 04:39:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 04:39:42 GMT
Message-Id: <201005150439.o4F4dgsJ023212@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 178285 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: Sat, 15 May 2010 04:39:44 -0000

http://p4web.freebsd.org/@@178285?ac=10

Change 178285 by gcooper@starr-bastion on 2010/05/15 04:39:34

	Abbreviate unpack API names.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#8 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#8 (text+ko) ====

@@ -147,7 +147,7 @@
 		    goto bomb;
 		}
 	    } else
-		cfile = unpack_file_to_fd(pkg, CONTENTS_FNAME);
+		cfile = unpack_to_fd(pkg, CONTENTS_FNAME);
 
 	    if (!cfile) {
 		warnx(

From owner-p4-projects@FreeBSD.ORG  Sat May 15 05:00:06 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B14D1065674; Sat, 15 May 2010 05:00:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C228C106566C
	for ; Sat, 15 May 2010 05:00:05 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 85C448FC08
	for ; Sat, 15 May 2010 05:00:05 +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 o4F503rZ035215
	for ; Sat, 15 May 2010 05:00:03 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F503i3035213
	for perforce@freebsd.org; Sat, 15 May 2010 05:00:03 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 05:00:03 GMT
Message-Id: <201005150500.o4F503i3035213@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 178286 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: Sat, 15 May 2010 05:00:06 -0000

http://p4web.freebsd.org/@@178286?ac=10

Change 178286 by gcooper@starr-bastion on 2010/05/15 04:59:21

	1. Fix the prototype mismatch for unpack_to_buffer function.
	2. Nuke all of the user-specifiable data as I'm almost positive that the user
	   specified buffer never be large enough to fit, and whether or not the user
	   was specifying heap or stack based buffers would be problematic to
	   determine.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#10 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#5 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#10 (text+ko) ====

@@ -354,11 +354,11 @@
  * returns NULL on failure.
  */
 char*
-unpack_to_buffer(char *buffer, const char *pkg, const char *file)
+unpack_to_buffer(const char *pkg, const char *file)
 {
 
 	FILE *fd = NULL;
-	char *buf = buffer;
+	char *buf = NULL; 
 	struct stat sb;
 
 	if ((fd = unpack_to_fd(pkg, file)) != NULL) {
@@ -370,22 +370,12 @@
 			 * to malloc on the fly and let the user deal with it
 			 * later.
 			 */
-			if (buf != NULL)
-				buf = malloc(sb.st_size);
+			buf = malloc(sb.st_size);
 			if (buf != NULL) {
-
 				if (fread(buf, sb.st_size, 1, fd) !=
 				    sb.st_size) {
-
-					/* 
-					 * Don't try to free user specified
-					 * memory.
-					 */
-					if (buffer == NULL)
-						free(buf);
-
+					free(buf);
 				}	
-
 			}
 
 		}

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#5 (text+ko) ====

@@ -189,8 +189,7 @@
 void		copy_hierarchy(const char *, const char *, Boolean);
 int		delete_hierarchy(const char *, Boolean, Boolean);
 int		unpack(const char *, const char *);
-char*		unpack_to_buffer(struct archive *archive, const char *,
-		    const char *);
+char*		unpack_to_buffer(const char *, const char *);
 FILE*		unpack_to_fd(const char *, const char *);
 void		format_cmd(char *, int, const char *, const char *, const char *);
 

From owner-p4-projects@FreeBSD.ORG  Sat May 15 05:01:05 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0FFDF1065677; Sat, 15 May 2010 05:01:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C8858106566B
	for ; Sat, 15 May 2010 05:01:04 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B66898FC16
	for ; Sat, 15 May 2010 05:01:04 +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 o4F514Q5035318
	for ; Sat, 15 May 2010 05:01:04 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F514J9035316
	for perforce@freebsd.org; Sat, 15 May 2010 05:01:04 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 05:01:04 GMT
Message-Id: <201005150501.o4F514J9035316@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 178287 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: Sat, 15 May 2010 05:01:05 -0000

http://p4web.freebsd.org/@@178287?ac=10

Change 178287 by gcooper@starr-bastion on 2010/05/15 05:00:43

	Update comment as per API change.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#11 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#11 (text+ko) ====

@@ -346,9 +346,8 @@
 /*
  * Unpack a single file, denoted by file, to a buffer; this call uses
  * unpack_to_fd to first open the file, and once that has been completed
- * it opens the file and proceeds to read it into the buffer -- either
- * specified by buffer if buffer is not NULL, or attempts to allocate memory
- * which will need to be freed by the user at a later date.
+ * it opens the file and proceeds to read it into the buffer which will 
+ * need to be freed by the user at a later date.
  *
  * Returns an address to a buffer with the contents of *file if successful, or
  * returns NULL on failure.

From owner-p4-projects@FreeBSD.ORG  Sat May 15 05:13:17 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B7DA1065679; Sat, 15 May 2010 05:13:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6029D1065676
	for ; Sat, 15 May 2010 05:13:17 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CAAC8FC13
	for ; Sat, 15 May 2010 05:13:17 +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 o4F5DG2h037160
	for ; Sat, 15 May 2010 05:13:16 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F5DGRt037158
	for perforce@freebsd.org; Sat, 15 May 2010 05:13:16 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 05:13:16 GMT
Message-Id: <201005150513.o4F5DGRt037158@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 178288 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: Sat, 15 May 2010 05:13:17 -0000

http://p4web.freebsd.org/@@178288?ac=10

Change 178288 by gcooper@starr-bastion on 2010/05/15 05:12:21

	1. Rename unpack to unpack_to_disk for consistency with archive(3).
	2. Shuffle around unpack_to_disk so that it's in proper sorted order.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#12 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#9 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#4 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#12 (text+ko) ====

@@ -384,49 +384,43 @@
 
 }
 
-/*
- * Unpack a single file from a tar-file to a file descriptor; this is written
- * like so as an optimization to abbreviate the extract to *open step, as well
- * as to reduce the number of required steps needed when unpacking a tarball on
- * disk, as the previous method employed with tar(1) used -q // --fast-read .
+/* 
+ * Unpack a tar file, or a subset of the contents.
  *
- * Return NULL on failure, and non-NULL on success
+ * Return 0 on success, 1 on failure
  *
- * XXX (gcooper): this is currently implemented with FILE* / fopen(3) due to
- * legacy issues that need to be sorted out over the next couple of weeks for
- * 1) locking to function properly, and to gain the potential performance boost
- * by using mmap(2), and read(2) (ugh).
- *
- * But first things first, we need a working solution with minimal changes;
- * then we move on from there.
- *
- * [The return code info will eventually be...]
- *
- * Return -1 on failure, a value greater than 0 on success.
+ * NOTE: the exit code is 0 / 1 so that this can be fed directly into exit
+ * when doing piped tar commands for copying hierarchies *hint*, *hint* -- this
+ * use may be short-lived though, so don't depend on the return value, mmk?
  */
-FILE*
-unpack_to_fd(const char *pkg, const char *file)
+int
+unpack_to_disk(const char *pkg, const char *file_expr)
 {
 	struct archive *archive;
 	struct archive_entry *archive_entry;
-	Boolean found_match = FALSE;
-
+	Boolean extract_whole_archive = FALSE;
 	const char *entry_pathname = NULL;
 	const char *error = NULL;
 	const char *pkg_name_humanized;
+	int archive_fd = -1, r;
 
-	FILE *fd = NULL;
-	/* int fd = -1; */
-	int archive_fd = -1, r;
+	if (file_expr == NULL || strcmp("*", file_expr) == 0)
+		extract_whole_archive = TRUE;
 
 	if (pkg == NULL || strcmp(pkg, "-") == 0)
 		pkg_name_humanized = "(stdin)";
 	else
 		pkg_name_humanized = pkg;
 
-	if (Verbose)
-		printf("%s: will extract %s from %s\n",
-		    __func__, file, pkg_name_humanized);
+	if (Verbose) {
+		if (extract_whole_archive)
+			printf("%s: %s - will extract whole archive\n",
+			    pkg_name_humanized, __func__);
+		else
+			printf("%s: %s - will extract files that match "
+			       "expression: %s\n",
+			    pkg_name_humanized, __func__, file_expr);
+	}
 
 	if ((archive = archive_read_new()) != NULL) {
 
@@ -451,26 +445,23 @@
 	/* archive(3) failed to open the file descriptor. */
 	else if (archive_read_open_fd(archive, archive_fd,
 	    ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+
 		error = archive_error_string(archive);
 		warnx("%s: unable to open the package from %s: %s",
 		    __func__, pkg_name_humanized, error);
+
 	}
 	else
-		while (error == NULL && found_match == FALSE &&
+		while (error == NULL &&
 		    (r = archive_read_next_header(archive, &archive_entry)) ==
 		     ARCHIVE_OK) {
 
 			entry_pathname = archive_entry_pathname(archive_entry);
 
-			if (strncmp(file, entry_pathname, PATH_MAX) == 0) {
-
-				/* 
-				 * Regardless of whether or not extract passes,
-				 * we found our target file so let's exit
-				 * quickly because the underlying issue is most
-				 * likely unrecoverable.
-				 */
-				found_match = TRUE;
+			/* Let's extract the whole archive, or just a file. */
+			if (extract_whole_archive == TRUE ||
+			    (fnmatch(file_expr, entry_pathname,
+				FNM_PATHNAME)) == 0) {
 
 				r = archive_read_extract(archive, archive_entry,
 				    EXTRACT_ARCHIVE_FLAGS);
@@ -478,7 +469,6 @@
 					if (Verbose)
 						printf("X - %s\n",
 						    entry_pathname);
-					fd = fopen(entry_pathname, "r");
 				} else {
 					error = archive_error_string(archive);
 					warnx("%s: extraction for %s failed: "
@@ -495,8 +485,8 @@
 	if (errno != 0)
 		error = strerror(errno);
 	if (error != NULL)
-		warnx("%s: unable to read the file - %s - from package: %s: "
-		    "%s", __func__, file, pkg_name_humanized, error);
+		warnx("%s: unpacking package - %s - failed: %s",
+		    __func__, pkg_name_humanized, error);
 
 	if (archive != NULL)
 		archive_read_finish(archive);
@@ -504,47 +494,53 @@
 	if (0 <= archive_fd)
 		close(archive_fd);
 
-	return fd;
+	return (error == NULL ? 0 : 1);
 
 }
 
-/* 
- * Unpack a tar file, or a subset of the contents.
+/*
+ * Unpack a single file from a tar-file to a file descriptor; this is written
+ * like so as an optimization to abbreviate the extract to *open step, as well
+ * as to reduce the number of required steps needed when unpacking a tarball on
+ * disk, as the previous method employed with tar(1) used -q // --fast-read .
+ *
+ * Return NULL on failure, and non-NULL on success
+ *
+ * XXX (gcooper): this is currently implemented with FILE* / fopen(3) due to
+ * legacy issues that need to be sorted out over the next couple of weeks for
+ * 1) locking to function properly, and to gain the potential performance boost
+ * by using mmap(2), and read(2) (ugh).
+ *
+ * But first things first, we need a working solution with minimal changes;
+ * then we move on from there.
  *
- * Return 0 on success, 1 on failure
+ * [The return code info will eventually be...]
  *
- * NOTE: the exit code is 0 / 1 so that this can be fed directly into exit
- * when doing piped tar commands for copying hierarchies *hint*, *hint* -- this
- * use may be short-lived though, so don't depend on the return value, mmk?
+ * Return -1 on failure, a value greater than 0 on success.
  */
-int
-unpack(const char *pkg, const char *file_expr)
+FILE*
+unpack_to_fd(const char *pkg, const char *file)
 {
 	struct archive *archive;
 	struct archive_entry *archive_entry;
-	Boolean extract_whole_archive = FALSE;
+	Boolean found_match = FALSE;
+
 	const char *entry_pathname = NULL;
 	const char *error = NULL;
 	const char *pkg_name_humanized;
+
+	FILE *fd = NULL;
+	/* int fd = -1; */
 	int archive_fd = -1, r;
 
-	if (file_expr == NULL || strcmp("*", file_expr) == 0)
-		extract_whole_archive = TRUE;
-
 	if (pkg == NULL || strcmp(pkg, "-") == 0)
 		pkg_name_humanized = "(stdin)";
 	else
 		pkg_name_humanized = pkg;
 
-	if (Verbose) {
-		if (extract_whole_archive)
-			printf("%s: %s - will extract whole archive\n",
-			    pkg_name_humanized, __func__);
-		else
-			printf("%s: %s - will extract files that match "
-			       "expression: %s\n",
-			    pkg_name_humanized, __func__, file_expr);
-	}
+	if (Verbose)
+		printf("%s: will extract %s from %s\n",
+		    __func__, file, pkg_name_humanized);
 
 	if ((archive = archive_read_new()) != NULL) {
 
@@ -569,23 +565,26 @@
 	/* archive(3) failed to open the file descriptor. */
 	else if (archive_read_open_fd(archive, archive_fd,
 	    ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-
 		error = archive_error_string(archive);
 		warnx("%s: unable to open the package from %s: %s",
 		    __func__, pkg_name_humanized, error);
-
 	}
 	else
-		while (error == NULL &&
+		while (error == NULL && found_match == FALSE &&
 		    (r = archive_read_next_header(archive, &archive_entry)) ==
 		     ARCHIVE_OK) {
 
 			entry_pathname = archive_entry_pathname(archive_entry);
 
-			/* Let's extract the whole archive, or just a file. */
-			if (extract_whole_archive == TRUE ||
-			    (fnmatch(file_expr, entry_pathname,
-				FNM_PATHNAME)) == 0) {
+			if (strncmp(file, entry_pathname, PATH_MAX) == 0) {
+
+				/* 
+				 * Regardless of whether or not extract passes,
+				 * we found our target file so let's exit
+				 * quickly because the underlying issue is most
+				 * likely unrecoverable.
+				 */
+				found_match = TRUE;
 
 				r = archive_read_extract(archive, archive_entry,
 				    EXTRACT_ARCHIVE_FLAGS);
@@ -593,6 +592,7 @@
 					if (Verbose)
 						printf("X - %s\n",
 						    entry_pathname);
+					fd = fopen(entry_pathname, "r");
 				} else {
 					error = archive_error_string(archive);
 					warnx("%s: extraction for %s failed: "
@@ -609,8 +609,8 @@
 	if (errno != 0)
 		error = strerror(errno);
 	if (error != NULL)
-		warnx("%s: unpacking package - %s - failed: %s",
-		    __func__, pkg_name_humanized, error);
+		warnx("%s: unable to read the file - %s - from package: %s: "
+		    "%s", __func__, file, pkg_name_humanized, error);
 
 	if (archive != NULL)
 		archive_read_finish(archive);
@@ -618,7 +618,7 @@
 	if (0 <= archive_fd)
 		close(archive_fd);
 
-	return (error == NULL ? 0 : 1);
+	return fd;
 
 }
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#6 (text+ko) ====

@@ -188,8 +188,8 @@
 void		move_file(const char *, const char *, const char *);
 void		copy_hierarchy(const char *, const char *, Boolean);
 int		delete_hierarchy(const char *, Boolean, Boolean);
-int		unpack(const char *, const char *);
 char*		unpack_to_buffer(const char *, const char *);
+int		unpack_to_disk(const char *, const char *);
 FILE*		unpack_to_fd(const char *, const char *);
 void		format_cmd(char *, int, const char *, const char *, const char *);
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#9 (text+ko) ====

@@ -139,7 +139,7 @@
 	    if (!getenv("_TOP"))
 		setenv("_TOP", where_to, 1);
 	    if (extract_whole_archive_from_stdin == TRUE) {
-		if (unpack(NULL, NULL) == 0)
+		if (unpack_to_disk(NULL, NULL) == 0)
 		    cfile = fopen(CONTENTS_FNAME, "r");
 		else {
 		    warnx("unable to extract table of contents file from '%s' "
@@ -204,7 +204,7 @@
 
 	    /* Finally unpack the whole mess.  If extract is null we
 	       already + did so so don't bother doing it again. */
-	    if (extract && unpack(pkg, NULL)) {
+	    if (extract && unpack_to_disk(pkg, NULL)) {
 		warnx("unable to extract '%s'!", pkg);
 		goto bomb;
 	    }

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#4 (text+ko) ====

@@ -137,7 +137,7 @@
 	        goto bail;
 	    }
 	    make_playpen(PlayPen, sb.st_size / 2);
-	    if (unpack(fname, "+*")) {
+	    if (unpack_to_disk(fname, "+*")) {
 		warnx("error during unpacking, no info for '%s' available", pkg);
 		code = 1;
 		goto bail;

From owner-p4-projects@FreeBSD.ORG  Sat May 15 05:19:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A09AE1065670; Sat, 15 May 2010 05:19: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 657091065673
	for ; Sat, 15 May 2010 05:19:23 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 537428FC08
	for ; Sat, 15 May 2010 05:19:23 +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 o4F5JNiX037602
	for ; Sat, 15 May 2010 05:19:23 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F5JNI5037600
	for perforce@freebsd.org; Sat, 15 May 2010 05:19:23 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 05:19:23 GMT
Message-Id: <201005150519.o4F5JNI5037600@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 178289 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: Sat, 15 May 2010 05:19:23 -0000

http://p4web.freebsd.org/@@178289?ac=10

Change 178289 by gcooper@starr-bastion on 2010/05/15 05:18:33

	Fix a bug when -X isn't specified.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#25 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#25 (text+ko) ====

@@ -580,7 +580,7 @@
 					error = strerror(ENAMETOOLONG);
 
 			/* Exclude the file according to the */
-			if (match_patterns != NULL &&
+			if (match_patterns == NULL ||
 			    lafe_excluded(match_patterns, destfile) == 0)
 	 			ADD_FILE(srcfile, destfile,
 				    archive_entry_open_flags);

From owner-p4-projects@FreeBSD.ORG  Sat May 15 05:36:41 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 993891065675; Sat, 15 May 2010 05:36: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 456AF106564A
	for ; Sat, 15 May 2010 05:36:41 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A0ED8FC1C
	for ; Sat, 15 May 2010 05:36:41 +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 o4F5aeD6039000
	for ; Sat, 15 May 2010 05:36:41 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F5aeCv038998
	for perforce@freebsd.org; Sat, 15 May 2010 05:36:40 GMT
	(envelope-from lz@FreeBSD.org)
Date: Sat, 15 May 2010 05:36:40 GMT
Message-Id: <201005150536.o4F5aeCv038998@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 178290 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: Sat, 15 May 2010 05:36:41 -0000

http://p4web.freebsd.org/@@178290?ac=10

Change 178290 by lz@gnehzuil-freebsd on 2010/05/15 05:36:20

	       Fix some bugs and Implement allocation in other groups.
	
	        * Now it can allocate a free block in other groups when it can not allocate
	          a block in preference cylinder group.
	
	       [problem]
	        * The performance need to be improved.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#9 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#9 (text+ko) ====

@@ -281,7 +281,6 @@
                         }
                 }
         } else {
-repeat:
                 search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref);
 
                 ret = ext2_find_next_rsv_win(search_rsv, rp, fs, bpref, cg);
@@ -310,8 +309,9 @@
 
                 if (loc == end) {
                         mtx_lock_spin(&fs->e2fs_rsv_lock);
-                        search_rsv = rp;
-                        goto repeat;
+                        ext2_remove_rsv_win(fs, rp);
+                        mtx_unlock_spin(&fs->e2fs_rsv_lock);
+                        return -1;
                 }
         }
 
@@ -340,19 +340,23 @@
         ump = ip->i_ump;
         bbp = (char *)bp->b_data;
         if (rp != NULL && rp->rw_end != EXT2_RWI_NOT_ALLOCATED)
-                start = dtogd(fs, rp->rw_start + rp->rw_alloc_hit) / NBBY;
+                start = dtogd(fs, rp->rw_start + rp->rw_alloc_hit);
         else
                 return 0;
 
-        if (bbp[start] == 0) {
-                bno = start * NBBY;
+        if (isclr(bbp, start)) {
+                bno = start;
                 goto gotit;
         }
+        
+        mtx_lock_spin(&fs->e2fs_rsv_lock);
+        ext2_remove_rsv_win(fs, rp);
+        mtx_unlock_spin(&fs->e2fs_rsv_lock);
 
         return 0;
 
 gotit:
-        bno += rp->rw_alloc_hit++;
+        rp->rw_alloc_hit++;
         setbit(bbp, (daddr_t)bno);
         EXT2_LOCK(ump);
         fs->e2fs->e2fs_fbcount--;
@@ -451,11 +455,27 @@
         /* TODO: Just need to try to allocate a free block from rest groups.
          * Now just use old allocation algorihtm.
          */
-/*
-        for (i = cg + 1; i < fs->e2fs_gcount; i++) {
+        for (i = 0; i < fs->e2fs_gcount; i++) {
+                /* Read block bitmap from buffer */
+                EXT2_UNLOCK(ump);
+                error = bread(ip->i_devvp,
+                    fsbtodb(fs, fs->e2fs_gd[i].ext2bgd_b_bitmap),
+                    (int)fs->e2fs_bsize, NOCRED, &bp);
+                if (error) {
+                        brelse(bp);
+                        goto ioerror;
+                }
+
+                EXT2_IRSV_LOCK(ip);
+                bno = ext2_rsvalloc(fs, ip, i, bp, bpref, size);
+                EXT2_IRSV_UNLOCK(ip);
+                if (bno > 0)
+                        goto allocated;
+
+                brelse(bp);
+                EXT2_LOCK(ump);
         }
-*/
-        i = 1;
+
         bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize, ext2_alloccg);
 
 allocated:

From owner-p4-projects@FreeBSD.ORG  Sat May 15 08:13:19 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C6BE1065670; Sat, 15 May 2010 08:13:19 +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 ECB1A106566B
	for ; Sat, 15 May 2010 08:13:18 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8CDE8FC17
	for ; Sat, 15 May 2010 08:13: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 o4F8DIx5053366
	for ; Sat, 15 May 2010 08:13:18 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4F8DIpY053364
	for perforce@freebsd.org; Sat, 15 May 2010 08:13:18 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Sat, 15 May 2010 08:13:18 GMT
Message-Id: <201005150813.o4F8DIpY053364@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 178293 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: Sat, 15 May 2010 08:13:19 -0000

http://p4web.freebsd.org/@@178293?ac=10

Change 178293 by gcooper@starr-bastion on 2010/05/15 08:13:07

	GOOD BYE AND GOOD RIDDANCE BUFFERED read_plist!
	
	This is one big(ish) step towards a sane solution.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#13 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#7 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#2 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#10 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#26 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#4 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#5 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#9 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#13 (text+ko) ====

@@ -356,13 +356,13 @@
 unpack_to_buffer(const char *pkg, const char *file)
 {
 
-	FILE *fd = NULL;
+	struct stat sb;
 	char *buf = NULL; 
-	struct stat sb;
+	int fd;
 
-	if ((fd = unpack_to_fd(pkg, file)) != NULL) {
+	if ((fd = unpack_to_fd(pkg, file)) != -1) {
 
-		if (fstat(fileno(fd), &sb) == 0) {
+		if (fstat(fd, &sb) == 0) {
 
 			/*
 			 * User either passed in a non-NULL value or we need
@@ -371,15 +371,16 @@
 			 */
 			buf = malloc(sb.st_size);
 			if (buf != NULL) {
-				if (fread(buf, sb.st_size, 1, fd) !=
-				    sb.st_size) {
+				if (read(fd, buf, sb.st_size) != sb.st_size)
 					free(buf);
-				}	
 			}
 
 		}
 	}
 
+	if (fd != -1)
+		close(fd);
+
 	return buf;
 
 }
@@ -504,21 +505,9 @@
  * as to reduce the number of required steps needed when unpacking a tarball on
  * disk, as the previous method employed with tar(1) used -q // --fast-read .
  *
- * Return NULL on failure, and non-NULL on success
- *
- * XXX (gcooper): this is currently implemented with FILE* / fopen(3) due to
- * legacy issues that need to be sorted out over the next couple of weeks for
- * 1) locking to function properly, and to gain the potential performance boost
- * by using mmap(2), and read(2) (ugh).
- *
- * But first things first, we need a working solution with minimal changes;
- * then we move on from there.
- *
- * [The return code info will eventually be...]
- *
  * Return -1 on failure, a value greater than 0 on success.
  */
-FILE*
+int
 unpack_to_fd(const char *pkg, const char *file)
 {
 	struct archive *archive;
@@ -529,7 +518,7 @@
 	const char *error = NULL;
 	const char *pkg_name_humanized;
 
-	FILE *fd = NULL;
+	int fd = -1;
 	/* int fd = -1; */
 	int archive_fd = -1, r;
 
@@ -592,7 +581,7 @@
 					if (Verbose)
 						printf("X - %s\n",
 						    entry_pathname);
-					fd = fopen(entry_pathname, "r");
+					fd = open(entry_pathname, O_RDONLY);
 				} else {
 					error = archive_error_string(archive);
 					warnx("%s: extraction for %s failed: "

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#7 (text+ko) ====

@@ -190,7 +190,7 @@
 int		delete_hierarchy(const char *, Boolean, Boolean);
 char*		unpack_to_buffer(const char *, const char *);
 int		unpack_to_disk(const char *, const char *);
-FILE*		unpack_to_fd(const char *, const char *);
+int		unpack_to_fd(const char *, const char *);
 void		format_cmd(char *, int, const char *, const char *, const char *);
 
 /* Msg */
@@ -212,7 +212,7 @@
 void		add_plist_top(Package *, plist_t, const char *);
 void		delete_plist(Package *pkg, Boolean all, plist_t type, const char *name);
 void		write_plist(Package *, FILE *);
-void		read_plist(Package *, FILE *);
+void		read_plist(Package *, int);
 int		plist_cmd(const char *, char **);
 int		delete_package(Boolean, Boolean, Package *);
 Boolean 	make_preserve_name(char *, int, const char *, const char *);

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#2 (text+ko) ====

@@ -21,10 +21,14 @@
 #include 
 __FBSDID("$FreeBSD: src/lib/libpkg/plist.c,v 1.1 2010/04/23 11:07:43 flz Exp $");
 
-#include "pkg.h"
+#include 
+#include 
+#include 
 #include 
 #include 
 
+#include "pkg.h"
+
 /* Add an item to a packing list */
 void
 add_plist(Package *p, plist_t type, const char *arg)
@@ -257,7 +261,7 @@
 
 /* Read a packing list from a file */
 void
-read_plist(Package *pkg, FILE *fp)
+read_plist(Package *pkg, int fd)
 {
     char *cp, pline[FILENAME_MAX];
     int cmd, major, minor;
@@ -265,7 +269,9 @@
     pkg->fmtver_maj = 1;
     pkg->fmtver_mnr = 0;
     pkg->origin = NULL;
-    while (fgets(pline, FILENAME_MAX, fp)) {
+
+    /* XXX (gcooper): BAD BAD BAD -- this can be longer than FILENAME_MAX */
+    while (0 < read(fd, pline, FILENAME_MAX)) {
 	int len = strlen(pline);
 
 	while (len && isspace(pline[len - 1]))

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/perform.c#10 (text+ko) ====

@@ -71,7 +71,7 @@
     char **matched;
     char *extract;
     const char *where_to;
-    FILE *cfile;
+    int cfile;
     int code;
     int inPlace, conflictsfound, errcode;
     /* support for separate pre/post install scripts */
@@ -95,7 +95,7 @@
 	    warnx("pkg_add in SLAVE mode can't chdir to %s", playpen);
 	    return 1;
 	}
-	read_plist(&Plist, stdin);
+	read_plist(&Plist, fileno(stdin));
 	where_to = playpen;
     }
     /* Nope - do it now */
@@ -106,15 +106,15 @@
 		warnx("unable to fetch '%s' by URL", pkg);
 		return 1;
 	    }
-	    cfile = fopen(CONTENTS_FNAME, "r");
-	    if (!cfile) {
+	    cfile = open(CONTENTS_FNAME, O_RDONLY);
+	    if (cfile == -1) {
 		warnx(
 		"unable to open table of contents file '%s' - not a package?",
 		CONTENTS_FNAME);
 		goto bomb;
 	    }
 	    read_plist(&Plist, cfile);
-	    fclose(cfile);
+	    close(cfile);
 	}
 	else {
 
@@ -140,7 +140,7 @@
 		setenv("_TOP", where_to, 1);
 	    if (extract_whole_archive_from_stdin == TRUE) {
 		if (unpack_to_disk(NULL, NULL) == 0)
-		    cfile = fopen(CONTENTS_FNAME, "r");
+		    cfile = open(CONTENTS_FNAME, O_RDONLY);
 		else {
 		    warnx("unable to extract table of contents file from '%s' "
 			"- not a package?", pkg);
@@ -149,14 +149,14 @@
 	    } else
 		cfile = unpack_to_fd(pkg, CONTENTS_FNAME);
 
-	    if (!cfile) {
+	    if (cfile == -1) {
 		warnx(
 	"unable to open table of contents file '%s' - not a package?",
 		CONTENTS_FNAME);
 		goto bomb;
 	    }
 	    read_plist(&Plist, cfile);
-	    fclose(cfile);
+	    close(cfile);
 
 	    /* Extract directly rather than moving?  Oh goodie! */
 	    if (find_plist_option(&Plist, "extract-in-place")) {

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#26 (text+ko) ====

@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -55,12 +56,13 @@
 int
 pkg_perform(char **pkgs)
 {
+    Package plist;
+    FILE *fp;
     static const char *home;
     char *pkg = *pkgs;		/* Only one arg to create */
     char *cp;
-    FILE *pkg_in, *fp;
-    Package plist;
     int len;
+    int pkg_in;
     const char *suf;
 
     /* Preliminary setup */
@@ -135,10 +137,10 @@
     get_dash_string(&Comment);
     get_dash_string(&Desc);
     if (!strcmp(Contents, "-"))
-	pkg_in = stdin;
+	pkg_in = fileno(stdin);
     else {
-	pkg_in = fopen(Contents, "r");
-	if (!pkg_in) {
+	pkg_in = open(Contents, O_RDONLY);
+	if (pkg_in == -1) {
 	    cleanup(0);
 	    errx(2, "%s: unable to open contents file '%s' for input",
 		__func__, Contents);
@@ -770,10 +772,10 @@
 static int
 create_from_installed_recursive(const char *pkg, const char *suf)
 {
-	FILE *fp;
 	Package plist;
 	PackingList p;
 	char tmp[PATH_MAX];
+	int fd;
 	int rval;
 
 	if (!create_from_installed(InstalledPkg, pkg, suf))
@@ -786,13 +788,13 @@
 	}
 	/* Suck in the contents list */
 	plist.head = plist.tail = NULL;
-	fp = fopen(tmp, "r");
-	if (fp == NULL) {
-		warnx("unable to open %s file", tmp);
+	fd = open(tmp, O_RDONLY);
+	if (fd == -1) {
+		warn("unable to open %s file", tmp);
 		return FALSE;
 	}
-	read_plist(&plist, fp);
-	fclose(fp);
+	read_plist(&plist, fd);
+	close(fd);
 	rval = TRUE;
 	for (p = plist.head; p != NULL && rval == TRUE; p = p->next) {
 		if (p->type == PLIST_PKGDEP) {
@@ -809,7 +811,7 @@
 static int
 create_from_installed(const char *ipkg, const char *pkg, const char *suf)
 {
-    FILE *fp;
+    int fd;
     Package plist;
     char homedir[MAXPATHLEN], log_dir[FILENAME_MAX];
 
@@ -825,13 +827,13 @@
     }
     /* Suck in the contents list */
     plist.head = plist.tail = NULL;
-    fp = fopen(CONTENTS_FNAME, "r");
-    if (!fp) {
+    fd = open(CONTENTS_FNAME, O_RDONLY);
+    if (fd == -1) {
 	warnx("unable to open %s file", CONTENTS_FNAME);
 	return FALSE;
     }
-    read_plist(&plist, fp);
-    fclose(fp);
+    read_plist(&plist, fd);
+    (void) close(fd);
 
     Install = isfile(INSTALL_FNAME) ? (char *)INSTALL_FNAME : NULL;
     PostInstall = isfile(POST_INSTALL_FNAME) ?

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#4 (text+ko) ====

@@ -121,9 +121,9 @@
 static int
 pkg_do(char *pkg)
 {
-    FILE *cfile;
     char *deporigin, **deporigins = NULL, **depnames = NULL, ***depmatches, home[FILENAME_MAX];
     PackingList p;
+    int cfile;
     int i, len;
     int isinstalled;
     /* support for separate pre/post install scripts */
@@ -202,9 +202,9 @@
     }
 
     sanity_check(LogDir);
-    cfile = fopen(CONTENTS_FNAME, "r");
+    cfile = open(CONTENTS_FNAME, O_RDONLY);
 
-    if (!cfile) {
+    if (cfile == -1) {
 	warnx("unable to open '%s' file", CONTENTS_FNAME);
 	return 1;
     }
@@ -213,7 +213,7 @@
     if (Prefix)
 	add_plist(&Plist, PLIST_CWD, Prefix);
     read_plist(&Plist, cfile);
-    fclose(cfile);
+    (void) close(cfile);
     p = find_plist(&Plist, PLIST_CWD);
 
     if (!p) {

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#5 (text+ko) ====

@@ -21,10 +21,13 @@
 #include 
 __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.57 2010/04/23 11:07:43 flz Exp $");
 
+#include 
+#include 
+#include 
+
 #include 
+
 #include "info.h"
-#include 
-#include 
 
 static int pkg_do(char *);
 static int find_pkg(struct which_head *);
@@ -92,10 +95,10 @@
     char log_dir[FILENAME_MAX];
     char fname[FILENAME_MAX];
     Package plist;
-    FILE *fp;
     struct stat sb;
     const char *cp = NULL;
     int code = 0;
+    int fd = -1;
 
     if (isURL(pkg)) {
 	if ((cp = fileGetURL(NULL, pkg, KeepPackage)) != NULL) {
@@ -164,15 +167,15 @@
 
     /* Suck in the contents list */
     plist.head = plist.tail = NULL;
-    fp = fopen(CONTENTS_FNAME, "r");
-    if (!fp) {
+    fd = open(CONTENTS_FNAME, O_RDONLY);
+    if (fd == -1) {
 	warnx("unable to open %s file", CONTENTS_FNAME);
 	code = 1;
 	goto bail;
     }
     /* If we have a prefix, add it now */
-    read_plist(&plist, fp);
-    fclose(fp);
+    read_plist(&plist, fd);
+    close(fd);
 
     /*
      * Index is special info type that has to override all others to make
@@ -368,7 +371,7 @@
         return errcode;
  
     for (i = 0; installed[i] != NULL; i++) {
-     	FILE *fp;
+     	int fd;
      	Package pkg;
      	PackingList itr;
      	char *cwd = NULL;
@@ -376,15 +379,15 @@
 
 	snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, installed[i],
 		 CONTENTS_FNAME);
-	fp = fopen(tmp, "r");
-	if (fp == NULL) {
+	fd = open(tmp, O_RDONLY);
+	if (fd == -1) {
 	    warn("%s", tmp);
 	    return 1;
 	}
 
 	pkg.head = pkg.tail = NULL;
-	read_plist(&pkg, fp);
-	fclose(fp);
+	read_plist(&pkg, fd);
+	close(fd);
 	for (itr = pkg.head; itr != pkg.tail; itr = itr->next) {
 	    if (itr->type == PLIST_CWD) {
 		cwd = itr->name;

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#9 (text+ko) ====

@@ -145,23 +145,23 @@
 static int
 pkg_do(char *pkg)
 {
-    char *ch, tmp[PATH_MAX], tmp2[PATH_MAX], *latest = NULL;
     Package plist;
     struct index_entry *ie;
-    FILE *fp;
+    char *ch, tmp[PATH_MAX], tmp2[PATH_MAX], *latest = NULL;
+    int fd;
     size_t len;
 
     /* Suck in the contents list. */
     plist.head = plist.tail = NULL;
     plist.name = plist.origin = NULL;
     snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, pkg, CONTENTS_FNAME);
-    fp = fopen(tmp, "r");
-    if (!fp) {
+    fd = open(tmp, O_RDONLY);
+    if (fd == -1) {
 	warnx("the package info for package '%s' is corrupt", pkg);
 	return 1;
     }
-    read_plist(&plist, fp);
-    fclose(fp);
+    read_plist(&plist, fd);
+    close(fd);
     if (plist.name == NULL) {
     	warnx("%s does not appear to be a valid package!", pkg);
     	return 1;

From owner-p4-projects@FreeBSD.ORG  Sat May 15 14:49:59 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 45A901065673; Sat, 15 May 2010 14:49:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2A1B1065670
	for ; Sat, 15 May 2010 14:49:58 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DEB918FC08
	for ; Sat, 15 May 2010 14:49:58 +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 o4FEnwA0009088
	for ; Sat, 15 May 2010 14:49:58 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4FEnwTA009082
	for perforce@freebsd.org; Sat, 15 May 2010 14:49:58 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 15 May 2010 14:49:58 GMT
Message-Id: <201005151449.o4FEnwTA009082@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 178298 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: Sat, 15 May 2010 14:49:59 -0000

http://p4web.freebsd.org/@@178298?ac=10

Change 178298 by pgj@csupor on 2010/05/15 14:49:34

	IFC @178295		

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/UPDATING#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.1#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/sh.1#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/ipfilter/man/ipmon.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/northamerica#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/zone.tab#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/AUTHORS#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/COPYING#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/ChangeLog#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/FREEBSD-Xlist#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/FREEBSD-upgrade#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/README#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/THANKS#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/TODO#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/po/LINGUAS#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/po/Makevars#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/po/POTFILES.in#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/po/cs.po#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/mythread.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/sysdefs.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_config.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_cpucores.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_cpucores.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_exit.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_exit.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_gettext.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_integer.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_open_stdxxx.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_open_stdxxx.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_physmem.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_physmem.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_progname.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/common/tuklib_progname.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/base.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/bcj.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/block.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/check.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/container.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/delta.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/filter.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/hardware.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/index.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/index_hash.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/lzma.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/stream_flags.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/subblock.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/version.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/api/lzma/vli.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/check.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/check.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_fast.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_small.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_table.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_table_be.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_table_le.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_tablegen.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc32_x86.S#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_fast.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_small.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_table.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_table_be.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_table_le.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_tablegen.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc64_x86.S#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/crc_macros.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/check/sha256.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/alone_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/alone_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/alone_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/auto_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_buffer_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_buffer_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_header_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_header_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/block_util.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/chunk_size.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/common.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_buffer_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_decoder_memusage.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_encoder_memusage.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_preset.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/easy_preset.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_buffer_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_buffer_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_common.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_flags_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/filter_flags_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/hardware_physmem.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/index_hash.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_buffer_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_buffer_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_flags_common.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_flags_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_flags_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/stream_flags_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/vli_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/vli_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/common/vli_size.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_common.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/delta/delta_private.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_encoder_hash.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lz/lz_encoder_mf.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/fastpos.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/fastpos_table.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/fastpos_tablegen.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma2_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma2_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/price.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/price_table.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/price_tablegen.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/range_common.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/range_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/rangecoder/range_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/arm.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/armthumb.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/ia64.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/powerpc.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_coder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_coder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/simple_private.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/sparc.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/simple/x86.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_decoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_decoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_decoder_helper.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_encoder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/liblzma/subblock/subblock_encoder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/lzmainfo/lzmainfo.1#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/lzmainfo/lzmainfo.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/args.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/args.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/coder.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/coder.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/file_io.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/file_io.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/hardware.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/hardware.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/list.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/list.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/main.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/main.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/message.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/message.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/options.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/options.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/private.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/signals.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/signals.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/suffix.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/suffix.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/util.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/util.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xz/xz.1#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xzdec/xzdec.1#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/contrib/xz/src/xzdec/xzdec.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/devd.conf#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/mtree/BSD.include.dist#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/network.subr#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/periodic/daily/310.accounting#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/periodic/daily/440.status-mailq#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/periodic/weekly/330.catman#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/bluetooth#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/bridge#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/cleanvar#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/defaultroute#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/geli#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/geli2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/ipfw#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mdconfig#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/mdconfig2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/nscd#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/rfcomm_pppd_server#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/stf#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/syscons#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/ubthidhci#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.firewall#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.initdiskless#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/regdomain.xml#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/services#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/lib/libgcc/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/lib/libstdc++/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/lib/libsupc++/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/cc/Makefile.inc#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/cc/include/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/Makefile#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libarchive/cpio.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fmtcheck.3#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/glob.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isblank.3#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_branding.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/acl_perm.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/fgets.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/fopen.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/printf.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/tmpnam.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdio/wprintf.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/realpath.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/strtod.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdtime/strptime.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/string/strcat.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/string/strcpy.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/access.2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/execve.2#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/ioctl.2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/setuid.2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf.3#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/liblzma/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/liblzma/Symbol.map#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/liblzma/Versions.def#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/liblzma/config.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.mips.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.xscale.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10_desc.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb10_io.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusb/libusb20_compat01.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusbhid/data.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libusbhid/usbhid.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/msun/man/fenv.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/msun/man/hypot.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/rescue/rescue/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsirand/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsirand/fsirand.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsirand/fsirand.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastctl/hastctl.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hast.conf.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hastd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifconfig.8#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mksnap_ffs/mksnap_ffs.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount/mount.8#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_ntfs/mount_ntfs.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mount_std/mount_std.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/rcorder/rcorder.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/restore/symtab.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man1/builtin.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/fpgetround.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/pthread_cond_timedwait.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/pthread_condattr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ae.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ahb.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/amdtemp.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ataraid.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/cmx.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/cpuctl.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ed.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ef.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/em.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/en.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/fpa.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/fxp.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom_fox.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/harp.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/hatm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/hifn.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/igb.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/inet.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iscsi_initiator.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/kbdmux.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ksyms.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/cs.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/ie.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/mse.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/pnp.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/pnpbios.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/vx.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.i386/wl.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.powerpc/snd_ai2s.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.powerpc/snd_davbus.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/clkbrd.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/creator.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/machfb.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/ofw_console.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/openfirm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/man4.sparc64/openprom.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mfi.4#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mpt.4#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/natm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/nve.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/patm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/psm.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/run.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/sge.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/splash.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/syscons.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/twa.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ucom.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/uhso.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/vkbd.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/wpi.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/boot.config.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/fdescfs.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/linsysfs.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/make.conf.5#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/reiserfs.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/xfs.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/fail.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/mbpool.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/namei.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/uio.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/mdoc.template#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.libnames.mk#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/trap.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/identcpu.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/include/disassem.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/include/md_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/boot/common/module.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/boot/forth/loader.conf.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_sg.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/boot/zfs/zfsimpl.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/options#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/run/rt2870.fw.uu#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ddb/db_output.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ddb/ddb.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_igb.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_lem.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fxp/if_fxpreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fxp/if_fxpvar.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipw.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sge.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sgereg.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ums.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/uhso.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/u3g.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uftdi.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_dev.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_generic.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hid.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_request.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbhid.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_run.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_runreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_runvar.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/procfs/procfs_ctl.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/multipath/g_multipath.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_events.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/zero/g_zero.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_mutex.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_pcpu.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_witness.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_default.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/adm5120/if_admsw.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/elf_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/zfs/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/vnet.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_proto.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/udp6_usrreq.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/pci/schizoreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/pci/schizovar.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/eventhandler.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/lock.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/param.h#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/swap_pager.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_contig.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#9 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/case2.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/case3.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/builtins/var-assign2.0#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/errors/assignment-error1.0#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/expansion/pathname1.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/expansion/pathname2.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parser/case1.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parser/case2.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parser/heredoc3.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libc/gen/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libc/gen/test-fnmatch.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/tools/tools/vimage/vimage.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/Makefile#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/ar/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bsdiff/bsdiff.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bspatch/bspatch.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/calendar/calendars/calendar.history#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/chpass/chpass.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/cpio/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/cpio/test/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/killall/killall.1#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/less/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/less/lesspipe.sh#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/lzmainfo/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/make/make.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/setchannel/setchannel.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/tar/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/tar/bsdtar.1#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/tar/test/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/wtmpcvt/wtmpcvt.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/xz/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/xzdec/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/adduser/adduser.conf.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmd.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/apmdlex.l#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/apmd/contrib/pccardq.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bluetooth/bthidd/hid.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bluetooth/btpand/btpand.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/cpucontrol/cpucontrol.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/cron/crontab/crontab.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/extattr/rmextattr.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mergemaster/mergemaster.sh#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mount_portalfs/mount_portalfs.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mptutil/mptutil.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mtree/mtree.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/mtree/mtree.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/newsyslog/newsyslog.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/rtadvd/rtadvd.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/rtprio/rtprio.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/rtsold/rtsold.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/sa/sa.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/uathload/uathload.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.645 2010/04/23 11:07:43 flz Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.646 2010/05/10 15:28:44 mm Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1113,7 +1113,7 @@
 		lib/libbz2 lib/libcom_err lib/libcrypt \
 		lib/libexpat lib/libfetch \
 		${_lib_libgssapi} ${_lib_libipx} \
-		lib/libkiconv lib/libkvm lib/libmd \
+		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \

==== //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.234 2010/04/17 01:17:31 jmallett Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.236 2010/05/14 20:40:37 delphij Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,29 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100514: library version bump for versioned symbols for liblzma
+OLD_LIBS+=usr/lib/liblzma.so.0
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/liblzma.so.0
+.endif
+# 20100511: move GCC-specific headers to /usr/include/gcc
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/emmintrin.h
+OLD_FILES+=usr/include/mm_malloc.h
+OLD_FILES+=usr/include/pmmintrin.h
+OLD_FILES+=usr/include/xmmintrin.h
+.endif
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
+OLD_FILES+=usr/include/mmintrin.h
+.endif
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/ia64intrin.h
+.endif
+.if ${TARGET_ARCH} == "powerpc"
+OLD_FILES+=usr/include/altivec.h
+OLD_FILES+=usr/include/ppc-asm.h
+OLD_FILES+=usr/include/spe.h
+.endif
 # 20100416: [mips] removed 
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h

==== //depot/projects/soc2009/pgj_libstat/src/UPDATING#8 (text+ko) ====

@@ -83,6 +83,9 @@
 
 	The meanings correspond to the relevant IPv4 variables.
 
+20091125:
+	8.0-RELEASE.
+
 20091113:
 	The default terminal emulation for syscons(4) has been changed
 	from cons25 to xterm on all platforms except pc98.  This means
@@ -1138,4 +1141,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.658 2010/04/30 00:46:43 kmacy Exp $
+$FreeBSD: src/UPDATING,v 1.659 2010/05/12 21:20:04 brueffer Exp $

==== //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.1#4 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.21 2010/03/07 07:59:05 joel Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.22 2010/05/13 16:46:23 trasz Exp $
 .\"
-.Dd September 5, 2009
+.Dd May 13, 2010
 .Dt SETFACL 1
 .Os
 .Sh NAME
@@ -453,8 +453,13 @@
 .Tn TrustedBSD
 Project and introduced in
 .Fx 5.0 .
+NFSv4 ACL support was introduced in
+.Fx 8.1 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 utility was written by
 .An Chris D. Faulhaber Aq jedgar@fxp.org .
+NFSv4 ACL support was implemented by
+.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .

==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.c#5 (text+ko) ====

@@ -1,6 +1,8 @@
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 1997-2005
+ *	Herbert Xu .  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
@@ -36,7 +38,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.63 2010/04/25 20:43:19 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.64 2010/05/11 23:19:28 jilles Exp $");
 
 #include 
 #include 
@@ -1150,10 +1152,11 @@
 	struct dirent *dp;
 	int atend;
 	int matchdot;
+	int esc;
 
 	metaflag = 0;
 	start = name;
-	for (p = name ; ; p++) {
+	for (p = name; esc = 0, *p; p += esc + 1) {
 		if (*p == '*' || *p == '?')
 			metaflag = 1;
 		else if (*p == '[') {
@@ -1178,12 +1181,14 @@
 			break;
 		else if (*p == CTLQUOTEMARK)
 			continue;
-		else if (*p == CTLESC)
-			p++;
-		if (*p == '/') {
-			if (metaflag)
-				break;
-			start = p + 1;
+		else {
+			if (*p == CTLESC)
+				esc++;
+			if (p[esc] == '/') {
+				if (metaflag)
+					break;
+				start = p + esc + 1;
+			}
 		}
 	}
 	if (metaflag == 0) {	/* we've reached the end of the file name */
@@ -1229,7 +1234,8 @@
 		atend = 1;
 	} else {
 		atend = 0;
-		*endname++ = '\0';
+		*endname = '\0';
+		endname += esc + 1;
 	}
 	matchdot = 0;
 	p = start;
@@ -1257,7 +1263,7 @@
 	}
 	closedir(dirp);
 	if (! atend)
-		endname[-1] = '/';
+		endname[-esc - 1] = esc ? CTLESC : '/';
 }
 
 

==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/sh.1#4 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.138 2010/04/05 14:15:51 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.139 2010/05/09 22:03:18 jilles Exp $
 .\"
-.Dd April 5, 2010
+.Dd May 9, 2010
 .Dt SH 1
 .Os
 .Sh NAME
@@ -415,11 +415,11 @@
 .Pq Ql \en .
 A backslash preceding a newline is treated as a line continuation.
 .El
-.Ss Reserved Words
-Reserved words are words that have special meaning to the
+.Ss Keywords
+Keywords or reserved words are words that have special meaning to the
 shell and are recognized at the beginning of a line and
 after a control operator.
-The following are reserved words:
+The following are keywords:
 .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center
 .It Li \&! Ta { Ta } Ta Ic case Ta Ic do
 .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi
@@ -429,8 +429,8 @@
 An alias is a name and corresponding value set using the
 .Ic alias
 built-in command.
-Whenever a reserved word may occur (see above),
-and after checking for reserved words, the shell
+Whenever a keyword may occur (see above),
+and after checking for keywords, the shell
 checks the word to see if it matches an alias.
 If it does, it replaces it in the input stream with its value.
 For example, if there is an alias called
@@ -469,7 +469,7 @@
 document).
 Essentially though, a line is read and if
 the first word of the line (or after a control operator)
-is not a reserved word, then the shell has recognized a
+is not a keyword, then the shell has recognized a
 simple command.
 Otherwise, a complex command or some
 other special construct may have been recognized.
@@ -695,7 +695,7 @@
 .In sys/signal.h .
 .Ss Complex Commands
 Complex commands are combinations of simple commands
-with control operators or reserved words, together creating a larger complex
+with control operators or keywords, together creating a larger complex
 command.
 More generally, a command is one of the following:
 .Bl -item -offset indent
@@ -739,7 +739,7 @@
 If the pipeline is not in the background (discussed later),
 the shell waits for all commands to complete.
 .Pp
-If the reserved word
+If the keyword
 .Ic !\&
 does not precede the pipeline, the
 exit status is the exit status of the last command specified

==== //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 (text+ko) ====

@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 #undef ZFS_MAXNAMELEN
 #undef verify
 #include 
@@ -62,8 +63,6 @@
 extern void dump_intent_log(zilog_t *);
 uint64_t *zopt_object = NULL;
 int zopt_objects = 0;
-int zdb_advance = ADVANCE_PRE;
-zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 0 };
 libzfs_handle_t *g_zfs;
 boolean_t zdb_sig_user_data = B_TRUE;
 int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256;
@@ -88,8 +87,8 @@
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-udibcsvL] [-U cachefile_path] [-O order] "
-	    "[-B os:obj:level:blkid] [-S user:cksumalg] "
+	    "Usage: %s [-udibcsv] [-U cachefile_path] "
+	    "[-S user:cksumalg] "
 	    "dataset [object...]\n"
 	    "       %s -C [pool]\n"
 	    "       %s -l dev\n"
@@ -109,13 +108,8 @@
 	    "dump blkptr signatures\n");
 	(void) fprintf(stderr, "	-v verbose (applies to all others)\n");
 	(void) fprintf(stderr, "        -l dump label contents\n");
-	(void) fprintf(stderr, "	-L live pool (allows some errors)\n");
-	(void) fprintf(stderr, "	-O [!] "
-	    "visitation order\n");
 	(void) fprintf(stderr, "	-U cachefile_path -- use alternate "
 	    "cachefile\n");
-	(void) fprintf(stderr, "	-B objset:object:level:blkid -- "
-	    "simulate bad block\n");
 	(void) fprintf(stderr, "        -R read and display block from a "
 	    "device\n");
 	(void) fprintf(stderr, "        -e Pool is exported/destroyed/"
@@ -138,7 +132,7 @@
 	va_end(ap);
 	(void) fprintf(stderr, "\n");
 
-	exit(1);
+	abort();
 }
 
 static void
@@ -571,7 +565,7 @@
 }
 
 static uint64_t
-blkid2offset(dnode_phys_t *dnp, int level, uint64_t blkid)
+blkid2offset(const dnode_phys_t *dnp, int level, uint64_t blkid)
 {
 	if (level < 0)
 		return (blkid);
@@ -602,115 +596,104 @@
 	    (u_longlong_t)bp->blk_birth);
 }
 
-/* ARGSUSED */
-static int
-zdb_indirect_cb(traverse_blk_cache_t *bc, spa_t *spa, void *a)
+static void
+print_indirect(blkptr_t *bp, const zbookmark_t *zb,
+    const dnode_phys_t *dnp)
 {
-	zbookmark_t *zb = &bc->bc_bookmark;
-	blkptr_t *bp = &bc->bc_blkptr;
-	void *data = bc->bc_data;
-	dnode_phys_t *dnp = bc->bc_dnode;
-	char blkbuf[BP_SPRINTF_LEN + 80];
+	char blkbuf[BP_SPRINTF_LEN];
 	int l;
 
-	if (bc->bc_errno) {
-		(void) sprintf(blkbuf,
-		    "Error %d reading <%llu, %llu, %lld, %llu>: ",
-		    bc->bc_errno,
-		    (u_longlong_t)zb->zb_objset,
-		    (u_longlong_t)zb->zb_object,
-		    (u_longlong_t)zb->zb_level,
-		    (u_longlong_t)zb->zb_blkid);
-		goto out;
-	}
+	ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
+	ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
 
-	if (zb->zb_level == -1) {
-		ASSERT3U(BP_GET_TYPE(bp), ==, DMU_OT_OBJSET);
-		ASSERT3U(BP_GET_LEVEL(bp), ==, 0);
-	} else {
-		ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
-		ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
-	}
+	(void) printf("%16llx ",
+	    (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid));
 
-	if (zb->zb_level > 0) {
-		uint64_t fill = 0;
-		blkptr_t *bpx, *bpend;
+	ASSERT(zb->zb_level >= 0);
 
-		for (bpx = data, bpend = bpx + BP_GET_LSIZE(bp) / sizeof (*bpx);
-		    bpx < bpend; bpx++) {
-			if (bpx->blk_birth != 0) {
-				fill += bpx->blk_fill;
-			} else {
-				ASSERT(bpx->blk_fill == 0);
-			}
+	for (l = dnp->dn_nlevels - 1; l >= -1; l--) {
+		if (l == zb->zb_level) {
+			(void) printf("L%llx", (u_longlong_t)zb->zb_level);
+		} else {
+			(void) printf(" ");
 		}
-		ASSERT3U(fill, ==, bp->blk_fill);
 	}
 
-	if (zb->zb_level == 0 && dnp->dn_type == DMU_OT_DNODE) {
+	sprintf_blkptr_compact(blkbuf, bp, dump_opt['d'] > 5 ? 1 : 0);
+	(void) printf("%s\n", blkbuf);
+}
+
+#define	SET_BOOKMARK(zb, objset, object, level, blkid)  \
+{                                                       \
+	(zb)->zb_objset = objset;                       \
+	(zb)->zb_object = object;                       \
+	(zb)->zb_level = level;                         \
+	(zb)->zb_blkid = blkid;                         \
+}
+
+static int
+visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
+    blkptr_t *bp, const zbookmark_t *zb)
+{
+	int err;
+
+	if (bp->blk_birth == 0)
+		return (0);
+
+	print_indirect(bp, zb, dnp);
+
+	if (BP_GET_LEVEL(bp) > 0) {
+		uint32_t flags = ARC_WAIT;
+		int i;
+		blkptr_t *cbp;
+		int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
+		arc_buf_t *buf;
 		uint64_t fill = 0;
-		dnode_phys_t *dnx, *dnend;
 
-		for (dnx = data, dnend = dnx + (BP_GET_LSIZE(bp)>>DNODE_SHIFT);
-		    dnx < dnend; dnx++) {
-			if (dnx->dn_type != DMU_OT_NONE)
-				fill++;
-		}
-		ASSERT3U(fill, ==, bp->blk_fill);
-	}
+		err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf,
+		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
+		if (err)
+			return (err);
 
-	(void) sprintf(blkbuf, "%16llx ",
-	    (u_longlong_t)blkid2offset(dnp, zb->zb_level, zb->zb_blkid));
+		/* recursively visit blocks below this */
+		cbp = buf->b_data;
+		for (i = 0; i < epb; i++, cbp++) {
+			zbookmark_t czb;
 
-	ASSERT(zb->zb_level >= 0);
-
-	for (l = dnp->dn_nlevels - 1; l >= -1; l--) {
-		if (l == zb->zb_level) {
-			(void) sprintf(blkbuf + strlen(blkbuf), "L%llx",
-			    (u_longlong_t)zb->zb_level);
-		} else {
-			(void) sprintf(blkbuf + strlen(blkbuf), " ");
+			SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
+			    zb->zb_level - 1,
+			    zb->zb_blkid * epb + i);
+			err = visit_indirect(spa, dnp, cbp, &czb);
+			if (err)
+				break;
+			fill += cbp->blk_fill;
 		}
+		ASSERT3U(fill, ==, bp->blk_fill);
+		(void) arc_buf_remove_ref(buf, &buf);
 	}
 
-out:
-	if (bp->blk_birth == 0) {
-		(void) sprintf(blkbuf + strlen(blkbuf), "");
-		(void) printf("%s\n", blkbuf);
-	} else {

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

From owner-p4-projects@FreeBSD.ORG  Sat May 15 14:56:05 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A6BD61065675; Sat, 15 May 2010 14:56:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B57E1065670
	for ; Sat, 15 May 2010 14:56:05 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 599988FC15
	for ; Sat, 15 May 2010 14:56:05 +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 o4FEu57i009560
	for ; Sat, 15 May 2010 14:56:05 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4FEu5US009558
	for perforce@freebsd.org; Sat, 15 May 2010 14:56:05 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 15 May 2010 14:56:05 GMT
Message-Id: <201005151456.o4FEu5US009558@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 178299 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: Sat, 15 May 2010 14:56:05 -0000

http://p4web.freebsd.org/@@178299?ac=10

Change 178299 by pgj@csupor on 2010/05/15 14:55:36

	- Tidy up __BEGIN_DECLS and __END_DECLS
	- Bump copyright year while I am here		

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#67 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#67 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009 Gabor Pali
+ * Copyright (c) 2009, 2010 Gabor Pali
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286,6 +286,7 @@
 struct mroute_type_iterator;
 
 __BEGIN_DECLS
+
 const char		    *netstat_strerror(int);
 const char		    *netstat_kvmerror(const struct session_type *);
 
@@ -358,7 +359,6 @@
 u_int32_t	netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp);
 u_int32_t	netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp);
 u_int32_t	netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp);
-__END_DECLS
 
 /* "Memory buffers" */
 struct mbuf_type    *netstat_mbt_alloc(void);
@@ -1338,4 +1338,7 @@
 u_int32_t   netstat_mrt_get_parent(const struct mroute_type *);
 u_int8_t    netstat_mrt_get_ttl(const struct mroute_type *, int);
 int	    netstat_mrt_get_is_mif_set(const struct mroute_type *, u_int32_t);
+
+__END_DECLS
+
 #endif /* !_NETSTAT_H_ */