From owner-svn-src-vendor@FreeBSD.ORG Fri Dec 14 22:45:04 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D226650D; Fri, 14 Dec 2012 22:45:04 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AB1028FC1A; Fri, 14 Dec 2012 22:45:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEMj4IN066980; Fri, 14 Dec 2012 22:45:04 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEMj3xi066972; Fri, 14 Dec 2012 22:45:03 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201212142245.qBEMj3xi066972@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Dec 2012 22:45:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244230 - vendor/NetBSD/libc-vis/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 22:45:04 -0000 Author: brooks Date: Fri Dec 14 22:45:03 2012 New Revision: 244230 URL: http://svnweb.freebsd.org/changeset/base/244230 Log: Vendor import of NetBSD's (un)vis(3) at 2012-12-14 Modified: vendor/NetBSD/libc-vis/dist/unvis.c vendor/NetBSD/libc-vis/dist/vis.3 vendor/NetBSD/libc-vis/dist/vis.c vendor/NetBSD/libc-vis/dist/vis.h Modified: vendor/NetBSD/libc-vis/dist/unvis.c ============================================================================== --- vendor/NetBSD/libc-vis/dist/unvis.c Fri Dec 14 22:23:36 2012 (r244229) +++ vendor/NetBSD/libc-vis/dist/unvis.c Fri Dec 14 22:45:03 2012 (r244230) @@ -1,4 +1,4 @@ -/* $NetBSD: unvis.c,v 1.39 2012/03/13 21:13:37 christos Exp $ */ +/* $NetBSD: unvis.c,v 1.40 2012/12/14 21:31:01 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: unvis.c,v 1.39 2012/03/13 21:13:37 christos Exp $"); +__RCSID("$NetBSD: unvis.c,v 1.40 2012/12/14 21:31:01 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -81,7 +81,7 @@ __weak_alias(strnunvisx,_strnunvisx) * RFC 1866 */ static const struct nv { - const char *name; + const char name[7]; uint8_t value; } nv[] = { { "AElig", 198 }, /* capital AE diphthong (ligature) */ Modified: vendor/NetBSD/libc-vis/dist/vis.3 ============================================================================== --- vendor/NetBSD/libc-vis/dist/vis.3 Fri Dec 14 22:23:36 2012 (r244229) +++ vendor/NetBSD/libc-vis/dist/vis.3 Fri Dec 14 22:45:03 2012 (r244230) @@ -1,4 +1,4 @@ -.\" $NetBSD: vis.3,v 1.27 2011/05/17 07:10:39 joerg Exp $ +.\" $NetBSD: vis.3,v 1.28 2012/12/14 21:38:18 christos Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd March 12, 2011 +.Dd December 14, 2012 .Dt VIS 3 .Os .Sh NAME @@ -219,6 +219,15 @@ except space, tab, and newline are encod The following flags alter this: .Bl -tag -width VIS_WHITEX ++.It Dv VIS_GLOB +Also encode magic characters +.Ql ( * , +.Ql \&? , +.Ql \&[ +and +.Ql # ) +recognized by +.Xr glob 3 . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -408,6 +417,7 @@ The destination buffer size is not large .Sh SEE ALSO .Xr unvis 1 , .Xr vis 1 , +.Xr glob 3 , .Xr unvis 3 .Rs .%A T. Berners-Lee Modified: vendor/NetBSD/libc-vis/dist/vis.c ============================================================================== --- vendor/NetBSD/libc-vis/dist/vis.c Fri Dec 14 22:23:36 2012 (r244229) +++ vendor/NetBSD/libc-vis/dist/vis.c Fri Dec 14 22:45:03 2012 (r244230) @@ -1,4 +1,4 @@ -/* $NetBSD: vis.c,v 1.44 2011/03/12 19:52:48 christos Exp $ */ +/* $NetBSD: vis.c,v 1.45 2012/12/14 21:38:18 christos Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -57,7 +57,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: vis.c,v 1.44 2011/03/12 19:52:48 christos Exp $"); +__RCSID("$NetBSD: vis.c,v 1.45 2012/12/14 21:38:18 christos Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -89,7 +89,7 @@ static char *do_svis(char *, size_t *, i #define xtoa(c) "0123456789abcdef"[c] #define XTOA(c) "0123456789ABCDEF"[c] -#define MAXEXTRAS 5 +#define MAXEXTRAS 9 #define MAKEEXTRALIST(flag, extra, orig_str) \ do { \ @@ -103,6 +103,12 @@ do { \ for (o = orig, e = extra; (*e++ = *o++) != '\0';) \ continue; \ e--; \ + if (flag & VIS_GLOB) { \ + *e++ = '*'; \ + *e++ = '?'; \ + *e++ = '['; \ + *e++ = '#'; \ + } \ if (flag & VIS_SP) *e++ = ' '; \ if (flag & VIS_TAB) *e++ = '\t'; \ if (flag & VIS_NL) *e++ = '\n'; \ Modified: vendor/NetBSD/libc-vis/dist/vis.h ============================================================================== --- vendor/NetBSD/libc-vis/dist/vis.h Fri Dec 14 22:23:36 2012 (r244229) +++ vendor/NetBSD/libc-vis/dist/vis.h Fri Dec 14 22:45:03 2012 (r244230) @@ -1,4 +1,4 @@ -/* $NetBSD: vis.h,v 1.19 2011/03/12 19:52:45 christos Exp $ */ +/* $NetBSD: vis.h,v 1.20 2012/12/14 21:36:59 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -39,29 +39,30 @@ /* * to select alternate encoding format */ -#define VIS_OCTAL 0x001 /* use octal \ddd format */ -#define VIS_CSTYLE 0x002 /* use \[nrft0..] where appropiate */ +#define VIS_OCTAL 0x0001 /* use octal \ddd format */ +#define VIS_CSTYLE 0x0002 /* use \[nrft0..] where appropiate */ /* * to alter set of characters encoded (default is to encode all * non-graphic except space, tab, and newline). */ -#define VIS_SP 0x004 /* also encode space */ -#define VIS_TAB 0x008 /* also encode tab */ -#define VIS_NL 0x010 /* also encode newline */ +#define VIS_SP 0x0004 /* also encode space */ +#define VIS_TAB 0x0008 /* also encode tab */ +#define VIS_NL 0x0010 /* also encode newline */ #define VIS_WHITE (VIS_SP | VIS_TAB | VIS_NL) -#define VIS_SAFE 0x020 /* only encode "unsafe" characters */ +#define VIS_SAFE 0x0020 /* only encode "unsafe" characters */ /* * other */ -#define VIS_NOSLASH 0x040 /* inhibit printing '\' */ -#define VIS_HTTP1808 0x080 /* http-style escape % hex hex */ -#define VIS_HTTPSTYLE 0x080 /* http-style escape % hex hex */ -#define VIS_MIMESTYLE 0x100 /* mime-style escape = HEX HEX */ -#define VIS_HTTP1866 0x200 /* http-style &#num; or &string; */ -#define VIS_NOESCAPE 0x400 /* don't decode `\' */ -#define _VIS_END 0x800 /* for unvis */ +#define VIS_NOSLASH 0x0040 /* inhibit printing '\' */ +#define VIS_HTTP1808 0x0080 /* http-style escape % hex hex */ +#define VIS_HTTPSTYLE 0x0080 /* http-style escape % hex hex */ +#define VIS_MIMESTYLE 0x0100 /* mime-style escape = HEX HEX */ +#define VIS_HTTP1866 0x0200 /* http-style &#num; or &string; */ +#define VIS_NOESCAPE 0x0400 /* don't decode `\' */ +#define _VIS_END 0x0800 /* for unvis */ +#define VIS_GLOB 0x1000 /* encode glob(3) magic characters */ /* * unvis return codes From owner-svn-src-vendor@FreeBSD.ORG Fri Dec 14 22:47:10 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 556F472C; Fri, 14 Dec 2012 22:47:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1FC928FC18; Fri, 14 Dec 2012 22:47:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEMl9Ds067466; Fri, 14 Dec 2012 22:47:10 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEMl9vl067465; Fri, 14 Dec 2012 22:47:09 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201212142247.qBEMl9vl067465@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Dec 2012 22:47:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244231 - vendor/NetBSD/libc-vis/20121412 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 22:47:10 -0000 Author: brooks Date: Fri Dec 14 22:47:09 2012 New Revision: 244231 URL: http://svnweb.freebsd.org/changeset/base/244231 Log: Tag 2012-12-14 import of NetBSD's (un)vis(3) Added: vendor/NetBSD/libc-vis/20121412/ - copied from r244230, vendor/NetBSD/libc-vis/dist/ From owner-svn-src-vendor@FreeBSD.ORG Fri Dec 14 23:04:57 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 528E2EBD; Fri, 14 Dec 2012 23:04:57 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37AC68FC19; Fri, 14 Dec 2012 23:04:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEN4vFt072228; Fri, 14 Dec 2012 23:04:57 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEN4vPE072227; Fri, 14 Dec 2012 23:04:57 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201212142304.qBEN4vPE072227@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Dec 2012 23:04:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244232 - vendor/NetBSD/libc-vis/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 23:04:57 -0000 Author: brooks Date: Fri Dec 14 23:04:56 2012 New Revision: 244232 URL: http://svnweb.freebsd.org/changeset/base/244232 Log: Vendor import of NetBSD's (un)vis(3) at 2012-12-14 (2nd one) Modified: vendor/NetBSD/libc-vis/dist/vis.3 Modified: vendor/NetBSD/libc-vis/dist/vis.3 ============================================================================== --- vendor/NetBSD/libc-vis/dist/vis.3 Fri Dec 14 22:47:09 2012 (r244231) +++ vendor/NetBSD/libc-vis/dist/vis.3 Fri Dec 14 23:04:56 2012 (r244232) @@ -1,4 +1,4 @@ -.\" $NetBSD: vis.3,v 1.28 2012/12/14 21:38:18 christos Exp $ +.\" $NetBSD: vis.3,v 1.29 2012/12/14 22:55:59 christos Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -219,7 +219,7 @@ except space, tab, and newline are encod The following flags alter this: .Bl -tag -width VIS_WHITEX -+.It Dv VIS_GLOB +.It Dv VIS_GLOB Also encode magic characters .Ql ( * , .Ql \&? , From owner-svn-src-vendor@FreeBSD.ORG Fri Dec 14 23:06:31 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3CCED0; Fri, 14 Dec 2012 23:06:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9EBEB8FC19; Fri, 14 Dec 2012 23:06:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEN6VmS072648; Fri, 14 Dec 2012 23:06:31 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEN6V73072647; Fri, 14 Dec 2012 23:06:31 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201212142306.qBEN6V73072647@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Dec 2012 23:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244233 - vendor/NetBSD/libc-vis/20121412a X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 23:06:31 -0000 Author: brooks Date: Fri Dec 14 23:06:31 2012 New Revision: 244233 URL: http://svnweb.freebsd.org/changeset/base/244233 Log: Tag 2nd 2012-12-14 import of NetBSD's (un)vis(3) Added: vendor/NetBSD/libc-vis/20121412a/ - copied from r244232, vendor/NetBSD/libc-vis/dist/ From owner-svn-src-vendor@FreeBSD.ORG Fri Dec 14 23:07:26 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49969274; Fri, 14 Dec 2012 23:07:26 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2D10E8FC16; Fri, 14 Dec 2012 23:07:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEN7QIB072901; Fri, 14 Dec 2012 23:07:26 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEN7Q1s072899; Fri, 14 Dec 2012 23:07:26 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201212142307.qBEN7Q1s072899@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Dec 2012 23:07:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244234 - vendor/NetBSD/libc-vis X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 23:07:26 -0000 Author: brooks Date: Fri Dec 14 23:07:25 2012 New Revision: 244234 URL: http://svnweb.freebsd.org/changeset/base/244234 Log: Add a guide to upgrading (un)vis(3) imports. Added: vendor/NetBSD/libc-vis/FreeBSD-Upgrade Added: vendor/NetBSD/libc-vis/FreeBSD-Upgrade ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/NetBSD/libc-vis/FreeBSD-Upgrade Fri Dec 14 23:07:25 2012 (r244234) @@ -0,0 +1,27 @@ +Instructions for updating unvis(3) and vis(3). + +1) checkout the head of the vendor branch: + + REPO=svn+ssh://svn.freebsd.org/ + svn co $REPO/base/vendor/NetBSD/libc-vis/dist + +2) Update (un)vis.[3ch]: + + rm dist/unvis.* dist/vis.* + export CVSROOT=anoncvs@anoncvs.NetBSD.org:/cvsroot + cvs export -r HEAD -d dist src/lib/libc/gen/unvis.3 + cvs export -r HEAD -d dist src/lib/libc/gen/unvis.c + cvs export -r HEAD -d dist src/lib/libc/gen/vis.3 + cvs export -r HEAD -d dist src/lib/libc/gen/vis.c + cvs export -r HEAD -d dist src/include/vis.h + +3) Commit the new versions: + + svn commit -m "Vendor import of NetBSD's (un)vis(3) at `date +%F`" dist + svn cp -m "Tag `date +%F` import of NetBSD's (un)vis(3)" \ + $REPO/base/vendor/NetBSD/libc-vis/dist \ + $REPO/base/vendor/NetBSD/libc-vis/`date +%Y%d%m` + +4) Update the files in src/contrib/libc-pwcache: + + From owner-svn-src-vendor@FreeBSD.ORG Sat Dec 15 09:50:32 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9EE029C; Sat, 15 Dec 2012 09:50:32 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6B1A58FC1A; Sat, 15 Dec 2012 09:50:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF9oWMe025247; Sat, 15 Dec 2012 09:50:32 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBF9oW9q025246; Sat, 15 Dec 2012 09:50:32 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201212150950.qBF9oW9q025246@svn.freebsd.org> From: Martin Matuska Date: Sat, 15 Dec 2012 09:50:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244245 - vendor/illumos/dist/cmd/zdb X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 09:50:32 -0000 Author: mm Date: Sat Dec 15 09:50:31 2012 New Revision: 244245 URL: http://svnweb.freebsd.org/changeset/base/244245 Log: Push vendor/illumos/dist to illumos-gate 13894:f4af77f6bbd2 (illumos zfs issues #3397 #3398) Modified: vendor/illumos/dist/cmd/zdb/zdb.c Modified: vendor/illumos/dist/cmd/zdb/zdb.c ============================================================================== --- vendor/illumos/dist/cmd/zdb/zdb.c Sat Dec 15 09:24:17 2012 (r244244) +++ vendor/illumos/dist/cmd/zdb/zdb.c Sat Dec 15 09:50:31 2012 (r244245) @@ -62,14 +62,16 @@ #undef verify #include -#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ - zio_compress_table[(idx)].ci_name : "UNKNOWN") -#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ - zio_checksum_table[(idx)].ci_name : "UNKNOWN") -#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ - dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ - dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") -#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES) +#define ZDB_COMPRESS_NAME(idx) ((idx) < ZIO_COMPRESS_FUNCTIONS ? \ + zio_compress_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \ + zio_checksum_table[(idx)].ci_name : "UNKNOWN") +#define ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \ + dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \ + dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN") +#define ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : \ + (((idx) == DMU_OTN_ZAP_DATA || (idx) == DMU_OTN_ZAP_METADATA) ? \ + DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES)) #ifndef lint extern int zfs_recover; @@ -3271,7 +3273,13 @@ main(int argc, char **argv) argv[i], strerror(errno)); } } - (os != NULL) ? dump_dir(os) : dump_zpool(spa); + if (os != NULL) { + dump_dir(os); + } else if (zopt_objects > 0 && !dump_opt['m']) { + dump_dir(spa->spa_meta_objset); + } else { + dump_zpool(spa); + } } else { flagbits['b'] = ZDB_FLAG_PRINT_BLKPTR; flagbits['c'] = ZDB_FLAG_CHECKSUM; From owner-svn-src-vendor@FreeBSD.ORG Sat Dec 15 13:27:48 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0131042A; Sat, 15 Dec 2012 13:27:47 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D6C0B8FC13; Sat, 15 Dec 2012 13:27:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFDRlel068176; Sat, 15 Dec 2012 13:27:47 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFDRkJE068164; Sat, 15 Dec 2012 13:27:46 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201212151327.qBFDRkJE068164@svn.freebsd.org> From: Robert Watson Date: Sat, 15 Dec 2012 13:27:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244256 - in vendor/openbsm/dist: . bin/auditdistd etc sys/bsm X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 13:27:48 -0000 Author: rwatson Date: Sat Dec 15 13:27:45 2012 New Revision: 244256 URL: http://svnweb.freebsd.org/changeset/base/244256 Log: Vendor import of OpenBSM 1.2-alpha3. This eliminates most local patches made relative to OpenBSM 1.2-alpha2 in order to build OpenBSM as part of the FreeBSD base. Obtained from: TrustedBSD Project Modified: vendor/openbsm/dist/INSTALL vendor/openbsm/dist/NEWS vendor/openbsm/dist/VERSION vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5 vendor/openbsm/dist/configure vendor/openbsm/dist/configure.ac vendor/openbsm/dist/etc/audit_event vendor/openbsm/dist/sys/bsm/audit_kevents.h vendor/openbsm/dist/sys/bsm/audit_record.h Modified: vendor/openbsm/dist/INSTALL ============================================================================== --- vendor/openbsm/dist/INSTALL Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/INSTALL Sat Dec 15 13:27:45 2012 (r244256) @@ -9,8 +9,8 @@ suppport is found. Typical builds will make If doing development work on OpenBSM with gcc, the following invocation of -configure may be preferred in order to generate full compiler warnings and -force the compile to fail if a warning is found: +configure is preferred in order to generate full compiler warnings and force +the compile to fail if a warning is found: CFLAGS="-Wall -Werror" ./configure Modified: vendor/openbsm/dist/NEWS ============================================================================== --- vendor/openbsm/dist/NEWS Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/NEWS Sat Dec 15 13:27:45 2012 (r244256) @@ -1,5 +1,11 @@ OpenBSM Version History +OpenBSM 1.2 alpha 3 + +- Various minor tweaks to the auditdistd build to make it fit the FreeBSD + build environment better. +- AUE_WAIT6 merged from FreeBSD 9. + OpenBSM 1.2 alpha 2 - auditdistd, a distributed audit trail management daemon, has now been @@ -489,4 +495,4 @@ OpenBSM 1.0 alpha 1 to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#53 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $ Modified: vendor/openbsm/dist/VERSION ============================================================================== --- vendor/openbsm/dist/VERSION Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/VERSION Sat Dec 15 13:27:45 2012 (r244256) @@ -1 +1 @@ -OPENBSM_1_2alpha2 +OPENBSM_1_2_alpha3 Modified: vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5 ============================================================================== --- vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5 Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/bin/auditdistd/auditdistd.conf.5 Sat Dec 15 13:27:45 2012 (r244256) @@ -355,7 +355,7 @@ receiver { .Xr auditdistd 8 . .Sh AUTHORS The -.Nm -was written by +.Nm auditdistd +was developed by .An Pawel Jakub Dawidek Aq pawel@dawidek.net under sponsorship of the FreeBSD Foundation. Modified: vendor/openbsm/dist/configure ============================================================================== --- vendor/openbsm/dist/configure Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/configure Sat Dec 15 13:27:45 2012 (r244256) @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#62 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha2. +# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.2alpha2' -PACKAGE_STRING='OpenBSM 1.2alpha2' +PACKAGE_VERSION='1.2-alpha3' +PACKAGE_STRING='OpenBSM 1.2-alpha3' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.2alpha2 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.2alpha2:";; + short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.2alpha2 +OpenBSM configure 1.2-alpha3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.2alpha2, which was +It was created by OpenBSM $as_me 1.2-alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11552,7 +11552,7 @@ fi # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.2alpha2 + VERSION=1.2-alpha3 cat >>confdefs.h <<_ACEOF @@ -13559,12 +13559,14 @@ int main () { - bswap16(0); - bswap32(0); - bswap64(0); + int i; + + i = bswap16(0); + i = bswap32(0); + i = bswap64(0); be32enc(NULL, 0); - htole64(0); - le64toh(0); + i = htole64(0); + i = le64toh(0); ; return 0; @@ -14172,7 +14174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.2alpha2, which was +This file was extended by OpenBSM $as_me 1.2-alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14238,7 +14240,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenBSM config.status 1.2alpha2 +OpenBSM config.status 1.2-alpha3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: vendor/openbsm/dist/configure.ac ============================================================================== --- vendor/openbsm/dist/configure.ac Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/configure.ac Sat Dec 15 13:27:45 2012 (r244256) @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.2alpha2], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 $]) +AC_INIT([OpenBSM], [1.2-alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#66 $]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) @@ -217,12 +217,14 @@ AC_TRY_LINK([ #endif #include ], [ - bswap16(0); - bswap32(0); - bswap64(0); + int i; + + i = bswap16(0); + i = bswap32(0); + i = bswap64(0); be32enc(NULL, 0); - htole64(0); - le64toh(0); + i = htole64(0); + i = le64toh(0); ], [], [ AC_DEFINE(USE_COMPAT_ENDIAN_ENC_H,, Define if compat/endian_enc.h is required) AC_MSG_RESULT([using compat/endian_enc.h]) Modified: vendor/openbsm/dist/etc/audit_event ============================================================================== --- vendor/openbsm/dist/etc/audit_event Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/etc/audit_event Sat Dec 15 13:27:45 2012 (r244256) @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#42 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#43 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -561,6 +561,7 @@ 43198:AUE_PDKILL:pdkill(2):pc 43199:AUE_PDGETPID:pdgetpid(2):pc 43200:AUE_PDWAIT:pdwait(2):pc +43201:AUE_WAIT6:wait6(2):pc # # Solaris userspace events. # Modified: vendor/openbsm/dist/sys/bsm/audit_kevents.h ============================================================================== --- vendor/openbsm/dist/sys/bsm/audit_kevents.h Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/sys/bsm/audit_kevents.h Sat Dec 15 13:27:45 2012 (r244256) @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -601,6 +601,7 @@ #define AUE_PDKILL 43198 /* FreeBSD. */ #define AUE_PDGETPID 43199 /* FreeBSD. */ #define AUE_PDWAIT 43200 /* FreeBSD. */ +#define AUE_WAIT6 43201 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the Modified: vendor/openbsm/dist/sys/bsm/audit_record.h ============================================================================== --- vendor/openbsm/dist/sys/bsm/audit_record.h Sat Dec 15 12:19:24 2012 (r244255) +++ vendor/openbsm/dist/sys/bsm/audit_record.h Sat Dec 15 13:27:45 2012 (r244256) @@ -26,7 +26,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. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -233,6 +233,7 @@ token_t *au_to_ipc_perm(struct ipc_perm token_t *au_to_iport(uint16_t iport); token_t *au_to_opaque(const char *data, uint16_t bytes); token_t *au_to_path(const char *path); +token_t *au_to_privset(char *privtypestr, char *privstr); token_t *au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid); token_t *au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, @@ -278,6 +279,7 @@ token_t *au_to_exec_env(char **envp); token_t *au_to_text(const char *text); token_t *au_to_kevent(struct kevent *kev); token_t *au_to_trailer(int rec_size); +token_t *au_to_upriv(char sorf, char *priv); token_t *au_to_zonename(const char *zonename); /* From owner-svn-src-vendor@FreeBSD.ORG Sat Dec 15 13:29:17 2012 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B09B4599; Sat, 15 Dec 2012 13:29:17 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7CAAE8FC14; Sat, 15 Dec 2012 13:29:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFDTHYZ068398; Sat, 15 Dec 2012 13:29:17 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFDTHII068397; Sat, 15 Dec 2012 13:29:17 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201212151329.qBFDTHII068397@svn.freebsd.org> From: Robert Watson Date: Sat, 15 Dec 2012 13:29:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r244257 - vendor/openbsm/1.2-ALPHA-3 X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2012 13:29:17 -0000 Author: rwatson Date: Sat Dec 15 13:29:16 2012 New Revision: 244257 URL: http://svnweb.freebsd.org/changeset/base/244257 Log: Tag OpenBSM 1.2-alpha3. Obtained from: TrustedBSD Project Added: vendor/openbsm/1.2-ALPHA-3/ - copied from r244256, vendor/openbsm/dist/