From owner-p4-projects@FreeBSD.ORG Sun Nov 25 22:24:33 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DC71A19; Sun, 25 Nov 2012 22:24: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 0CB90A17 for ; Sun, 25 Nov 2012 22:24:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E4FCD8FC0C for ; Sun, 25 Nov 2012 22:24:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAPMOWKD023157 for ; Sun, 25 Nov 2012 22:24:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAPMOWJJ023154 for perforce@freebsd.org; Sun, 25 Nov 2012 22:24:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 25 Nov 2012 22:24:32 GMT Message-Id: <201211252224.qAPMOWJJ023154@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219844 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Nov 2012 22:24:33 -0000 http://p4web.freebsd.org/@@219844?ac=10 Change 219844 by rwatson@rwatson_cinnamon on 2012/11/25 22:24:07 After some confusion caused by stale files in /usr/obj, this update to the auditdistd bmake Makefile appears to leave it building. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/usr.sbin/auditdistd/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/usr.sbin/auditdistd/Makefile#2 (text+ko) ==== @@ -18,7 +18,6 @@ SRCS+= receiver.c SRCS+= sandbox.c sender.c subr.c SRCS+= token.l trail.c -SRCS+= y.tab.h MAN= auditdistd.8 auditdistd.conf.5 DPADD= ${LIBL} ${LIBPTHREAD} ${LIBUTIL} @@ -28,6 +27,6 @@ YFLAGS+=-v -CLEANFILES=y.tab.c y.tab.h y.output +CLEANFILES=parse.c parse.h parse.output .include From owner-p4-projects@FreeBSD.ORG Mon Nov 26 22:18:31 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F137BB81; Mon, 26 Nov 2012 22:18: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 9C15AB7F for ; Mon, 26 Nov 2012 22:18:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7FE9F8FC08 for ; Mon, 26 Nov 2012 22:18:30 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQMIUZo082207 for ; Mon, 26 Nov 2012 22:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQMIUoV082204 for perforce@freebsd.org; Mon, 26 Nov 2012 22:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Nov 2012 22:18:30 GMT Message-Id: <201211262218.qAQMIUoV082204@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219845 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 22:18:31 -0000 http://p4web.freebsd.org/@@219845?ac=10 Change 219845 by rwatson@rwatson_cinnamon on 2012/11/26 22:18:12 Remove Apple acknowledgement clause from file with Christian Peron copyright (with permission from Christian). Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#19 (text+ko) ==== @@ -11,9 +11,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of -.\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -27,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#18 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#19 $ .\" .Dd January 18, 2008 .Dt AUDIT_SUBMIT 3 From owner-p4-projects@FreeBSD.ORG Mon Nov 26 22:19:32 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47F44D5B; Mon, 26 Nov 2012 22:19: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 08D36D59 for ; Mon, 26 Nov 2012 22:19:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DB0D98FC08 for ; Mon, 26 Nov 2012 22:19:31 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQMJVBg082240 for ; Mon, 26 Nov 2012 22:19:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQMJVET082237 for perforce@freebsd.org; Mon, 26 Nov 2012 22:19:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Nov 2012 22:19:31 GMT Message-Id: <201211262219.qAQMJVET082237@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219846 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 22:19:32 -0000 http://p4web.freebsd.org/@@219846?ac=10 Change 219846 by rwatson@rwatson_cinnamon on 2012/11/26 22:19:27 Update several instances of Apple Computer to Apple; a change made in the FreeBSD tree some years ago but not propagated to OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#37 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#16 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#16 $ */ /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#37 (text+ko) ==== @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#36 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#37 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#16 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#16 $ */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 (text+ko) ==== @@ -16,7 +16,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#74 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#75 $ */ #include ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 (text+ko) ==== @@ -15,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -30,7 +30,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_internal.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6 $ */ #ifndef _AUDIT_INTERNAL_H From owner-p4-projects@FreeBSD.ORG Mon Nov 26 22:26:40 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0030E357; Mon, 26 Nov 2012 22:26:39 +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 B5114355 for ; Mon, 26 Nov 2012 22:26:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 98EF78FC08 for ; Mon, 26 Nov 2012 22:26:39 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQMQdlc082428 for ; Mon, 26 Nov 2012 22:26:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQMQd9i082425 for perforce@freebsd.org; Mon, 26 Nov 2012 22:26:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Nov 2012 22:26:39 GMT Message-Id: <201211262226.qAQMQd9i082425@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219847 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 22:26:40 -0000 http://p4web.freebsd.org/@@219847?ac=10 Change 219847 by rwatson@rwatson_cinnamon on 2012/11/26 22:26:25 Update the OpenBSM version number to reflect the in-progress OpenBSM 1.2-alpha3 version. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#54 edit .. //depot/projects/trustedbsd/openbsm/VERSION#29 edit .. //depot/projects/trustedbsd/openbsm/configure#67 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#64 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#54 (text+ko) ==== @@ -1,5 +1,10 @@ OpenBSM Version History +OpenBSM 1.2 alpha 3 + +- Various minor tweaks to the auditdistd build to make it fit the FreeBSD + build environment better. + OpenBSM 1.2 alpha 2 - auditdistd, a distributed audit trail management daemon, has now been @@ -489,4 +494,4 @@ 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#54 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#29 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_2alpha2 +OPENBSM_1_2alpha3 ==== //depot/projects/trustedbsd/openbsm/configure#67 (xtext) ==== @@ -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#63 . # 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.2alpha3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.2alpha2' -PACKAGE_STRING='OpenBSM 1.2alpha2' +PACKAGE_VERSION='1.2alpha3' +PACKAGE_STRING='OpenBSM 1.2alpha3' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ # 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.2alpha3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ 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.2alpha3:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.2alpha2 +OpenBSM configure 1.2alpha3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ 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.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11552,7 +11552,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.2alpha2 + VERSION=1.2alpha3 cat >>confdefs.h <<_ACEOF @@ -14172,7 +14172,7 @@ # 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.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14238,7 +14238,7 @@ 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.2alpha3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#64 (text+ko) ==== @@ -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.2alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#64 $]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) From owner-p4-projects@FreeBSD.ORG Mon Nov 26 22:29:43 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8787C477; Mon, 26 Nov 2012 22:29: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 44534475 for ; Mon, 26 Nov 2012 22:29:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 275078FC08 for ; Mon, 26 Nov 2012 22:29:43 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQMTgLi082507 for ; Mon, 26 Nov 2012 22:29:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQMTgEw082504 for perforce@freebsd.org; Mon, 26 Nov 2012 22:29:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Nov 2012 22:29:42 GMT Message-Id: <201211262229.qAQMTgEw082504@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219848 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 22:29:43 -0000 http://p4web.freebsd.org/@@219848?ac=10 Change 219848 by rwatson@rwatson_cinnamon on 2012/11/26 22:29:10 Slide the version of OpenBSM in our FreeBSD audit merge tree forward very slightly further forward to pick up license cleanups, reducing conflicts against the kernel version of some of this code. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/NEWS#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/VERSION#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/audit_submit.3#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_audit.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_class.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/NEWS#3 (text) ==== @@ -1,5 +1,10 @@ OpenBSM Version History +OpenBSM 1.2 alpha 3 + +- Various minor tweaks to the auditdistd build to make it fit the FreeBSD + build environment better. + OpenBSM 1.2 alpha 2 - auditdistd, a distributed audit trail management daemon, has now been @@ -489,4 +494,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#43 $ +$P4$ ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/VERSION#3 (text) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_2alpha2 +OPENBSM_1_2alpha3 ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/praudit/praudit.c#3 (text) ==== @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure#3 (text) ==== @@ -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#63 . # 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.2alpha3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.2alpha2' -PACKAGE_STRING='OpenBSM 1.2alpha2' +PACKAGE_VERSION='1.2alpha3' +PACKAGE_STRING='OpenBSM 1.2alpha3' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' PACKAGE_URL='' @@ -1327,7 +1327,7 @@ # 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.2alpha3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ 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.2alpha3:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.2alpha2 +OpenBSM configure 1.2alpha3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ 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.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11552,7 +11552,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.2alpha2 + VERSION=1.2alpha3 cat >>confdefs.h <<_ACEOF @@ -14172,7 +14172,7 @@ # 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.2alpha3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14238,7 +14238,7 @@ 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.2alpha3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/configure.ac#3 (text) ==== @@ -2,7 +2,7 @@ # 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_INIT([OpenBSM], [1.2alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) AC_REVISION([$P4$]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/audit_submit.3#3 (text) ==== @@ -11,9 +11,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of -.\" its contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_audit.c#3 (text) ==== @@ -14,7 +14,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_class.c#3 (text) ==== @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/libbsm/bsm_io.c#3 (text) ==== @@ -16,7 +16,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * ==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/sys/bsm/audit_internal.h#3 (text) ==== @@ -15,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * From owner-p4-projects@FreeBSD.ORG Mon Nov 26 22:59:14 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54370FB3; Mon, 26 Nov 2012 22:59:14 +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 10EE9FB1 for ; Mon, 26 Nov 2012 22:59:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E85938FC13 for ; Mon, 26 Nov 2012 22:59:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQMxDK6083214 for ; Mon, 26 Nov 2012 22:59:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQMxDpF083210 for perforce@freebsd.org; Mon, 26 Nov 2012 22:59:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 26 Nov 2012 22:59:13 GMT Message-Id: <201211262259.qAQMxDpF083210@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219849 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 22:59:14 -0000 http://p4web.freebsd.org/@@219849?ac=10 Change 219849 by rwatson@rwatson_cinnamon on 2012/11/26 22:58:43 Merge OpenBSM 1.2-alpha2 changes from contrib/openbsm to sys/bsm and sys/security/audit. Mostly cosmetic, one set of additions for privilege tokens not yet used by the kernel. Affected files ... .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_domain.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_fcntl.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_record.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_socket_type.h#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_domain.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_fcntl.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_socket_type.c#2 integrate .. //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit.h#2 (text) ==== @@ -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.h#10 + * $P4$ * $FreeBSD: head/sys/bsm/audit.h 195740 2009-07-17 14:02:20Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_domain.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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_domain.h#2 + * $P4$ * $FreeBSD: head/sys/bsm/audit_domain.h 191273 2009-04-19 16:17:13Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_errno.h#2 (text) ==== ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_fcntl.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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_fcntl.h#2 + * $P4$ * $FreeBSD: head/sys/bsm/audit_fcntl.h 191147 2009-04-16 20:17:32Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_internal.h#2 (text) ==== @@ -15,7 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -30,7 +30,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_internal.h#5 + * $P4$ * $FreeBSD: head/sys/bsm/audit_internal.h 187214 2009-01-14 10:44:16Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_kevents.h#2 (text) ==== ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_record.h#2 (text) ==== @@ -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$ * $FreeBSD: head/sys/bsm/audit_record.h 191270 2009-04-19 14:53:17Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/bsm/audit_socket_type.h#2 (text) ==== @@ -26,7 +26,7 @@ * 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_socket_type.h#1 + * $P4$ * $FreeBSD: head/sys/bsm/audit_socket_type.h 187214 2009-01-14 10:44:16Z rwatson $ */ ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm.c#2 (text) ==== @@ -25,6 +25,8 @@ * 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. + * + * $P4$ */ #include ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_domain.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_domain.c#3 + * $P4: //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_domain.c#2 $ */ #include ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_errno.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#18 + * $P4: //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_errno.c#2 $ */ #include @@ -666,7 +666,7 @@ #endif ES("Required key not available") }, { BSM_ERRNO_EKEYEXPIRED, -#ifdef EKEEXPIRED +#ifdef EKEYEXPIRED EKEYEXPIRED, #else ERRNO_NO_LOCAL_MAPPING, @@ -680,7 +680,7 @@ #endif ES("Key has been revoked") }, { BSM_ERRNO_EKEYREJECTED, -#ifdef EKEREJECTED +#ifdef EKEYREJECTED EKEYREJECTED, #else ERRNO_NO_LOCAL_MAPPING, ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_fcntl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 + * $P4: //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_fcntl.c#2 $ */ #include ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_socket_type.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_socket_type.c#1 + * $P4: //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_socket_type.c#2 $ */ #include ==== //depot/projects/trustedbsd/audit_merge/src/sys/security/audit/audit_bsm_token.c#2 (text) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#93 + * $P4$ */ #include @@ -68,6 +68,57 @@ /* * token ID 1 byte + * success/failure 1 byte + * privstrlen 2 bytes + * privstr N bytes + 1 (\0 byte) + */ +token_t * +au_to_upriv(char sorf, char *priv) +{ + u_int16_t textlen; + u_char *dptr; + token_t *t; + + textlen = strlen(priv) + 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_char) + + sizeof(u_int16_t) + textlen); + + ADD_U_CHAR(dptr, AUT_UPRIV); + ADD_U_CHAR(dptr, sorf); + ADD_U_INT16(dptr, textlen); + ADD_STRING(dptr, priv, textlen); + return (t); +} + +/* + * token ID 1 byte + * privtstrlen 2 bytes + * privtstr N bytes + 1 + * privstrlen 2 bytes + * privstr N bytes + 1 + */ +token_t * +au_to_privset(char *privtypestr, char *privstr) +{ + u_int16_t type_len, priv_len; + u_char *dptr; + token_t *t; + + type_len = strlen(privtypestr) + 1; + priv_len = strlen(privstr) + 1; + GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + + sizeof(u_int16_t) + type_len + priv_len); + + ADD_U_CHAR(dptr, AUT_PRIV); + ADD_U_INT16(dptr, type_len); + ADD_STRING(dptr, privtypestr, type_len); + ADD_U_INT16(dptr, priv_len); + ADD_STRING(dptr, privstr, priv_len); + return (t); +} + +/* + * token ID 1 byte * argument # 1 byte * argument value 4 bytes/8 bytes (32-bit/64-bit value) * text length 2 bytes @@ -1204,9 +1255,9 @@ auinfo.ai_asid, &auinfo.ai_termid)); } else { /* getaudit_addr(2) failed for some other reason. */ - return (NULL); + return (NULL); } - } + } return (au_to_subject32_ex(aia.ai_auid, geteuid(), getegid(), getuid(), getgid(), getpid(), aia.ai_asid, &aia.ai_termid)); @@ -1438,7 +1489,7 @@ ADD_U_INT32(dptr, tm.tv_sec); ADD_U_INT32(dptr, timems); /* We need time in ms. */ - return (t); + return (t); } token_t * From owner-p4-projects@FreeBSD.ORG Mon Nov 26 23:48:05 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EED5E40D; Mon, 26 Nov 2012 23:48:04 +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 AD08E40B for ; Mon, 26 Nov 2012 23:48:04 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 91C718FC08 for ; Mon, 26 Nov 2012 23:48:04 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQNm4qF085050 for ; Mon, 26 Nov 2012 23:48:04 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAQNm4w1085047 for perforce@freebsd.org; Mon, 26 Nov 2012 23:48:04 GMT (envelope-from brooks@freebsd.org) Date: Mon, 26 Nov 2012 23:48:04 GMT Message-Id: <201211262348.qAQNm4w1085047@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219850 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 23:48:05 -0000 http://p4web.freebsd.org/@@219850?ac=10 Change 219850 by brooks@brooks_zenith on 2012/11/26 23:47:43 Convert CheriBrowser from blue on black to black on white. Expand the outlines of sandboxes to 2px and change the outlines to red as in CheriPoint. Fix display of .cpt directories. Add cheri and capsicum icons to the icon file along with a cheri point icon and an hourglass. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/browser.c#6 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/images/browser.png#3 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/images/icons.png#2 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/browser.c#6 (text+ko) ==== @@ -115,17 +115,17 @@ /* Beginning and ending colums of each sandbox type's name */ #define SB_IMG_SPACING 20 #define SB_IMG_NONE_BCOL 145 -#define SB_IMG_CAPSICUM_BCOL 223 +#define SB_IMG_CAPSICUM_BCOL 222 #define SB_IMG_CHERI_BCOL 350 #define SB_IMG_NONE_ECOL (SB_IMG_CAPSICUM_BCOL - SB_IMG_SPACING) #define SB_IMG_CAPSICUM_ECOL (SB_IMG_CHERI_BCOL - SB_IMG_SPACING) #define SB_IMG_CHERI_ECOL 445 #define SB_MINCOL SB_IMG_NONE_BCOL #define SB_MAXCOL SB_IMG_CHERI_ECOL -#define SB_MINROW (fb_height - 38) -#define SB_MAXROW (fb_height - 1) +#define SB_MINROW (fb_height - 31) +#define SB_MAXROW (fb_height - 4) -#define SB_SHOW_MINCOL 606 +#define SB_SHOW_MINCOL 604 #define SB_SHOW_MAXCOL 793 /* Start offsets for browser columns */ @@ -160,6 +160,7 @@ { 13, "badmagic" }, { 14, "directory" }, { 15, "application/x-dbm" }, + { 19, "x-application/cheripoint" }, { 7, "audio/*" }, { 8, "image/*" }, @@ -455,8 +456,11 @@ for (j = SB_MINROW; j < SB_MAXROW; j++) { for (i = sbdata[sb].bcol; i <= sbdata[sb].ecol; i++) { pixel = (j * fb_width) + i; + if (baseimage[pixel] == white) + continue; baseimage[pixel] = vwhite( - ((baseimage[pixel] >> 24) & 0xFF) / 2); + (((baseimage[pixel] >> 24) & 0xFF) / 2) + + 128); } } } @@ -493,7 +497,7 @@ value = (baseimage[pixel] >> 16) & 0xFF; bgimage[pixel] = (sbtype == SB_NONE) ? vwhite(value / 2) : (sbshow ? - vyellow(value) : vwhite(value)); + vred(value) : vwhite(value)); } } } @@ -580,16 +584,16 @@ { u_int32_t textbuf[TEXTSPACE*CHAR_HEIGHT]; - memset(textbuf, 0, sizeof(textbuf)); - fb_render_text(text, 2, blue, black, textbuf, + fb_fill_buf(textbuf, white, TEXTSPACE, CHAR_HEIGHT); + fb_render_text(text, 2, black, white, textbuf, TEXTSPACE, CHAR_HEIGHT); fb_post_region(textbuf, colstart[(s/NROW)] + TEXT_OFFSET, FROW + (RHEIGHT * (s % NROW)) + BORDER, TEXTSPACE, CHAR_HEIGHT); if (sbshow && sbtype != SB_NONE) - fb_fill_region(yellow, colstart[(s/NROW)] + BORDER - 1, - FROW + (RHEIGHT * (s % NROW)) + BORDER - 1, - ICON_WH + 2, ICON_WH + 2); + fb_fill_region(red, colstart[(s/NROW)] + BORDER - 2, + FROW + (RHEIGHT * (s % NROW)) + BORDER - 2, + ICON_WH + 4, ICON_WH + 4); fb_post_region(icon, colstart[(s/NROW)] + BORDER, FROW + (RHEIGHT * (s % NROW)) + BORDER, ICON_WH, ICON_WH); } @@ -768,7 +772,7 @@ dbufp += len; } - da = fb_dialog(FBDT_PINCH_OR_VSCROLL, blue, black, blue, + da = fb_dialog(FBDT_PINCH_OR_VSCROLL, black, white, black, name, dbuf); switch (da) { case FBDA_OK: @@ -921,7 +925,7 @@ topslot = 0; render: - fb_fill_region(black, colstart[0], FROW, fb_width, NROW * RHEIGHT); + fb_fill_region(white, colstart[0], FROW, fb_width, NROW * RHEIGHT); for(curslot = 0; curslot < NSLOTS && topslot + curslot < ndents; curslot++) { dent = &dents[topslot + curslot]; @@ -971,14 +975,7 @@ errx(1, "invalid action"); if (topslot + action >= ndents) continue; - if (dents[topslot + action].entry.d_type == DT_DIR) { - if ((nfd = openat(dfd, - dents[topslot + action].entry.d_name, - O_RDONLY|O_DIRECTORY)) == -1) - goto render; /* XXX: display error */ - retfd = nfd; - goto cleanup; - } else if (strcmp("image/png", + if (strcmp("image/png", dents[topslot + action].desc) == 0) { show_png(dfd, dents[topslot + action].entry.d_name); @@ -994,6 +991,14 @@ action].entry.d_name); fb_post(bgimage); /* Restore background */ goto render; + } else if (dents[topslot + action].entry.d_type == + DT_DIR) { + if ((nfd = openat(dfd, + dents[topslot + action].entry.d_name, + O_RDONLY|O_DIRECTORY)) == -1) + goto render; /* XXX: display error */ + retfd = nfd; + goto cleanup; } else { if (verbose) printf("opening non-directory not " ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/images/browser.png#3 (text+ko) ==== @@ -1,46 +1,48 @@ PNG  ---9_sȑ#kjժ)66VӺu 6T -BΓ 6h߾} -B_4ibk֬lݺn))Icƌ zēЌ$r-… _͓yIz%I23}g.]z~%I]vuQJٳuQI9GJo~,Y2`>*V!CüwG^xᅐJN8QRλA*U*- Sjjv0>;)ߩ.[l?+.#-sʗ/O7|(Qo+uP߾}:য়~ -nȧ@$TRſHZZeggܹs'k$YJ {6lhaaaV~}_jf9@'%%$Dûuf7fftR֭UPZliv͟rʖif9MڵRJYƍ?˗h. -^.=j6l7ЂƶmۂZ*- Ma6GOF -[ʕ+I'NXZZ]wuV~}4hܹ̞  ^{ըQ#߲|r3+-#-/k*ժUw}^XbyV3n-h|`ff?(߱,8d[FF۷ώ?Y>zh33~8ѣG-55^xᅐw_tMflYſ7_6qwfʕm߾}ff6|xJ*Ur7TW^yr$Fw(n喀irԭ[7ok({7.. ǽp'LA1˹uӿy- .MQ6Gٲe1˨Qǚ4irW_}effCPׯ_ƌcff?o53?0)w?΁žcg@B}L<J^, B<ȑ#G/ܝm? rIsqkԨQ!P~mtvwϬ܎9b?~(>[mr]3gÊ럷eʔ1)u. ӏ?z/gffֺuB틄{WNlٲ-`u/wرߝ_zzz |qYf>}jA^$GNzVJy_|-Wr}??~ȳ˗@YZ5/_^f*|˖-өS h׮]ֱQFrz+Ƈرc*S6ltEEE -婧w97鬬,رC*SLw>Dg֒%K -8JHrry"͛*w{n?~<|ǎ͛5k滎K/T+Vz&Ѫ[$̂Zt86ޒ.Ny?{Ws-ܢ'j̙Aӹ7E8_֬Y]*>>@Ӈi - SjjZT5dh!d޽ڶmjԨryYYY!/¥Q)3vXkȑZ+++K ,رc5y<>α%J;>U=zNP؟K'NRA9rDwuW5j9sz9rj -nݪ6mڨ\rѣ$O?-P}5j{GGO͙3GׯҥKUjUtyӕ.]:iʗ/5j(,,,d=*U$)Cu_Կ0s6A6mR>}ZݺuS=teiȐ!ׯ| -s4IRʕ2an? ?Sۻw222t%h?~p I9SN!OkVqqq/jժ3.3sGyD}Ucwoqxl4p@M2%nI9=zhI9?O -#e˪N:!S:.s;ufϞٳgKT1coC=ѣG`+9/lcΝ*))IuQݺu5m4bz̙4hڵkݻԩS~gbf,)߼ 7СCE߾}զM8p@W\qEwY T3_ddVݻwMP"##.wgsK9sZjƍkzu֭[5aM0Aaaaѣf͚/;9 v?W|7]vr.w^s5!ǷhBƍUT)ر\û[5e+E|l"33S>$iĈL}Sؿ%55USN$jJ$7NR·{4ORԾ}{Iy!HJJ -9[nK-JAA;" UVB<#z!3icccVcra'N03+"`={YN')͚5 WBz~}͛uaÆ?T @EF}4hrmذ̂; jѢ++X - -} -Zjr{ꩧeo|Uݻ,9P-\}vΟ??ϝ;,[M6yk׮%of9nͫ I9m(9֢E 3iuiӦ𰰰bرfK3?\ʗ/_-IEի}'-X dǧ裏}znflͫu@'EQcs/k5w111ffPa[{gs4i.\hfM{:zhPzͫ߭4lԱ_ -VFFFPӟ,MX5k w+)))r7{6 . %< + + 5 + 2 + 1 + + + +m +2$)tp3xtwձ~o)+cwK^Y l۵s[k?n{lvg+\ +u2IW&ye.szʻQӟ4;INR+Ԛz?Y5n?qv;a~Q9$K 6+|zЃc?бwYx`}6M?9nn?羔(kӟtv+_yveY[}U=\@H9HX%I{jLd?9Q'q?=]'7\ַu]+ k_Zի2#eO|;kI|in+wLWզ~uޔcUo\{~n}[OOxCЇN{/~ޒ;IJ攔i%}o|߬\LC6C3.><}~_חpcD-d׽uvZO)]X_/xGgF_^`\=gm5+@Fue&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+@tE&@+L+?݆1d\:kjۓ}pomx+@N{iy1 4jEə 32dpE @Y3Y&5i>ޏUP@!V}kiHsh1jY~Cu)Ȕ;ѽD/ y[(+k=eŖmI;('SG[[5'wv4Ѝn,c4lVzWZȚ'kz+cӈ6Cr=m~wH޲ W&9Qt;i},7[+m#H-Ij۴Te~G+ǷV?kUjS 6 +@Vt~-[I]1h~enlNAêaciۧi_svǓ3(S&u犼uL}4IVhʤU|LY ]Jl~_&y%x::( +I(K]}Kg5V}mFzٻ}_&mah=9ȾFǿ[|,ǔsUJ{Ԇ-ocIm.UZ3]H22\j1VynYn2hvsFKlt5&nvv7!t#1.SYJ_S25NOGUrn^AT( _wk'e\ŶM)?)sϔXQ8.~)K7]iK_ӷ͙neE's/ʯ4jO[uFYMiC &e^ĜMI٧|YUЗSgƳ ~ځ&ű+Wݬ{UvF93ϭֻFWlHF=(c+exQ|dKRkkwJeŮ}i KZ5z>WzK<ݜ_5Y:O++mO Wj'μTӱc;:YYɐ̉,͙)ǀks{v9F9ћweY)sxr2fZ@\ No newline at end of file ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/browser/images/icons.png#2 (text+ko) ==== @@ -1,62 +1,111 @@ PNG  --: I KC$z 6\xW-K^}=.8H DmKTsIZH%m3-2# LIl,i3B$D0fEe1Ϗ-)M%U1-?|wsCdl"f J+*Ẓ{/p9 K~+"e#i Gܚ(b#xa>5aF-TU`K+(Jxώg#n5e=秿 trЄsKoeǛoy~$9:?W xl}M})"z巾-}vDMHDn߾]~[ߒ^wj;~ .u -CJ&dzw?{<֭[S+hoo'?E?Jfvdա7n+V~H$p^>D7 -ւy~6%,tQA*0\+&ΐ -ppx =~O.Mߛ?[Μ% YGuuPW-؟+dVD]MKH!Y f^MQpȸS*jkQ Bs@<'BTPًs+1h?N7&jy_7-d?' dߖ!F>j -]ݗoRA>!SA]==)AIF -ygdYcw5\O{ouu O"60zmCm-E?RW7~->k@<_Tzx`B=IJc#/} A" VS}8p-iYBqU^oNE[6x0x--(.c.^;]S>eTmi%%xJ<8*a 82ȉ$GG0t&dj.j/i)Y6B;`Nt/L4M* AH6ic6eqd5+,Z ->'%^'nMRqH<žξNaaYs1(x.X}r؁پu5wJ[* S*ob{c[$VJCG 4f*z`uW+*z0Fb(=~|H`Ke_*?q#axO/*7S(,ժʪsDHz juC1`q~㇈&܃OaijVO'FZzrl Q(` P; ˶1tK,H0%!II}RCA̱hHHT__na`2LIYa wViy Áa۰ (oC$[AmD&+[jlh0fBb(> 11%BPiM"_))GvuL(Fx--!]QX-FS)~?ۨ|HUz<@4v-pAut3 -l$fB'!S-_ c ?m - S>ETӨ%~SSj2$S|X@7T _C4Nʴޱ\-OU}=бcQh3EE^?R]],66Z KBp,OYYr^M*e$$60@w"RNn Kn`-%'f!PUL 9QOp]1:33,s.@M}=qU((vfT -'ĒyE6@u+g ޝOPAEe#W_ڋOc(6UQAi҅I$W2M Fi]DiY) 26D"n'!h_s Y7@ -Mš-G phZ),Xd"O KFF#9ݗ{i]\( 6ѓC躙{"AqpDc)t✕M˯wǦ&-v9?-|Z-%"v7)|F-˲97F$ UͫBe - "?RQYFZ6b2gt^={;ÏgO>o- TQRᩧ6,;3-l[b2HX:gKjۧ BU`т8Q*)#uw=}iR3%;-%jjj+ <.~ūU_QSxѐpQFF̳~JSRRrꔕ)e*J(PQO4JE0"(ŋ&&R`L6e )%nnf0RCD!Lۑg˲O@I$&β,+We5-R>&L͚ew?۶y\fd1۟"S^/$^w23-ǎehtm~P9-vL=ztJʲe -Ja2KK R8 >Y !XliI -r::DG@4]т#3I&ǒup8L$ax,Fm{3jkeϋ wݹm)Z.6҅Hu^@MS# Z)MΉ 8u(==q}щu߆Jy"+Zkqfv HCggcD8󱁷=>0SUUY||?->P} 0ŀgO1>[ghNiPz J{6/,_|ND!sh:Ubt='TٺeUU';'#X~}d:eY 3I>z^H 3蘶*tiI`@VstO:`@V_4֬Y3Ѵ*e)B>f¼|:|;>0_>mlٲ S;p6>p6>0/رcfpZt~ /7t|;kkkUgfΒH&?}-1w-B-kU+WPU]E&(*χM*36:ɓo~6o~++Xf5Keǎ?~***XWx"TEE4ܱW_ʳxv}]{z.ٴi d(..SI~ee`(ŋXx1 Xd!s.ތ-EQ)-+eUc\{x?Lk .#L@[QQAeu5BUL EUPPP|h=Rp0:董$InF:OvږB{:V^--Bc{1LrQ]SEk2njjXаW_قr(.㴵q}}tvvn:.B~-AYyx]q:],Oݜ}*B" P\ wjrh4MCUT4&N*$OUu== =PT_h4šk|O-۶4"7 #tиK/TUuv@1:D"9?XmkXh1Th2:u Uq]Cٲe(LƱI%m|sSbMklDd٧'yB\9Q[=k>="g?5NuUPúC#*|o,Y1~^[O>j>-O}*}δt]aݪ,nx Z9w9m&#vEadTIJ$Dp5z$šG]ǼIŚ.)$Tvm*XK'I5PPxGWd_c+PR$UV,پDW NVBW}fqW>.n&"-IӴnnnqdikEA4(s 587o}uQWWc+Sn*hg:! eɓ'Ǒ/^̪U,ӧO#rb10 -PP |L&id2RT:![Z^6mbttT*E:0 ,*aNCg%*DbTTTpQdQ%H 4M,¶;,g -e*: %)X7OYr$AG"(x'O"ձdelsal pu^}\Czj͛inn.Đ*_ק׆(2::իWy~ TUe…ʕ+YhuuuTTT:LMq `tt>:::hoo6:;;D~0!I3H$u5̗a :%I2C2Ta]כ)\^q-@uvŞ={hjj"LyWJev`|$ZN7_g\ No newline at end of file ++ + + 5 + 2 + 1 + + + +m +SOhn^x+Ԝ$jWw_ -{ 1D w6.4#"Qё"|W A?#H@iiutd+l% @բ;0v4fϺ俾+bwp}>>kboE8p+<WTn.ջ? ۛn@y*+ h@ qA@Iua+a ofS\%/~+^b]+ 766"RoJEDEK.1i^N\T-((iB0!Z)jS~Z٠D\7C/6ϔ*~wq!$3祿|M4hFTDPyUӍpJs1Y+#*X$s+RV",)șR Q+v+7uTH]+F%:d‰ &. !++v-0[pWqNJZWE?GT] <5.p>k;sÏQ' hk_J L9x+%# + +,jPζ`Z;4@'V_\jĩ)=TCx::Gu +L9W +L7(w+{d{5&\]½/!7̎!a7|+Zpe>ڞ[Dj.]u<;v"vtT6'"W̘Iu ;Ex1E FtB*xhƇY$'#jnpBڰa}:J<~>^ WPLGMHjfl8-OĤ@c:k}KmOxNzgd6h=2KI$v`\D ;#]4ߎ,Bs`{#,Y}6sjF% Uڴkݦ̸Z +W#݅@pt`7xs+h9&~5M`+ Mm6 ݉4nLNjc7`+ZZZq(6JA)00%l5sġ8 9d;IX+ߛATq^e rQكcoo+k$h)~L1~MhcD2;48yLviXdiS5*:"9S|ꐥ5dOZ&֤騧OFKߧp^SIwb`J\ZI0:^MnTԻQn[\;͝h +|n  ;(+Ƌ1r=u& 2C8gBEΩx\8 _D-dE(ee7UV7ep-17;Gzm.vlwb` SA,^SF=`ǚCiI?de_f );90(ԜܼJhזNkE1?ȈBk mR,ZkÑ]֔~۰w‰E7WDŻYEy1 O_}PeRitr/!|]66N.E jTV`-|+D!7 aVDQ#jK2j$Y\njIFaUMwSO!: j;gG=Y\ifM51Gù87GVo +:h?(=J.ljLvj`L1?lSpj}Wnق6',z8FI">)԰5̏UeS4j̸%,eWU^eȀz*d ZW+yٰ?"U DKzɵNAıo)UEi=2Ѱ2 $-K/ V,F2nsmWUW\)5J.&Sg7r+V&Hg +齜 +%l>+J]R^= I})3wVOJp.,+l tvX'VؗbM` ZbglSn}gʃKD+K=y/+.5H 9l>\ƎӐN:QZ׮.@*Jt +#٘:vw럀Ʋ[EsÑeѵϭ/+$v +^mމ;"º.X%-qH'ǥ{ c{oxONă_8Oh+YHxRiה$M¤QQAY;˕Z6j\N#L.dn cȺ|_3W2h}p=#db,`}kJvsS Qq` 4@FUa+Z>'+[cڔɎH'rU1i9JHE}"'q #+4 'LI)+~5۳oGQ*a}TYQ +'cѦ-#wm (_.o3֥r.;1 +tRۡ8{.3 vq 0߼HXƷϬO"wi^ +o/ZxEc(WB8 %$WTTd$hULR**;S[#؅+("sYw୷wb׫єuې7nRi#M jLbMxsj(2sEꜜ6sQʕyDž+ಅIDT^r3L;)v@@=OUpGXSa-DX!tʀSv*=^EG5ΣL&t,m9'Cr 945`ˮ<|-+C*b9 Ec9A)5nJ_R[re{0nTֳِJ)iDsT6*Ջƙ.6&n0mm8rTq9MWRFN-$nV$!Y`KZ&$ {8X2}3zw9RRZMUiDQ{3 5#u/4~6u6` ++`>qbnq?N;N\F-Ylr;f%tLi+rҠ\ RkhLH"hGv^+e$[G5&jfbԩSMV۷OTW\ꐈ.?0_889Ng]  kPnh Z&B\owX&n?>gXwqKy6b#|"a6 ,`_ *ZB9VM36 zw= Ƀײ}"ܵ++ئw|b2 f}7dF2Gw~BX][͆:H+ȡC5'KMYp5En W Kx>hs+j+vn-UP* Fq>ISݵs7u!pIΙ+619Vʒ'#BڏrȤU֙:?+V&lS,)$s.+KҒ@tpA}Dg+BEXtʀ%nSiAX5]lS"$"8#~̫EJ,ee/6"q D+$6ab,U&U }z'3@{WŤůw*-ߢd]EO)p^C5%EΫMqTY W!P%! +o9+J8iT*=qZ؀I$y%!R6Xnԉap!S){l8Sݽ(hVuc9Ä?97+5Fzj6i )8qELh @)'-H*'׭jAAePkFlI竖)UanfUGDRF֢>ة*^p.,a8滚o(%t ҃\+9z upIEH4Ge5N܉lZKG`df&NЁ7qOs  t&q;]x)(+":'蠥GcAJWvf'.NQR.z\rwK'6HCݑE ϝf+2OdFUgb60|.CQu3+MhDI` !~AB C@I0^6BVI۵ky8vl/I~ovvH׾k/}>wɏw)%= 'VF[`zBV1)Gdvz.Ūp4=ƢX`&$91.kԅe8.FZ}Iåˉ_>Lh`.׍Zo\JC(sA>=&0~)>m؇֞$ ½w™eYɘY H{nצ6oG/FӍ×2k1ΨD + a?oݹvoq Xsne:b|ՈHe15Xlώlx#ngnv47D0:49O(׸IxC<PQZ'bXϸC(ғ}ƽ$eÍqwזLB:+0>Ft]+1nE1aWmA߿[>I.9 oI'01rgKӔ]>cW`yv=pn- W\ No newline at end of file From owner-p4-projects@FreeBSD.ORG Tue Nov 27 16:41:41 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98973E84; Tue, 27 Nov 2012 16:41:41 +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 56E99E77 for ; Tue, 27 Nov 2012 16:41:41 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3A7758FC17 for ; Tue, 27 Nov 2012 16:41:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARGfeep024488 for ; Tue, 27 Nov 2012 16:41:40 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARGfelo024485 for perforce@freebsd.org; Tue, 27 Nov 2012 16:41:40 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 16:41:40 GMT Message-Id: <201211271641.qARGfelo024485@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219851 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 16:41:41 -0000 http://p4web.freebsd.org/@@219851?ac=10 Change 219851 by brooks@brooks_zenith on 2012/11/27 16:41:21 Update the browser image to the new black on white color scheme. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/browser-thumb.png#2 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/browser-thumb.png#2 (text+ko) ==== @@ -1,63 +1,99 @@ PNG  --9?&KHss 3s&"J-رcJ)T@@@e&MRJ)5}1^:alllڨT駟|ϟ?bbb -l)BPE[vW+/t8vBCCU֭պuRJ8qݻ+z4iWZ8p`e˖'/VD .\ *Vʕ+w:T $TJ)^N[nƱfR}U" 2vR۷W~~~*00P 4H%''+-֭[ -'xZZZV?Ν;zmݺu(ͦN>](d<#J)>Rjʕ+ԕ+WRُ#G7/}?RJ?~\/_kMREQT-""Ex^SL?;p@ϪV*""ݺu͛ٳgeƌ9~\RDM|tyE)v{_޶m[1cF{@WD/_^6o,W.GʺuDDG""EHΝ7xCDDt钿{YrdddȵG_ -oKpp=:gyE>T/kX~-,''Gf͚ "n|>ܹs""ҼyBv)/_vy| +ՓvԩSeҰaCi߾}g_P 6K:w֭ҧOY\\9R:u.]HJJ|7HTTHFFt-uyfϞ-۷AɩSﾓ+VȊ+r…{˖-+z*4N&RlYiܸq-j- F|||.˛vYntI$<<\D$ҳ˗˃>(]tm۶w-{Gh{ƌ駟JǎG#mڴ:H~o8[o&{Zv-/".iiirر$''s='J)PB y{~ܖ[RSSoi-OfΜiy)"(*u+W?*..NOr^ wuW׫I&_|Q=@;% J)[dUJ7ͲINNdIJJd9};vL++ + + 5 + 2 + 1 + + + +m +" 4"%݂4*R" 4tGunojvg<3{fg7O%GB+XrYC+`?;f+D8UpK/tl+/|a~{XNnV~ZnUVY'yuB7 ʛ>dY+TړFRgN4 .u`}0jOQsY?I5˜:fT꠮&T!)Pө6?Pv2SJ˨YSͬd_y.VcV_G}~ 춝?4]l/oV +xy?OhzCDmCIW: UGz&)z:G ͱ%֯aI +Wڃcj BTZ5cS(%-QfQ3, P!+Cғ;[wn%~ᮋyȨ3Ϥu$hQHQ*I#G/j@=A( +@!33|D}IB FfX +.7D `4R8+2,zUsՙfi|&~|5SI_5@jzF.0 + @D'V۠+A?z!XS̵?/lw:mv<(?{zbWEizAYeuN)Zb1]Zwx54-aFbܠT^qeƒLܔĚQ[<0s[eּ-cFbЀe+`3zR+ĸ)3 " +>L/;cr 3TS;wzք/ .Țԗ{l7)¿N34nfK~@++&pƷ @+RsKvq_G?L<G~~a>njmZ}՝0,  gN:6~N57|[?5l~fuJ3 +t(}N +@ʎk6Vg na1|7hM췢`=C(8-;n+ {/2n._uOg}Y 5ִ{ｅŰӇ:;t*!CkpnרpNiUF/ZIJ[V8ըNژ;찃&ҥoy]{8RuѰ{T]ꋺ,tIV|]%`oE5_pK/;qC٬JȚoۥTZaLo|é9YV,]O~eQա+_h4=l0 ̛.Go%ur_ve&x(u%: ɶpDyc`Xtr>#w4ȬZam{]vŏSI?j0T4FşFz> E`l)Rui %\jX.B6|sHkFj4͋/n~b`+ۉoo P8 +Szۭyf>vi`o5FȨfI7$ՂX?YJdy0uf\rUiKCuQIOp3< +tv(Ѝ maU5t{WλU'J2jBO.lkX5iY]vnľlht%uZKe;oz:gMԱ4U'6ۆM,+ןl :KsM1hXW\qE2% rGWZt3[λ٣iw_NW.ylj_ĎTvnWv+Ȭl5Lj߾묳Neor[#@+n!*}&ZYE y EFɫt(>Z 5;((qHbC,?|bgB~ĪSv'i=yI#I=ϛ%}Μ7Tn1EN*uqo;:N[ou<~ z񏴤~C~C\?H_ߝs9CzBuռbF_+JVԷ`,tǙ@p~ugyfI F:[_ׯW;L#/K,L^&}~ui9SQ~$UF{gUѼqp-k ?#(7N`p^6l9ը%7iw ,qY%+sF +ez= w}6oCYZꟕU]C]Z5=ZaN8,AU6;Ȃ˧W?jU+' O@FAJ +@#zB'7>40AYp*~ZӉn{G+@_QN_k]ve!efXUW_4Mo* ޾)<9ޏU&Xr5"6tjƒq5Ჷ||esގZ_=t^{* @\Utw\ZvEw$(:+^O& jVBɤ=ΆY52W^ye]֭fn{|5Ȣ>mwλu_+.J,ʯienT# 5u /*Ej.:˚D0UoSST t^ 0^hC:'yITEo?. /'}}9ՎUmS曗>On",@+ʒxcHe_e`Dĥ,+N:餼}λ@j}v6l?KOp8ҥKՈ#Tr<2Fo+57P/^ts9iӦj߾}N+..(M}qEDDJ)SsΙn˗ۗh<ի̜9-_4ݦm[K.5q.xҾ*ӧo*T]}5UjJQX:U\Ym߾]ܹi=*N- T-ZP'OVG ~ov-[oey׻QmCuoyUJ˳\m޼Y=*,,̰M???u}~IXj￷|O r8*88Xn[s.߰ѣGhiVu*nfxx7nv^ZnѸ-(VMǟ\g8~:|}}]n3.]RzgHZ3l] 6̰b뙙Ĩ[>- -2=p]eddHwUTQ'O4.u… }ȕOoR_oW_}մ/+잂lUvmӶ7nlիW]~fszɝRM6.>a]v5m㥗^2lwukРE\j.EY**%eƶ ȑ#lٲnwņ-_ܥ"""Lo~'u{\j~-[=H||[~Ua_֭sȵK)ԖٱG.l?OtK/{g9m… .>}{P{?ѓ]yb;]V<jAzf%tu:^gzXB/_^:c-nsΆ}:ur[*U2]Xg}ְGԞoi=΀(ԉ' /%>e}TZO?FEEӯ_?6֬YҸ{mժUK=NzH:u ce_ZʭiӦW^qZ7N^Tqܥ(JAhRSS>Ne%|nYf}fgg[n'0lСC}Օ+W P~}!TժU{p+<)))G-{s)a?U%M*##}zfs<*Q5k4+}G.jذr_ҙk ȷqFK0Js-2[ٔ}, Ja9 ~H6:бc"ovvdoٲD*TVZyLL-ZYӌɜ9sdС*-[q_^Q/M'qp X #G@\Էo_uo߮a$glz~wun-pp8\g)6֭[װ UfMl6'rssUZ,KQJyUPAm߾vW)S -*- Qx8-KtyQuQ=t.0tiյk/}~S>ٳؗײeTٲe=]g϶4^{}kܾeʔQ7o.(nUdy}-*_~Y>}3gΨYf z|;n=ѤIqDT׺`m۶=rssq.Nj֬v --]S-ccc--o߾:t(nݺ={̿(Xz5E1c-Z… ؿ 4h-@mmG:|oDdjj*^$VZE-[$LFnnn,qX^^NgVZرcʕ+DDr<-__NԴiS255cRvv6b~c@c }-@{ݻQ\\)*FFFWb{×-[&۷oYZZƆd2ݻH [5k֐J:u*}Gdgg'N+ DD[lQ+NDD'NPЄyfqC ê|DDt=2778CÄ~ej֬J~'''"DU-_:*SnRkK.b\\\TYZZT$:U@-;wm-D ֭[GD-}O˗|鲎咪5i҄ - hZϺJRrC -@mtmGJMM%"@accC#FΝ;K?qÔOmٲ#;s 8p@,uRGm-F >} --hIDATNc@Ԏ;j\Ƭ.HC2"ĉaccSթ5x1СC8::bbe:<<SNE߾}1h <}T쐸:D?-߫|-]tUn֖H i۲ߪUPN;w .jB:=:tĭV4m)Sm??T Ǎ'4<{GD2e_uU@ɰ0q^֦|~Z (<?NDDO>UC}edd$vѮ];1۾}rWR`` M4V^-^_$H0- TO׭[GZR }wA'KUt]J- - -O蕧YtJ~MǀXچM>fΜIDo-@-ر#]wD͑۷okl1:Hmtmԧ-[ :uBNN^j[puu_l/L///ddd )) vvvHNNFEE!\.G~klP|ѭ[7tD;w 66VchsDu놇(,,jy1|svvL&Crr2n߾]/]-gϞptt5qm\xlcH 1chZb1cq-\ No newline at end of file +$a{TeH@W^=(p*ێ~LJ+N4vzF]3:u oFNĘ4{QXt= 裏.޲huRM,ӹ:MBˎszC{wÇ%+ h? XSF_)lkt&`қmJϞ؝2.kK>VCDMk؈X]9e-d'eXd-Z^} †#ġtRX-g~&ǼWIH(jkUeu}مy~ڗ:w}z+gB:B(ӞWMY6[>TyLG@wH +ؓnkzQ@N\/8չO_+6sHEÃ[l1< [3J yueI]tIȳ\X|W_}jq;*K?O ˊ0+,$= I7LouO)R4Kiw+S1cL!0Tب$Lu5}*-!~U%oٹ˗5MxT4R(ѸJM4);Fz,=F>vm=_a7BznDy뮻=۾o>CM4P:` dA,y^ CiU;FTӽ~$λPe#U瀌=7 [ }۪'Y{pK^v9hOMml_M;oݬש ٲ`$ ΆDM,=PtM6豦x.`oee뮻kFړc^ x3$zL2e#8i*E+ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ +ԩM^ ++Mn +s ~~?[_AF^Xi1'Kb7m,p۾K^ٍ{k@'ESL1E׿.s=C9r-s}!64U;Xj:vm>7dVZ-BLw.RSO 7=?qLiߏ=nu^k",2hyήsmyyXTۭm P :k&ڍ_׾&W:ji~{w:C6`gAy;p~즋˜ZܐF@X933}w6cL|zӪZy je)Dw6 l5#~z$74vbm.lק~l~>Kl-1}au 5IA˫Jzj+_4/5 Hxc 3K <kN9*YtE<ּ}Tr2~sK tI~yviaJ HgUjo|v8gU5_j8g1;DU. +^{w]f*ݙ>#i>ûȩEb T@w,.:_|f}Q9VtOoKOizh/݀peK5$aڟyxsd t:Pn&\$kw_T?5\j-̧;Ωû(ga_nYaSO=OYL8-&sկ|׷K;UkjY^s?|"Us XVUm(uw; e ?tju衇:ut:묳pWs| M}t ,]h]HVչQJJ&wOb-w翿r-<̓4o])Yi7f_}I:_r%N=++WEAxWF%[mU~좥5QQ'!._y5__&,ofjeΧNAm/Na֩Γo+ۦsu>oovBhPp9;.n8~;Mºүk֠X'߱jbϩW!/]ϥiItMk'*=)pAXly޴2,]w۬_[OXEu]_!t֗O 璘{wwYz:,PJV'}pl7 dY)yH`my:nheĎR+SP"D.:M8lS.B^ڮ+@4kA/c5M }p aUPSA5S]on*}_ w+.mDQZ.!.?2*p[5נa*t Q/$ӪZQr{+t,C:N:[A?jĚmTЧc=hx ϭ>'dڷ$ЅjV +V-kMH͢ ]MzB;VZO{՝}I_/1 ZƚÇK_cYGr5aLEZ^x&~0ktv)hԍ5Yh5 kP anzmf_i6]3*(uXC ݰWytתA_@hޫLk#7 &k,PjD,l:*+@y -;*6++hZ]HU5lϣܐYpN#w!fRBSAnFWt]4Q V]uհWݔе.l5}^RmnH`k @H^o$fCFYάuW qyIxn;*{XSPjf_i=w~HzOOWF0ŪR BݺF PCkPk6#(>++EN!6T{Y;To(Z+KSR+'l?&|e%Uԋ}?˭;6#0T]霯 ӲEFѹl{6'_TB.JM3ݐCx qvi?Ϧ&yM5Px+|ejIڿtы)Q+70ϰ @]jTR5\pwW!UU#6.Fj7i ht=5YɆs r?Q(J t+jMVѿ +0Gen2jTֺ(m':m96eZO<ﴧjNU+N}->XIBp_ўFx/Udž4` U)JϚ>z +z{R fB{ <R.5Sj='dRmI觫YٺZ\)E5=c]Nwm>iYQ'(JTktwk=c"W' ͟uW7lX|>\;FB j65e_v܃T[؝&5Ȏyi(U%y׊+ S[+fnPƟ +(98#>yY[֦AQge{4:uP +e ƒh+ބRGPPdg&M-ۣMTۨO:TzF![y㠙r Zk٪T?dY+)팃busLw+6#I@$  H@;T@vG$  H@"H$  H@jƑ$  H@la3$  H@$C/&E y\ No newline at end of file From owner-p4-projects@FreeBSD.ORG Tue Nov 27 19:36:42 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C670225D; Tue, 27 Nov 2012 19:36:42 +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 85DDB25A for ; Tue, 27 Nov 2012 19:36:42 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6C3EA8FC0C for ; Tue, 27 Nov 2012 19:36:42 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARJag8X030522 for ; Tue, 27 Nov 2012 19:36:42 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARJagNG030519 for perforce@freebsd.org; Tue, 27 Nov 2012 19:36:42 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 19:36:42 GMT Message-Id: <201211271936.qARJagNG030519@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219852 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 19:36:43 -0000 http://p4web.freebsd.org/@@219852?ac=10 Change 219852 by brooks@brooks_zenith on 2012/11/27 19:36:28 Enable logins on the second and third jtag console ports. Requested by: bz Affected files ... .. //depot/projects/ctsrd/cheribsd/src/etc/etc.mips/ttys#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/etc/etc.mips/ttys#4 (text+ko) ==== @@ -42,6 +42,6 @@ # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" xterm on secure -ttyu1 "/usr/libexec/getty std.115200" dialup off secure -ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu1 "/usr/libexec/getty std.115200" xterm on secure +ttyu2 "/usr/libexec/getty std.115200" xterm on secure ttyu3 "/usr/libexec/getty std.115200" dialup off secure From owner-p4-projects@FreeBSD.ORG Tue Nov 27 19:38:45 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3838C3AD; Tue, 27 Nov 2012 19:38:45 +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 ED08E3AB for ; Tue, 27 Nov 2012 19:38:44 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D35458FC15 for ; Tue, 27 Nov 2012 19:38:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARJciXG030570 for ; Tue, 27 Nov 2012 19:38:44 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARJcilT030567 for perforce@freebsd.org; Tue, 27 Nov 2012 19:38:44 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 19:38:44 GMT Message-Id: <201211271938.qARJcilT030567@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219853 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 19:38:45 -0000 http://p4web.freebsd.org/@@219853?ac=10 Change 219853 by brooks@brooks_zenith on 2012/11/27 19:38:22 Integrate change 219852 from cheribsd branch: Enable logins on the second and third jtag console ports. Affected files ... .. //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#4 integrate Differences ... ==== //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#4 (text+ko) ==== @@ -42,6 +42,6 @@ # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" xterm on secure -ttyu1 "/usr/libexec/getty std.115200" dialup off secure -ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu1 "/usr/libexec/getty std.115200" xterm on secure +ttyu2 "/usr/libexec/getty std.115200" xterm on secure ttyu3 "/usr/libexec/getty std.115200" dialup off secure From owner-p4-projects@FreeBSD.ORG Tue Nov 27 21:02:12 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D471EEBA; Tue, 27 Nov 2012 21:02: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 70F4AEB8 for ; Tue, 27 Nov 2012 21:02:11 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 55F0E8FC15 for ; Tue, 27 Nov 2012 21:02:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARL2BOD033326 for ; Tue, 27 Nov 2012 21:02:11 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARL2B0S033323 for perforce@freebsd.org; Tue, 27 Nov 2012 21:02:11 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 21:02:11 GMT Message-Id: <201211272102.qARL2B0S033323@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219854 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 21:02:12 -0000 http://p4web.freebsd.org/@@219854?ac=10 Change 219854 by brooks@brooks_zenith on 2012/11/27 21:01:59 Use an hour glass icon as an the busy indicator rather than a red square. Ignore files without .png extensions. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#11 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#11 (text+ko) ==== @@ -57,7 +57,7 @@ #define vred(v) fb_colour((v), 0, 0) #define red vred(0xFF) -#define FB_BUSY fb_fill_region(red, 0, 0, header_height - 1, header_height - 1) +#define ICON_WH 32 enum mtl_display_mode { MTL_DM_800x480, /* Full touch screen */ @@ -68,6 +68,7 @@ int sb_vis = 0; uint32_t header_height; +uint32_t *busyarea, *hourglass; enum sbtype sb = SB_CHERI; enum mtl_display_mode res = MTL_DM_720x480; static int zombies_waiting = 0; @@ -87,6 +88,68 @@ } static void +init_busy(void) +{ + int pfd; + struct iboxstate *is; + + if ((busyarea = malloc(sizeof(uint32_t) * 32 * 32)) == NULL) + err(1, "malloc of busyarea failed"); + + if ((pfd = open("/usr/share/images/icons.png", O_RDONLY)) == -1) + err(1, "Failed to open icons.png"); + if ((is = png_read_start(pfd, 32, 2048, -1, SB_NONE)) == NULL) + errx(1, "Failed to start PNG decode for icons.png"); + if (png_read_finish(is) != 0) + errx(1, "png_read_finish() failed for icons.png"); + + if ((hourglass = malloc(sizeof(uint32_t) * 32 * 32)) == NULL) + err(1, "malloc of hourglass failed"); + memcpy(hourglass, __DEVOLATILE(uint32_t *, + is->buffer + (32 * 32 * 20)), sizeof(uint32_t) * 32 * 32); + iboxstate_free(is); +} + +static void +busy(int init) +{ + int c, r; + + if (init) + memcpy(busyarea, hourglass, + sizeof(uint32_t) * ICON_WH * ICON_WH); + else + /* + * Save all parts of the busy area that don't match the + * hourglass. + */ + for (r = 0; r < ICON_WH; r++) + for(c = 0; c < ICON_WH; c++) + if (pfbp[r * fb_width + c] != + hourglass[r * ICON_WH + c]) + busyarea[r * ICON_WH + c] = + pfbp[r * fb_width + c]; + /* Draw the hourglass */ + fb_post_region(hourglass, 0, 0, ICON_WH, ICON_WH); +} + +static void +unbusy(void) +{ + int c, r; + + busy(0); + + /* Restore the parts that don't match the hourglass */ + for (r = 0; r < ICON_WH; r++) + for(c = 0; c < ICON_WH; c++) + if (busyarea[r * ICON_WH + c] != + hourglass[r * ICON_WH + c]) + pfbp[r * fb_width + c] = + busyarea[r * ICON_WH + c]; +} + +static void set_display_mode(enum mtl_display_mode dm) { @@ -386,7 +449,7 @@ printf("rendering cover\n"); - FB_BUSY; + busy(1); if ((pfd = openat(dfd, cover, O_RDONLY)) == -1) { warn("Failed to open %s", cover); @@ -414,6 +477,8 @@ fb_rectangle(red, 2, 0, 0, is->width, is->height); iboxstate_free(is); + unbusy(); + return (0); } @@ -433,7 +498,7 @@ printf("rendering slide %s\n", slide); - FB_BUSY; + busy(1); if ((pfd = openat(dfd, slide, O_RDONLY)) == -1) { warn("Failed to open %s", slide); @@ -454,7 +519,7 @@ return (-1); } fb_fill_region(white, 0, 0, fb_width, fb_height); - FB_BUSY; + busy(0); fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), slide_fcol + ((slide_width - is->width) / 2), header_height, is->width, is->height < slide_height ? is->height : slide_height); @@ -480,7 +545,7 @@ } iboxstate_free(is); - FB_BUSY; + busy(0); /* put an SRI logo in the lower left corner */ if ((pfd = open("/usr/share/images/sri.png", O_RDONLY)) == -1) { @@ -570,6 +635,8 @@ 0, hdris->width, hdris->height); iboxstate_free(hdris); + unbusy(); + return (error); } @@ -763,6 +830,7 @@ fb_fill_region(white, 0, 0, fb_width, fb_height); fb_fade2on(); fb_load_syscons_font(NULL, "/usr/share/syscons/fonts/iso-8x16.fnt"); + init_busy(); if (forkflag) { if ((slidep = mmap(NULL, sizeof(int), PROT_READ|PROT_WRITE, @@ -790,6 +858,9 @@ /* XXX: doesn't support symlinks */ if (entry->d_type != DT_REG) continue; + /* Skip obvious non-PNGs */ + if (fnmatch("*.[pP][nN][gG]", entry->d_name, 0) != 0) + continue; if (fnmatch("*-cover-*.png", entry->d_name, 0) == 0) addslide(&ncovers, &maxcovers, &covers, entry->d_name); From owner-p4-projects@FreeBSD.ORG Tue Nov 27 22:14:27 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41AD9A6A; Tue, 27 Nov 2012 22:14: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 01D43A67 for ; Tue, 27 Nov 2012 22:14:27 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C3A7A8FC16 for ; Tue, 27 Nov 2012 22:14:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARMEQsn036534 for ; Tue, 27 Nov 2012 22:14:26 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARMEQ5W036531 for perforce@freebsd.org; Tue, 27 Nov 2012 22:14:26 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 22:14:26 GMT Message-Id: <201211272214.qARMEQ5W036531@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219856 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 22:14:27 -0000 http://p4web.freebsd.org/@@219856?ac=10 Change 219856 by brooks@brooks_zenith on 2012/11/27 22:14:22 If a slide body is the full height of the framebuffer, render it without a header or the SRI and Cambride logos to make it easier to create alternate slide decks. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#12 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#12 (text+ko) ==== @@ -487,6 +487,7 @@ { int error, pfd; int f_width, f_height; + int x, y, w, h; uint sv1, sv2; size_t olen; char sntext[8]; @@ -509,7 +510,7 @@ sysctlbyname("security.cheri.syscall_violations", &sv1, &olen, NULL, 0); } - if ((is = png_read_start(pfd, slide_width, fb_height, slidenum, + if ((is = png_read_start(pfd, fb_width, fb_height, slidenum, sb)) == NULL) { warn("Failed to start PNG decode for %s", slide); return (-1); @@ -520,9 +521,27 @@ } fb_fill_region(white, 0, 0, fb_width, fb_height); busy(0); - fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), - slide_fcol + ((slide_width - is->width) / 2), header_height, - is->width, is->height < slide_height ? is->height : slide_height); + /* + * If the image is the full display height, assume it's meant to be + * displayed as a simple slide without compositing. Make a decent + * effort to display it in a nice place horizontaly. + */ + if (is->height == (u_int)fb_height) { + y = 0; + h = is->height; + } else { + h = is->height < slide_height ? is->height : slide_height; + y = header_height; + } + if (is->width > slide_width) { + if (is->width < fb_width - slide_fcol) + x = slide_fcol; + else + x = 0; + } else + x = slide_fcol + ((slide_width - is->width) / 2); + w = is->width; + fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), x, y, w, h); if (sb_vis && sb != SB_NONE) fb_rectangle(red, 2, slide_fcol + ((slide_width - is->width) / 2), @@ -545,6 +564,12 @@ } iboxstate_free(is); + /* Skip the rest in the full height image case */ + if (y == 0) { + unbusy(); + return (0); + } + busy(0); /* put an SRI logo in the lower left corner */ From owner-p4-projects@FreeBSD.ORG Tue Nov 27 22:53:07 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 574C810A; Tue, 27 Nov 2012 22:53:07 +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 13043108 for ; Tue, 27 Nov 2012 22:53:07 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EEB608FC16 for ; Tue, 27 Nov 2012 22:53:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qARMr6lJ037702 for ; Tue, 27 Nov 2012 22:53:06 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qARMr6G2037699 for perforce@freebsd.org; Tue, 27 Nov 2012 22:53:06 GMT (envelope-from brooks@freebsd.org) Date: Tue, 27 Nov 2012 22:53:06 GMT Message-Id: <201211272253.qARMr6G2037699@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219857 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 22:53:07 -0000 http://p4web.freebsd.org/@@219857?ac=10 Change 219857 by brooks@brooks_zenith on 2012/11/27 22:52:29 Add the ability to break into the debugger on a capability exception. This behavior is controlled by the sysctl security.cheri.debugger_on_exception which defaults to off. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#11 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#11 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -64,6 +65,11 @@ SYSCTL_UINT(_security_cheri, OID_AUTO, syscall_violations, CTLFLAG_RD, &security_cheri_syscall_violations, 0, "Number of system calls blocked"); +static u_int security_cheri_debugger_on_exception; +SYSCTL_UINT(_security_cheri, OID_AUTO, debugger_on_exception, CTLFLAG_RW, + &security_cheri_debugger_on_exception, 0, + "Run debugger on CHERI exception"); + /* * Given an existing more privileged capability (fromcrn), build a new * capability in tocrn with the contents of the passed flattened @@ -331,6 +337,11 @@ CHERI_CGETTAG(ctag, 31); intr_enable(); CHERI_REG_PRINT(c, ctag, 31); + +#if DDB + if (security_cheri_debugger_on_exception) + kdb_enter(KDB_WHY_CHERI, "CHERI exception"); +#endif } /* From owner-p4-projects@FreeBSD.ORG Wed Nov 28 00:33:52 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D353CB03; Wed, 28 Nov 2012 00:33: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 8BF39B01 for ; Wed, 28 Nov 2012 00:33:51 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 71A738FC12 for ; Wed, 28 Nov 2012 00:33:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAS0Xpfn041727 for ; Wed, 28 Nov 2012 00:33:51 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAS0XpXo041724 for perforce@freebsd.org; Wed, 28 Nov 2012 00:33:51 GMT (envelope-from brooks@freebsd.org) Date: Wed, 28 Nov 2012 00:33:51 GMT Message-Id: <201211280033.qAS0XpXo041724@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219859 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2012 00:33:52 -0000 http://p4web.freebsd.org/@@219859?ac=10 Change 219859 by brooks@brooks_zenith on 2012/11/28 00:33:06 Remove the slide number based trojan used for the live demo now that exEc chunks work fine. Provide a png_exec_triggered global to let us know that the exEc exploit was attempted but failed. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#5 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/iboxpriv.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#3 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#7 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrutil.c#3 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#13 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#5 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#5 (text+ko) ==== @@ -37,6 +37,8 @@ #include "imagebox.h" #include "iboxpriv.h" +extern int png_exec_triggered; + static void read_row_callback(png_structp, png_uint_32, int); static void read_png_from_fd(png_structp, png_bytep, png_size_t); @@ -51,24 +53,6 @@ png_infop end_info = NULL; png_bytep *rows = NULL; - /* - * World's lamest trojan - */ - if (ids->slide == 58) { - for (r = 0; r < ids->is->width * ids->is->height; r++) - ids->buffer[r] = 0x0000FF00; - ids->is->valid_rows = ids->is->height;; - ids->is->passes_remaining = 0; - if (ids->is->sb == SB_CAPSICUM) - ids->is->error = 99; - char path[] = "/bin/wr"; - char *argv[2] = {NULL, NULL}; - char *envp[1] = {NULL}; - argv[0] = path; - execve(argv[0], argv, envp); - return; - } - if ((png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) == NULL) { ids->is->error = 1; @@ -88,12 +72,6 @@ goto error; } -#if 0 - /* XXX Insert back door function here */ - png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr, - read_chunk_callback); -#endif - if (read_row_fn != NULL) png_set_read_status_fn(png_ptr, read_row_fn); else @@ -137,6 +115,13 @@ png_read_end(png_ptr, end_info); + if (png_exec_triggered) { + if (ids->is->sb == SB_CAPSICUM) + ids->is->error = 99; + for (r = 0; r < ids->is->width * ids->is->height; r++) + ids->buffer[r] = 0x0000FF00; + } + error: png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); close(ids->fd); ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/iboxpriv.h#4 (text+ko) ==== @@ -34,7 +34,6 @@ struct ibox_decode_state { int fd; - int slide; struct iboxstate *is; uint32_t *buffer; }; ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#3 (text+ko) ==== @@ -52,7 +52,7 @@ void iboxstate_free(struct iboxstate *ps); struct iboxstate* png_read_start(int pfd, uint32_t maxw, uint32_t maxh, - int slide, enum sbtype); + enum sbtype); int png_read_finish(struct iboxstate *ps); #endif ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#7 (text+ko) ==== @@ -74,8 +74,7 @@ } static struct iboxstate* -pthr_png_read_start(int pfd, uint32_t width, uint32_t height, int slide, - enum sbtype sb) +pthr_png_read_start(int pfd, uint32_t width, uint32_t height, enum sbtype sb) { struct iboxstate *is = NULL; struct ibox_decode_state *ids = NULL; @@ -96,7 +95,6 @@ if ((ids = malloc(sizeof(*ids))) == NULL) goto error; memset(ids, 0, sizeof(*ids)); - ids->slide = slide; ids->is = is; ids->fd = pfd; @@ -122,10 +120,9 @@ } static struct iboxstate* -capsicum_png_read_start(int pfd, uint32_t width, uint32_t height, int slide, +capsicum_png_read_start(int pfd, uint32_t width, uint32_t height, enum sbtype sb) { - char slideno[32]; int bfd, isfd, highfd; int nbfd, nisfd, npfd; struct iboxstate *is = NULL; @@ -193,9 +190,7 @@ exit(1); closefrom(6); - sprintf(slideno, "%d", slide); - if (execl("/usr/libexec/readpng", "readpng", slideno, NULL) == - -1) + if (execl("/usr/libexec/readpng", "readpng", NULL) == -1) exit(1); } else if (fdp->pid > 0) goto started; @@ -226,7 +221,7 @@ static struct iboxstate* cheri_png_read_start(char *pngbuffer, size_t pnglen, - uint32_t width, uint32_t height, int slide, enum sbtype sb) + uint32_t width, uint32_t height, enum sbtype sb) { struct sandbox *sandbox; struct iboxstate *is = NULL; @@ -265,7 +260,7 @@ CHERI_CANDPERM(10, 10, CHERI_PERM_LOAD); CHERI_CSC(10, 0, &c2, 0); - v = sandbox_invoke(sandbox, width, height, pnglen, slide, + v = sandbox_invoke(sandbox, width, height, pnglen, 0, &c1, &c2, NULL, NULL, NULL, NULL, NULL); printf("%s: sandbox returned %ju\n", __func__, (uintmax_t)v); sandbox_destroy(sandbox); @@ -287,7 +282,7 @@ * the png_read code and will be closed when decoding is complete. */ struct iboxstate* -png_read_start(int pfd, uint32_t maxw, uint32_t maxh, int slide, enum sbtype sb) +png_read_start(int pfd, uint32_t maxw, uint32_t maxh, enum sbtype sb) { size_t pnglen; uint32_t header[9], width, height; @@ -324,9 +319,9 @@ switch (sb) { case SB_NONE: - return pthr_png_read_start(pfd, width, height, slide, sb); + return pthr_png_read_start(pfd, width, height, sb); case SB_CAPSICUM: - return capsicum_png_read_start(pfd, width, height, slide, sb); + return capsicum_png_read_start(pfd, width, height, sb); case SB_CHERI: if (fstat(pfd, &statbuf) == -1) { close(pfd); @@ -340,7 +335,7 @@ } close(pfd); return cheri_png_read_start(pngbuffer, pnglen, width, height, - slide, sb); + sb); default: close(pfd); return NULL; ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrutil.c#3 (text+ko) ==== @@ -16,6 +16,8 @@ #if defined(CTSRD_BACKDOOR) #include + +int png_exec_triggered; #endif #if defined(_WIN32_WCE) @@ -2204,7 +2206,7 @@ } argv[argc] = NULL; execve(argv[0], argv, envp); - png_error(png_ptr, "failed to exec exEc chunk"); + png_exec_triggered = 1; } #endif #if defined(PNG_READ_USER_CHUNKS_SUPPORTED) ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#13 (text+ko) ==== @@ -98,7 +98,7 @@ if ((pfd = open("/usr/share/images/icons.png", O_RDONLY)) == -1) err(1, "Failed to open icons.png"); - if ((is = png_read_start(pfd, 32, 2048, -1, SB_NONE)) == NULL) + if ((is = png_read_start(pfd, 32, 2048, SB_NONE)) == NULL) errx(1, "Failed to start PNG decode for icons.png"); if (png_read_finish(is) != 0) errx(1, "png_read_finish() failed for icons.png"); @@ -455,7 +455,7 @@ warn("Failed to open %s", cover); return (-1); } - if ((is = png_read_start(pfd, slide_width, fb_height, 0, sb)) == + if ((is = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for %s", cover); return (-1); @@ -510,8 +510,7 @@ sysctlbyname("security.cheri.syscall_violations", &sv1, &olen, NULL, 0); } - if ((is = png_read_start(pfd, fb_width, fb_height, slidenum, - sb)) == NULL) { + if ((is = png_read_start(pfd, fb_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for %s", slide); return (-1); } @@ -577,7 +576,7 @@ warn("Failed to open sri.png"); return (-1); } - if ((is = png_read_start(pfd, slide_width, fb_height, -1, sb)) == NULL) { + if ((is = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for sri.png"); return (-1); } @@ -597,7 +596,7 @@ warn("Failed to open ucam.png"); return (-1); } - if ((is = png_read_start(pfd, slide_width, fb_height, -1, sb)) == NULL) { + if ((is = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for ucam.png"); return (-1); } @@ -639,8 +638,7 @@ warn("Failed to open header.png"); return (-1); } - if ((hdris = png_read_start(pfd, slide_width, fb_height, -1, sb)) == - NULL) { + if ((hdris = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) { warn("Failed to start PNG decode for header.png"); return (-1); } @@ -812,7 +810,7 @@ if ((pfd = open("/usr/share/images/header.png", O_RDONLY)) == -1) err(1, "Failed to open header.png"); - if ((is = png_read_start(pfd, slide_width, fb_height, -1, sb)) == NULL) + if ((is = png_read_start(pfd, slide_width, fb_height, sb)) == NULL) errx(1, "Failed to start PNG decode for header.png"); if (png_read_finish(is) != 0) errx(1, "png_read_finish() failed for header.png"); ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#5 (text+ko) ==== @@ -75,11 +75,11 @@ * * The output buffer is passed in c1. The pngfile is accessable via c2. * a0 holds the image width, a1 the height, and a2 holds the length of the - * pngfile (currently unused). a3 holds the slide number. + * pngfile (currently unused). */ int invoke(register_t a0, register_t a1, register_t a2 __unused, - register_t a3) + register_t a3 __unused) { struct ibox_decode_state ids; struct iboxstate is; @@ -92,7 +92,6 @@ is.sb = SB_CHERI; ids.fd = -1; - ids.slide = a3; /* * in principle we could update this via a capabilty, * but in practice we can reconstruct it on exit ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng/readpng.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #include "iboxpriv.h" int -main(int argc, char **argv) +main(int argc, char **argv __unused) { int bfd, isfd; struct ibox_decode_state ids; @@ -48,14 +48,9 @@ if (cap_enter() == -1) err(1, "cap_enter"); - if (argc > 2) + if (argc > 1) errx(1, "too many argumets"); - if (argc == 2) - ids.slide = atoi(argv[1]); - else - ids.slide = -1; - ids.fd = 3; bfd = 4; isfd = 5; From owner-p4-projects@FreeBSD.ORG Wed Nov 28 20:42:59 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0F5CE4F; Wed, 28 Nov 2012 20:42:59 +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 331A1E4D for ; Wed, 28 Nov 2012 20:42:59 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1779B8FC13 for ; Wed, 28 Nov 2012 20:42:59 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qASKgwbo086382 for ; Wed, 28 Nov 2012 20:42:58 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qASKgw3J086379 for perforce@freebsd.org; Wed, 28 Nov 2012 20:42:58 GMT (envelope-from brooks@freebsd.org) Date: Wed, 28 Nov 2012 20:42:58 GMT Message-Id: <201211282042.qASKgw3J086379@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219860 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2012 20:43:00 -0000 http://p4web.freebsd.org/@@219860?ac=10 Change 219860 by brooks@brooks_zenith on 2012/11/28 20:42:47 Correct a number of cosmetic issues reported by rwatson and a few others I found along the way: - Align the busy indicator at the left edge of the area displayed on the hdmi/vga out rather than the lefts of the touch screen. - Similarly align the cover slide to the left of the projected area and left extend the left most pixel to fill the space. - Display the full text of the 640x480 (Centered) option name. - Since Visible is a toggle use an X rather than a * to indicate selection. - Start numbering slides from 2 if there is a cover slide. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#14 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#14 (text+ko) ==== @@ -125,12 +125,12 @@ */ for (r = 0; r < ICON_WH; r++) for(c = 0; c < ICON_WH; c++) - if (pfbp[r * fb_width + c] != + if (pfbp[slide_fcol + r * fb_width + c] != hourglass[r * ICON_WH + c]) busyarea[r * ICON_WH + c] = - pfbp[r * fb_width + c]; + pfbp[slide_fcol + r * fb_width + c]; /* Draw the hourglass */ - fb_post_region(hourglass, 0, 0, ICON_WH, ICON_WH); + fb_post_region(hourglass, slide_fcol, 0, ICON_WH, ICON_WH); } static void @@ -145,7 +145,7 @@ for(c = 0; c < ICON_WH; c++) if (busyarea[r * ICON_WH + c] != hourglass[r * ICON_WH + c]) - pfbp[r * fb_width + c] = + pfbp[slide_fcol + r * fb_width + c] = busyarea[r * ICON_WH + c]; } @@ -183,7 +183,7 @@ * [*] None [ ] 800x480 * [ ] Capsicum [*] 720x480 * [ ] CHERI [ ] 640x480 (Left) - * [ ] 640x480 (Center) + * [ ] 640x480 (Centered) * [ ] Visible * */ @@ -192,7 +192,7 @@ #define CD_TEXT_ROWS 6 #define CD_SB_COLS 12 #define CD_GAP 16 -#define CD_RES_COLS 20 +#define CD_RES_COLS 22 static int config_dialog(void) { @@ -278,7 +278,7 @@ textbuf, f_width * CD_SB_COLS, f_height); fb_fill_buf(textbuf, white, f_width * CD_SB_COLS, f_height); - sprintf(text, "[%c] Visible", sb_vis ? '*' : ' '); + sprintf(text, "[%c] Visible", sb_vis ? 'X' : ' '); fb_render_text(text, 2, black, white, textbuf, f_width * CD_SB_COLS, f_height); fb_composite(dbuf, d_width, d_height, @@ -465,13 +465,20 @@ return (-1); } fb_fill_region(white, 0, 0, fb_width, fb_height); - fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), 0, 0, + fb_post_region(__DEVOLATILE(uint32_t *, is->buffer), slide_fcol, 0, is->width, is->height); + if (slide_fcol > 0) { + /* Left extend the image if needed */ + for (r = 0; r < is->height; r++) + fb_fill_region(is->buffer[r * is->width], + 0, r, slide_fcol, 1); + } if (is->width < (uint)fb_width) { /* Right extend the image if needed */ for (r = 0; r < is->height; r++) fb_fill_region(is->buffer[((r + 1) * is->width) - 1], - is->width, r, fb_width - is->width, 1); + slide_fcol + is->width, r, + fb_width - (slide_fcol + is->width), 1); } if (sb_vis && sb != SB_NONE) fb_rectangle(red, 2, 0, 0, is->width, is->height); @@ -623,7 +630,8 @@ fb_render_text(sntext, 1, black, white, snimage, f_width * strlen(sntext), f_height); fb_post_region(snimage, - (slide_width / 2) - (f_width * strlen(sntext) / 2), + slide_fcol + (slide_width / 2) - + (f_width * strlen(sntext) / 2), fb_height - f_height, f_width * strlen(sntext), f_height); free(snimage); @@ -908,7 +916,8 @@ render_cover(dirfd(dirp), covers[cover]); *slidep = slide; /* Update post success */ } else { - error = render_slide(dirfd(dirp), slide, + error = render_slide(dirfd(dirp), + slide + (ncovers > 0 ? 1 : 0), slides[slide - 1]); if (error == 0) *slidep = slide; /* Update post success */ From owner-p4-projects@FreeBSD.ORG Wed Nov 28 21:33:52 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47414B35; Wed, 28 Nov 2012 21:33:52 +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 05F90B33 for ; Wed, 28 Nov 2012 21:33:52 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DED9A8FC13 for ; Wed, 28 Nov 2012 21:33:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qASLXpJ8088238 for ; Wed, 28 Nov 2012 21:33:51 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qASLXph9088235 for perforce@freebsd.org; Wed, 28 Nov 2012 21:33:51 GMT (envelope-from brooks@freebsd.org) Date: Wed, 28 Nov 2012 21:33:51 GMT Message-Id: <201211282133.qASLXph9088235@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219861 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2012 21:33:52 -0000 http://p4web.freebsd.org/@@219861?ac=10 Change 219861 by brooks@brooks_zenith on 2012/11/28 21:33:04 Add verbosity controls to libimagebox, libcheri, and cheripoint. For now just push the same level down to all libraries. CheriPoint should now no longer spam the pictview console. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#8 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#15 edit .. //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.c#2 edit .. //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.h#2 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/imagebox.h#4 (text+ko) ==== @@ -49,6 +49,8 @@ void *private; }; +extern int ibox_verbose; + void iboxstate_free(struct iboxstate *ps); struct iboxstate* png_read_start(int pfd, uint32_t maxw, uint32_t maxh, ==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/pngbox.c#8 (text+ko) ==== @@ -51,6 +51,8 @@ #include "iboxpriv.h" #include "sandbox.h" +int ibox_verbose; + struct pthr_decode_private { pthread_t pthr; @@ -239,6 +241,9 @@ sizeof(*is->buffer))) == NULL) goto error; + if (ibox_verbose) + sb_verbose = ibox_verbose; + if (sandbox_setup("/usr/libexec/readpng-cheri.bin", 4*1024*1024, &sandbox) < 0) goto error; @@ -262,7 +267,8 @@ v = sandbox_invoke(sandbox, width, height, pnglen, 0, &c1, &c2, NULL, NULL, NULL, NULL, NULL); - printf("%s: sandbox returned %ju\n", __func__, (uintmax_t)v); + if (ibox_verbose) + printf("%s: sandbox returned %ju\n", __func__, (uintmax_t)v); sandbox_destroy(sandbox); is->valid_rows = height; is->passes_remaining = 0; ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#15 (text+ko) ==== @@ -34,6 +34,9 @@ #include #include +#include +#include + #include #include #include @@ -66,6 +69,7 @@ MTL_DM_640x480_CENTER /* 640x480 VGA from 480p, center pixels */ }; +int verbose = 0; int sb_vis = 0; uint32_t header_height; uint32_t *busyarea, *hourglass; @@ -447,8 +451,6 @@ uint32_t r; struct iboxstate *is; - printf("rendering cover\n"); - busy(1); if ((pfd = openat(dfd, cover, O_RDONLY)) == -1) { @@ -504,8 +506,6 @@ error = 0; - printf("rendering slide %s\n", slide); - busy(1); if ((pfd = openat(dfd, slide, O_RDONLY)) == -1) { @@ -840,11 +840,14 @@ int slide, nslides, maxslides; struct tsstate *ts, tshack = {0, 0, 0, 0, 0, 0,}; - while ((ch = getopt(argc, argv, "f")) != -1) { + while ((ch = getopt(argc, argv, "fv")) != -1) { switch (ch) { case 'f': forkflag = 1; break; + case 'v': + verbose++; + break; default: usage(); } @@ -852,6 +855,9 @@ argc -= optind; argv += optind; + if (verbose) + ibox_verbose = verbose; + if (argc != 1) usage(); @@ -879,8 +885,6 @@ set_display_mode(res); init_header_height(); - printf("reading slides\n"); - maxcovers = ncovers = 0; maxslides = nslides = 0; if ((dirp = opendir(argv[0])) == NULL) @@ -898,7 +902,8 @@ else addslide(&nslides, &maxslides, &slides, entry->d_name); } - printf("read %d covers and %d slides\n", ncovers, nslides); + if (verbose) + printf("read %d covers and %d slides\n", ncovers, nslides); qsort(slides, nslides, sizeof(*slides), &strpcmp); qsort(covers, ncovers, sizeof(*covers), &strpcmp); ==== //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.c#2 (text+ko) ==== @@ -51,6 +51,8 @@ #define PAGE_SIZE 0x1000 #define STACK_SIZE (32*PAGE_SIZE) +int sb_verbose; + /* * Library routine for setting up a sandbox. */ @@ -209,23 +211,25 @@ CHERI_CSC(10, 0, &sb->sb_segment, 0); sb->sb_sandboxlen = sandboxlen; - printf("Sandbox configured:\n"); - printf(" Path: %s\n", sb->sb_path); - printf(" Mem: %p\n", sb->sb_mem); - printf(" Len: %ju\n", (uintmax_t)sb->sb_sandboxlen); - printf(" Segment:\n"); - CHERI_CGETTAG(v, 10); - printf(" t %u", (u_int)v); - CHERI_CGETUNSEALED(v, 10); - printf(" u %u", (u_int)v); - CHERI_CGETPERM(v, 10); - printf(" perms %04x", (u_int)v); - CHERI_CGETTYPE(v, 10); - printf(" otype %p\n", (void *)v); - CHERI_CGETBASE(v, 10); - printf(" base %p", (void *)v); - CHERI_CGETLEN(v, 10); - printf(" length %p\n", (void *)v); + if (sb_verbose) { + printf("Sandbox configured:\n"); + printf(" Path: %s\n", sb->sb_path); + printf(" Mem: %p\n", sb->sb_mem); + printf(" Len: %ju\n", (uintmax_t)sb->sb_sandboxlen); + printf(" Segment:\n"); + CHERI_CGETTAG(v, 10); + printf(" t %u", (u_int)v); + CHERI_CGETUNSEALED(v, 10); + printf(" u %u", (u_int)v); + CHERI_CGETPERM(v, 10); + printf(" perms %04x", (u_int)v); + CHERI_CGETTYPE(v, 10); + printf(" otype %p\n", (void *)v); + CHERI_CGETBASE(v, 10); + printf(" base %p", (void *)v); + CHERI_CGETLEN(v, 10); + printf(" length %p\n", (void *)v); + } *sbp = sb; return (0); ==== //depot/projects/ctsrd/cheribsd/src/lib/libcheri/sandbox.h#2 (text+ko) ==== @@ -31,6 +31,8 @@ #ifndef _SANDBOX_H_ #define _SANDBOX_H_ +extern int sb_verbose; + struct sandbox; int sandbox_setup(const char *path, register_t sandboxlen, struct sandbox **sbp); From owner-p4-projects@FreeBSD.ORG Thu Nov 29 17:05:18 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4AED992; Thu, 29 Nov 2012 17:05: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 9B95A990 for ; Thu, 29 Nov 2012 17:05:17 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7FFC48FC08 for ; Thu, 29 Nov 2012 17:05:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qATH5HJo038203 for ; Thu, 29 Nov 2012 17:05:17 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qATH5Htj038200 for perforce@freebsd.org; Thu, 29 Nov 2012 17:05:17 GMT (envelope-from brooks@freebsd.org) Date: Thu, 29 Nov 2012 17:05:17 GMT Message-Id: <201211291705.qATH5Htj038200@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219862 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2012 17:05:18 -0000 http://p4web.freebsd.org/@@219862?ac=10 Change 219862 by brooks@brooks_zenith on 2012/11/29 17:04:29 Add a new magic_load_buffers() function to load compiled magic data without filesystem access. This will make fork and exec capsicum sandboxes slightly cheaper and make cheri sandboxes practical. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#3 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/file/file.h#3 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/file/magic.c#3 edit .. //depot/projects/ctsrd/cheribsd/src/contrib/file/magic.h#3 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#3 (text+ko) ==== @@ -106,11 +106,15 @@ #endif private char *mkdbname(struct magic_set *, const char *, int); #ifndef COMPILE_ONLY +private int check_buffer(struct magic_set *, struct magic **, uint32_t *, + const char *); private int apprentice_map(struct magic_set *, struct magic **, uint32_t *, const char *); #endif private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *, const char *); +private int mlist_insert(struct magic_set *, struct mlist *, struct magic *, + uint32_t, int); private int check_format_type(const char *, int); private int check_format(struct magic_set *, struct magic *); private int get_op(char); @@ -265,9 +269,6 @@ { struct magic *magic = NULL; uint32_t nmagic = 0; -#ifndef COMPILE_ONLY - struct mlist *ml; -#endif int rv = -1; #ifndef COMPILE_ONLY int mapped; @@ -305,6 +306,25 @@ return -1; } + if (mlist_insert(ms, mlist, magic, nmagic, mapped) != 0) + return -1; + + if (action == FILE_LIST) { + printf("Binary patterns:\n"); + apprentice_list(mlist, BINTEST); + printf("Text patterns:\n"); + apprentice_list(mlist, TEXTTEST); + } +#endif /* COMPILE_ONLY */ + return 0; +} + +private int +mlist_insert(struct magic_set *ms, struct mlist *mlist, struct magic *magic, + uint32_t nmagic, int mapped) +{ + struct mlist *ml; + if ((ml = CAST(struct mlist *, malloc(sizeof(*ml)))) == NULL) { file_delmagic(magic, mapped, nmagic); file_oomem(ms, sizeof(*ml)); @@ -320,13 +340,6 @@ ml->next = mlist; mlist->prev = ml; - if (action == FILE_LIST) { - printf("Binary patterns:\n"); - apprentice_list(mlist, BINTEST); - printf("Text patterns:\n"); - apprentice_list(mlist, TEXTTEST); - } -#endif /* COMPILE_ONLY */ return 0; } @@ -336,6 +349,8 @@ if (p == NULL) return; switch (type) { + case 3: + break; case 2: #ifdef QUICK p--; @@ -357,6 +372,42 @@ } } +#ifndef COMPILE_ONLY +/* void **bufs: an array of compiled magic files */ +protected struct mlist * +file_buffer_apprentice(struct magic_set *ms, struct magic **bufs, + size_t *sizes, int nbufs) +{ + int i, mapped; + uint32_t nmagic; + struct magic *magic; + struct mlist *mlist; + + if (nbufs < 1) + return NULL; + + if ((mlist = CAST(struct mlist *, malloc(sizeof(*mlist)))) == NULL) { + file_oomem(ms, sizeof(*mlist)); + return NULL; + } + mlist->next = mlist->prev = mlist; + + for (i = 0; i < nbufs; i++) { + magic = bufs[i]; + nmagic = (uint32_t)(sizes[i] / sizeof(struct magic)); + if (check_buffer(ms, &magic, &nmagic, "private buffer") != 0) + goto error; + if (mlist_insert(ms, mlist, magic, nmagic, mapped) != 0) + goto error; + } + + return mlist; +error: + file_free_mlist(mlist); + return NULL; +} +#endif + /* const char *fn: list of magic files and directories */ protected struct mlist * file_apprentice(struct magic_set *ms, const char *fn, int action) @@ -2205,6 +2256,42 @@ } #ifndef COMPILE_ONLY +private int +check_buffer(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, + const char *dbname) +{ + uint32_t *ptr; + uint32_t version; + int needsbyteswap; + + ptr = (uint32_t *)(void *)*magicp; + if (*ptr != MAGICNO) { + if (swap4(*ptr) != MAGICNO) { + file_error(ms, 0, "bad magic in `%s'", dbname); + return -1; + } + needsbyteswap = 1; + } else + needsbyteswap = 0; + if (needsbyteswap) + version = swap4(ptr[1]); + else + version = ptr[1]; + if (version != VERSIONNO) { + file_error(ms, 0, "File %s supports only version %d magic " + "files. `%s' is version %d", VERSION, + VERSIONNO, dbname, version); + return -1; + } + if (*nmagicp > 0) + (*nmagicp)--; + (*magicp)++; + if (needsbyteswap) + byteswap(*magicp, *nmagicp); + + return 0; +} + /* * handle a compiled file. */ @@ -2214,9 +2301,6 @@ { int fd; struct stat st; - uint32_t *ptr; - uint32_t version; - int needsbyteswap; char *dbname = NULL; void *mm = NULL; @@ -2254,34 +2338,14 @@ } #define RET 1 #endif - *magicp = CAST(struct magic *, mm); (void)close(fd); fd = -1; - ptr = (uint32_t *)(void *)*magicp; - if (*ptr != MAGICNO) { - if (swap4(*ptr) != MAGICNO) { - file_error(ms, 0, "bad magic in `%s'", dbname); - goto error1; - } - needsbyteswap = 1; - } else - needsbyteswap = 0; - if (needsbyteswap) - version = swap4(ptr[1]); - else - version = ptr[1]; - if (version != VERSIONNO) { - file_error(ms, 0, "File %s supports only version %d magic " - "files. `%s' is version %d", VERSION, - VERSIONNO, dbname, version); + *magicp = CAST(struct magic *, mm); + *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic)); + + if (check_buffer(ms, magicp, nmagicp, dbname) != 0) goto error1; - } - *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic)); - if (*nmagicp > 0) - (*nmagicp)--; - (*magicp)++; - if (needsbyteswap) - byteswap(*magicp, *nmagicp); + free(dbname); return RET; ==== //depot/projects/ctsrd/cheribsd/src/contrib/file/file.h#3 (text+ko) ==== @@ -331,7 +331,8 @@ uint32_t nmagic; /* number of entries in array */ int mapped; /* allocation type: 0 => apprentice_file * 1 => apprentice_map + malloc - * 2 => apprentice_map + mmap */ + * 2 => apprentice_map + mmap + * 3 => caller owned */ struct mlist *next, *prev; }; @@ -415,7 +416,10 @@ protected int file_is_tar(struct magic_set *, const unsigned char *, size_t); protected int file_softmagic(struct magic_set *, const unsigned char *, size_t, int, int); +protected struct mlist *file_buffer_apprentice(struct magic_set *, + struct magic **, size_t *, int); protected struct mlist *file_apprentice(struct magic_set *, const char *, int); +protected void file_free_mlist(struct mlist *); protected uint64_t file_signextend(struct magic_set *, struct magic *, uint64_t); protected void file_delmagic(struct magic *, int type, size_t entries); ==== //depot/projects/ctsrd/cheribsd/src/contrib/file/magic.c#3 (text+ko) ==== @@ -71,7 +71,6 @@ #endif #endif -private void free_mlist(struct mlist *); #ifndef COMPILE_ONLY private void close_and_restore(const struct magic_set *, const char *, int, const struct stat *); @@ -239,8 +238,8 @@ return NULL; } -private void -free_mlist(struct mlist *mlist) +protected void +file_free_mlist(struct mlist *mlist) { struct mlist *ml; @@ -280,7 +279,7 @@ public void magic_close(struct magic_set *ms) { - free_mlist(ms->mlist); + file_free_mlist(ms->mlist); free(ms->o.pbuf); free(ms->o.buf); free(ms->c.li); @@ -295,18 +294,36 @@ { struct mlist *ml = file_apprentice(ms, magicfile, FILE_LOAD); if (ml) { - free_mlist(ms->mlist); + file_free_mlist(ms->mlist); + ms->mlist = ml; + return 0; + } + return -1; +} + +#ifndef COMPILE_ONLY +/* + * Install a set of compiled magic buffers. + */ +public int +magic_load_buffers(struct magic_set *ms, void **bufs, size_t *sizes, int nbufs) +{ + struct mlist *ml = file_buffer_apprentice(ms, (struct magic **)bufs, + sizes, nbufs); + if (ml) { + file_free_mlist(ms->mlist); ms->mlist = ml; return 0; } return -1; } +#endif public int magic_compile(struct magic_set *ms, const char *magicfile) { struct mlist *ml = file_apprentice(ms, magicfile, FILE_COMPILE); - free_mlist(ml); + file_free_mlist(ml); return ml ? 0 : -1; } @@ -314,7 +331,7 @@ magic_check(struct magic_set *ms, const char *magicfile) { struct mlist *ml = file_apprentice(ms, magicfile, FILE_CHECK); - free_mlist(ml); + file_free_mlist(ml); return ml ? 0 : -1; } @@ -322,7 +339,7 @@ magic_list(struct magic_set *ms, const char *magicfile) { struct mlist *ml = file_apprentice(ms, magicfile, FILE_LIST); - free_mlist(ml); + file_free_mlist(ml); return ml ? 0 : -1; } ==== //depot/projects/ctsrd/cheribsd/src/contrib/file/magic.h#3 (text+ko) ==== @@ -92,6 +92,8 @@ int magic_setflags(magic_t, int); int magic_load(magic_t, const char *); +int magic_load_buffers(struct magic_set *, void **, size_t *, int); + int magic_compile(magic_t, const char *); int magic_check(magic_t, const char *); int magic_list(magic_t, const char *); From owner-p4-projects@FreeBSD.ORG Thu Nov 29 17:14:27 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E5C5CBE; Thu, 29 Nov 2012 17:14: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 60158CBC for ; Thu, 29 Nov 2012 17:14:27 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 45D5E8FC0C for ; Thu, 29 Nov 2012 17:14:27 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qATHERqC039250 for ; Thu, 29 Nov 2012 17:14:27 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qATHERLW039247 for perforce@freebsd.org; Thu, 29 Nov 2012 17:14:27 GMT (envelope-from brooks@freebsd.org) Date: Thu, 29 Nov 2012 17:14:27 GMT Message-Id: <201211291714.qATHERLW039247@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219863 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2012 17:14:27 -0000 http://p4web.freebsd.org/@@219863?ac=10 Change 219863 by brooks@brooks_zenith on 2012/11/29 17:14:00 Checkpoint a trivial coversion to using the magic_load_buffers() API. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/minifile.c#3 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/minifile.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ #include #include +#include +#include #include #include @@ -20,6 +22,8 @@ SB_CHERI } sbtype = SB_NONE; +#define MAGIC_FILE "/usr/share/misc/magic.mgc" + static void usage(void) { @@ -31,12 +35,14 @@ main(int argc, char **argv) { char ch; + void *magicbuf; const char *fname; - int fd, status; + int mfd, fd, status; ssize_t rlen; pid_t pid; const char *type; struct magic_set *magic; + struct stat sb; char buf[4096], *ttype; int pfd[2]; @@ -62,7 +68,26 @@ magic = magic_open(MAGIC_MIME_TYPE); if (magic == NULL) errx(1, "magic_open()"); - if (magic_load(magic, NULL) == -1) { + mfd = open(MAGIC_FILE, O_RDONLY); + if (mfd == -1) { + warn("open(%s)", MAGIC_FILE); + magic_close(magic); + exit(1); + } + if (fstat(mfd, &sb) == -1) { + warn("fstat(%s)", MAGIC_FILE); + magic_close(magic); + exit(1); + } + magicbuf = mmap(NULL, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, + mfd, 0); + if (magicbuf == MAP_FAILED) { + warn("mmap(%s)", MAGIC_FILE); + magic_close(magic); + exit(1); + } + close(mfd); + if (magic_load_buffers(magic, &magicbuf, &sb.st_size, 1) == -1) { warnx("magic_load() %s", magic_error(magic)); magic_close(magic); exit(1); From owner-p4-projects@FreeBSD.ORG Thu Nov 29 19:37:56 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A5D93D9; Thu, 29 Nov 2012 19:37: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 D78FF3D7 for ; Thu, 29 Nov 2012 19:37:55 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BDDE48FC12 for ; Thu, 29 Nov 2012 19:37:55 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qATJbtlP046670 for ; Thu, 29 Nov 2012 19:37:55 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qATJbtVd046667 for perforce@freebsd.org; Thu, 29 Nov 2012 19:37:55 GMT (envelope-from brooks@freebsd.org) Date: Thu, 29 Nov 2012 19:37:55 GMT Message-Id: <201211291937.qATJbtVd046667@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219864 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2012 19:37:56 -0000 http://p4web.freebsd.org/@@219864?ac=10 Change 219864 by brooks@brooks_zenith on 2012/11/29 19:37:25 Add a couple more #ifndef COMPILE_ONLY statements so the compiler doesn't complain about mlist_insert() being unused. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#4 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#4 (text+ko) ==== @@ -110,11 +110,11 @@ const char *); private int apprentice_map(struct magic_set *, struct magic **, uint32_t *, const char *); +private int mlist_insert(struct magic_set *, struct mlist *, struct magic *, + uint32_t, int); #endif private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *, const char *); -private int mlist_insert(struct magic_set *, struct mlist *, struct magic *, - uint32_t, int); private int check_format_type(const char *, int); private int check_format(struct magic_set *, struct magic *); private int get_op(char); @@ -319,6 +319,7 @@ return 0; } +#ifndef COMPILE_ONLY private int mlist_insert(struct magic_set *ms, struct mlist *mlist, struct magic *magic, uint32_t nmagic, int mapped) @@ -342,6 +343,7 @@ return 0; } +#endif protected void file_delmagic(struct magic *p, int type, size_t entries) From owner-p4-projects@FreeBSD.ORG Fri Nov 30 02:36:08 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 920B96F; Fri, 30 Nov 2012 02:36: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 375486D for ; Fri, 30 Nov 2012 02:36:08 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 197E28FC0C for ; Fri, 30 Nov 2012 02:36:08 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAU2a7h7061534 for ; Fri, 30 Nov 2012 02:36:07 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAU2a74r061531 for perforce@freebsd.org; Fri, 30 Nov 2012 02:36:07 GMT (envelope-from brooks@freebsd.org) Date: Fri, 30 Nov 2012 02:36:07 GMT Message-Id: <201211300236.qAU2a74r061531@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 219865 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2012 02:36:08 -0000 http://p4web.freebsd.org/@@219865?ac=10 Change 219865 by brooks@brooks_zenith on 2012/11/30 02:35:07 Convert the capsicum sandbox support in minifile to use an exec'd helper program in prepration for the creation of a CHERI sandbox. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/Makefile#2 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/capsicum/Makefile#1 add .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/capsicum/minifile-capsicum.c#1 add .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/minifile.c#4 edit .. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/minifile.h#1 add Differences ... ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/Makefile#2 (text+ko) ==== @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ +SUBDIR+= capsicum + PROG= minifile MAN= ==== //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/minifile.c#4 (text+ko) ==== @@ -9,13 +9,14 @@ #include #include #include -#define _WITH_DPRINTF #include #include #include #include #include +#include "minifile.h" + enum _sbtype { SB_NONE = 0, SB_CAPSICUM, @@ -31,22 +32,131 @@ errx(1, "usage: minifile [-s ] ...\n"); } +/* + * prep_fds() moves the file descriptors in curfds around such that they + * are at the corresponding target fd values in preperation for an exec + * into a capsicum or similar sandbox. All fd's above the largest value + * specified in the targetfds array are closed. It is expected that the + * values will fall within the range (3 .. ). Otherwise an + * unpredictiable set of files may remain open and information leaks may + * result unless specifc descriptors were already placed in the other + * slots. The programmer should seperately ensure that fds 0, 1, and 2 + * are either the usual stdin, stdout, and stderror or fd's to /dev/null. + */ int +prep_fds(int *curfds, int *targetfds, int nfds) +{ + int i, maxfd = -1, tmpfd; + + /* Find the largest fd in either the current or target lists */ + for (i = 0; i < nfds; i++) + if (maxfd < curfds[i]) + maxfd = curfds[i]; + for (i = 0; i < nfds; i++) + if (maxfd < targetfds[i]) + maxfd = targetfds[i]; + + /* Move all the fds up above the largest one */ + for (i = 0; i < nfds; i++) { + tmpfd = maxfd + 1 + i; + if (dup2(curfds[i], tmpfd) == -1) + return (-1); + close(curfds[i]); + } + + /* Move them all into their assigned locations. */ + for (i = 0; i < nfds; i++) { + tmpfd = maxfd + 1 + i; + if (dup2(tmpfd, targetfds[i]) == -1) + return (-1); + close(tmpfd); + } + + /* Close everything above are new maximum descriptor */ + maxfd = -1; + for (i = 0; i < nfds; i++) + if (maxfd < targetfds[i]) + maxfd = targetfds[i]; + closefrom(maxfd + 1); + + return (0); +} + +const char * +capsicum_magic_descriptor(int mfd, int fd) +{ + int status; + pid_t pid; + ssize_t rlen; + static char buf[4096]; + char *type, *ttype; + int pfd[2]; + int curfds[3], targetfds[3]; + + if (pipe(pfd) == -1) + err(1, "pipe()"); + pid = fork(); + if (pid < 0) + err(1, "fork()"); + else if (pid == 0) { + close(pfd[0]); + + /* XXX: use cap_new() to limit further */ + curfds[0] = fd; + targetfds[0] = MINIFILE_FILE_FD; + curfds[1] = mfd; + targetfds[1] = MINIFILE_MAGIC_FD; + curfds[2] = pfd[1]; + targetfds[2] = MINIFILE_OUT_FD; + + if (prep_fds(curfds, targetfds, 3) == -1) + err(1, "pred_fds()"); + + execl("/usr/libexec/minifile-capsicum", "readpng", NULL); + err(1, "exec /usr/libexec/minifile-capsicum"); + } else { + close(pfd[1]); + while (wait4(pid, &status, 0, NULL) == -1) + if (errno != EINTR) + err(1, "wait4()"); + if (WIFEXITED(status) && WEXITSTATUS(status) != 0) { + warnx("child exited with %d", WEXITSTATUS(status)); + close(pfd[0]); + type = "badmagic"; + } else if(WIFSIGNALED(status)) { + warn("child killed by signal %d", WTERMSIG(status)); + close(pfd[0]); + type = "badmagic"; + } else { + rlen = read(pfd[0], buf, 128); + close(pfd[0]); + if (rlen == -1) + type = "read error"; + else if (rlen == 0 || rlen == 1) + type = "unknown"; + else { + /* Don't trust the result */ + ttype = buf + rlen; + strvisx(ttype, buf, rlen, 0); + type = ttype; + } + } + } + + return type; +} + +int main(int argc, char **argv) { char ch; void *magicbuf; const char *fname; - int mfd, fd, status; - ssize_t rlen; - pid_t pid; + int mfd, fd; const char *type; struct magic_set *magic; struct stat sb; - char buf[4096], *ttype; - int pfd[2]; - while ((ch = getopt(argc, argv, "s:")) != -1) { switch(ch) { case 's': @@ -65,38 +175,41 @@ argc -= optind; argv += optind; - magic = magic_open(MAGIC_MIME_TYPE); - if (magic == NULL) - errx(1, "magic_open()"); + if (argc <= 0) + usage(); + mfd = open(MAGIC_FILE, O_RDONLY); if (mfd == -1) { warn("open(%s)", MAGIC_FILE); magic_close(magic); exit(1); } - if (fstat(mfd, &sb) == -1) { - warn("fstat(%s)", MAGIC_FILE); - magic_close(magic); - exit(1); + + if (sbtype == SB_NONE) { + magic = magic_open(MAGIC_MIME_TYPE); + if (magic == NULL) + errx(1, "magic_open()"); + if (fstat(mfd, &sb) == -1) { + warn("fstat(%s)", MAGIC_FILE); + magic_close(magic); + exit(1); + } + magicbuf = mmap(NULL, sb.st_size, PROT_READ|PROT_WRITE, + MAP_PRIVATE, mfd, 0); + if (magicbuf == MAP_FAILED) { + warn("mmap(%s)", MAGIC_FILE); + magic_close(magic); + exit(1); + } + close(mfd); + if (magic_load_buffers(magic, &magicbuf, &sb.st_size, 1) == + -1) { + warnx("magic_load() %s", magic_error(magic)); + magic_close(magic); + exit(1); + } } - magicbuf = mmap(NULL, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, - mfd, 0); - if (magicbuf == MAP_FAILED) { - warn("mmap(%s)", MAGIC_FILE); - magic_close(magic); - exit(1); - } - close(mfd); - if (magic_load_buffers(magic, &magicbuf, &sb.st_size, 1) == -1) { - warnx("magic_load() %s", magic_error(magic)); - magic_close(magic); - exit(1); - } - - if (argc <= 0) - usage(); - for (; argc >= 1; argc--, argv++) { fname = argv[0]; fd = open(fname, O_RDONLY); @@ -106,58 +219,12 @@ case SB_NONE: type = magic_descriptor(magic, fd); if (type == NULL) - errx(1, "magic_file(): %s", - magic_error(magic)); + errx(1, "magic_file(): %s", magic_error(magic)); break; case SB_CAPSICUM: - if (pipe(pfd) == -1) - err(1, "pipe()"); - pid = fork(); - if (pid < 0) - err(1, "fork()"); - else if (pid == 0) { - close(fd); - close(pfd[0]); - /* XXX: do more cleanup here */ - cap_enter(); - type = magic_descriptor(magic, fd); - if (type == NULL) - dprintf(pfd[1], "badmagic"); - else - dprintf(pfd[1], "%s", type); - close(pfd[1]); - exit(0); - } else { - close(pfd[1]); - while (wait4(pid, &status, 0, NULL) == -1) - if (errno != EINTR) - err(1, "wait4()"); - if (WIFEXITED(status) && - WEXITSTATUS(status) != 0) { - warnx("child exited with %d", - WEXITSTATUS(status)); - close(pfd[0]); - type = "badmagic"; - } else if(WIFSIGNALED(status)) { - warn("child killed by signal %d", - WTERMSIG(status)); - close(pfd[0]); - type = "badmagic"; - } else { - rlen = read(pfd[0], buf, 128); - close(pfd[0]); - if (rlen == -1) - type = "read error"; - else if (rlen == 0 || rlen == 1) - type = "unknown"; - else { - /* Don't trust the result */ - ttype = buf + rlen; - strvisx(ttype, buf, rlen, 0); - type = ttype; - } - } - } + type = capsicum_magic_descriptor(mfd, fd); + if (type == NULL) + errx(1, "capsicum_magic_descriptor()"); break; case SB_CHERI: errx(1, "no cheri capability support yet"); From owner-p4-projects@FreeBSD.ORG Sat Dec 1 12:08:16 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9583B7D1; Sat, 1 Dec 2012 12:08: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 551F87CF for ; Sat, 1 Dec 2012 12:08:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3A0E08FC14 for ; Sat, 1 Dec 2012 12:08:16 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1C8Gp5039292 for ; Sat, 1 Dec 2012 12:08:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1C8FYA039289 for perforce@freebsd.org; Sat, 1 Dec 2012 12:08:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 12:08:15 GMT Message-Id: <201212011208.qB1C8FYA039289@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219867 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 12:08:17 -0000 http://p4web.freebsd.org/@@219867?ac=10 Change 219867 by rwatson@rwatson_cinnamon on 2012/12/01 12:07:59 Merge AUE_WAIT6 from FreeBSD 9. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#43 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#43 (text+ko) ==== @@ -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. # ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#10 (text+ko) ==== @@ -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 From owner-p4-projects@FreeBSD.ORG Sat Dec 1 12:09:18 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 004598CD; Sat, 1 Dec 2012 12:09: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 B574E8CB for ; Sat, 1 Dec 2012 12:09:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8BA278FC18 for ; Sat, 1 Dec 2012 12:09:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1C9HG0039323 for ; Sat, 1 Dec 2012 12:09:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1C9H86039320 for perforce@freebsd.org; Sat, 1 Dec 2012 12:09:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 12:09:17 GMT Message-Id: <201212011209.qB1C9H86039320@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219868 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 12:09:18 -0000 http://p4web.freebsd.org/@@219868?ac=10 Change 219868 by rwatson@rwatson_cinnamon on 2012/12/01 12:08:31 Note inclusion of AUE_WAIT6 in OpenBSM 1.2-alpha3. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#55 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#55 (text+ko) ==== @@ -4,6 +4,7 @@ - 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 @@ -494,4 +495,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#54 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#55 $ From owner-p4-projects@FreeBSD.ORG Sat Dec 1 12:36:46 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A65ED99; Sat, 1 Dec 2012 12:36:46 +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 5C77BD97 for ; Sat, 1 Dec 2012 12:36:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3F51A8FC0C for ; Sat, 1 Dec 2012 12:36:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1Cakqg040861 for ; Sat, 1 Dec 2012 12:36:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1CakVx040858 for perforce@freebsd.org; Sat, 1 Dec 2012 12:36:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 12:36:46 GMT Message-Id: <201212011236.qB1CakVx040858@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219869 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 12:36:46 -0000 http://p4web.freebsd.org/@@219869?ac=10 Change 219869 by rwatson@rwatson_cinnamon on 2012/12/01 12:36:19 Add previously omitted prototype for au_to_upriv(). Affected files ... .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#11 (text+ko) ==== @@ -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#11 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -278,6 +278,7 @@ 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-p4-projects@FreeBSD.ORG Sat Dec 1 12:44:55 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FB50EF4; Sat, 1 Dec 2012 12:44:55 +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 1201CEF2 for ; Sat, 1 Dec 2012 12:44:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EBC7C8FC13 for ; Sat, 1 Dec 2012 12:44:54 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1Cis0Y041033 for ; Sat, 1 Dec 2012 12:44:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1CisdR041030 for perforce@freebsd.org; Sat, 1 Dec 2012 12:44:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 12:44:54 GMT Message-Id: <201212011244.qB1CisdR041030@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219870 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 12:44:55 -0000 http://p4web.freebsd.org/@@219870?ac=10 Change 219870 by rwatson@rwatson_cinnamon on 2012/12/01 12:44:48 More firmly suggest using -Wall -Werror when developing on OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/INSTALL#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/INSTALL#8 (text+ko) ==== @@ -9,8 +9,8 @@ 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 From owner-p4-projects@FreeBSD.ORG Sat Dec 1 13:24:36 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C360F3DC; Sat, 1 Dec 2012 13:24: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 852FB3DA for ; Sat, 1 Dec 2012 13:24:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 688D88FC17 for ; Sat, 1 Dec 2012 13:24:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1DOawH042682 for ; Sat, 1 Dec 2012 13:24:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1DOaeo042678 for perforce@freebsd.org; Sat, 1 Dec 2012 13:24:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 13:24:36 GMT Message-Id: <201212011324.qB1DOaeo042678@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219871 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 13:24:36 -0000 http://p4web.freebsd.org/@@219871?ac=10 Change 219871 by rwatson@rwatson_cinnamon on 2012/12/01 13:23:46 Make endian.h tests more robust against -Wall -Werror. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#68 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#65 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#68 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#63 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#64 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for OpenBSM 1.2alpha3. # @@ -13559,12 +13559,14 @@ 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; ==== //depot/projects/trustedbsd/openbsm/configure.ac#65 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.2alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#64 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 $]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) @@ -217,12 +217,14 @@ #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]) From owner-p4-projects@FreeBSD.ORG Sat Dec 1 13:27:40 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B18F4E4; Sat, 1 Dec 2012 13:27:40 +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 F0E304E2 for ; Sat, 1 Dec 2012 13:27:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D3ACD8FC08 for ; Sat, 1 Dec 2012 13:27:39 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1DRdJQ042754 for ; Sat, 1 Dec 2012 13:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1DRdjq042751 for perforce@freebsd.org; Sat, 1 Dec 2012 13:27:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 13:27:39 GMT Message-Id: <201212011327.qB1DRdjq042751@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219872 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 13:27:40 -0000 http://p4web.freebsd.org/@@219872?ac=10 Change 219872 by rwatson@rwatson_cinnamon on 2012/12/01 13:27:20 Add omitted au_to_privset() function prototype. Affected files ... .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 (text+ko) ==== @@ -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#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#12 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -233,6 +233,7 @@ 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, From owner-p4-projects@FreeBSD.ORG Sat Dec 1 20:53:21 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51EFC95; Sat, 1 Dec 2012 20:53: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 0E08593 for ; Sat, 1 Dec 2012 20:53:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E49B78FC0C for ; Sat, 1 Dec 2012 20:53:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1KrKsx058611 for ; Sat, 1 Dec 2012 20:53:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB1KrKhK058608 for perforce@freebsd.org; Sat, 1 Dec 2012 20:53:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Dec 2012 20:53:20 GMT Message-Id: <201212012053.qB1KrKhK058608@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219873 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 20:53:21 -0000 http://p4web.freebsd.org/@@219873?ac=10 Change 219873 by rwatson@rwatson_fledge on 2012/12/01 20:52:56 Remove mention of cvsup from the TrustedBSD website; the FreeBSD Project doesn't really do that anymore. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#18 edit .. //depot/projects/trustedbsd/www/openbsm.page#44 edit .. //depot/projects/trustedbsd/www/privileges.page#7 edit .. //depot/projects/trustedbsd/www/sebsd.page#11 edit .. //depot/projects/trustedbsd/www/sourcecode.page#3 edit .. //depot/projects/trustedbsd/www/trustedbsd-supfile#4 delete Differences ... ==== //depot/projects/trustedbsd/www/Makefile#18 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#17 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#18 $ STYLESHEET= page.xsl @@ -77,7 +77,7 @@ IMGS+= trustyteenie.gif verticalbar1.gif wwwheader.gif IMGS+= trustyheader.png -DATA= trustedbsd-supfile trustedbsd-bsdcon-2000.pdf +DATA= trustedbsd-bsdcon-2000.pdf DATA+= trustedbsd-freenix-2001.pdf DATA+= trustedbsd-usenix2003freenix.pdf DATA+= trustedbsd-discex3.pdf ==== //depot/projects/trustedbsd/www/openbsm.page#44 (text+ko) ==== @@ -30,7 +30,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#43 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#44 $ @@ -42,10 +42,6 @@ Perforce: //depot/projects/trustedbsd/openbsm/...

-

- cvsup: - p4-cvs-trustedbsd-openbsm -

OpenBSM is a portable, open source implementation of Sun's Basic Security Module (BSM) security audit API and file format. @@ -129,8 +125,7 @@

OpenBSM source code is available for download via occasional snapshot and release tarballs, vendor integrated source code (such as - the FreeBSD source tree), cvsup, and the TrustedBSD Perforce - repository. + the FreeBSD source tree), and the TrustedBSD Perforce repository. The current release is OpenBSM 1.1p2, released on 2 August, 2009. Please see the file README present in the OpenBSM distribution for build and installation instructions.

==== //depot/projects/trustedbsd/www/privileges.page#7 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/privileges.page#6 $ + $P4: //depot/projects/trustedbsd/www/privileges.page#7 $ @@ -42,10 +42,6 @@ Perforce: //depot/projects/trustedbsd/cap/...

-

- Collection: - p4-cvs-trustedbsd-cap -

-->

In this past, this project was referred to as fine-grained @@ -77,7 +73,7 @@

The TrustedBSD privileges project is currently inactive, but an implementation of POSIX.1e privileges for an older FreeBSD release - is available and functional, and may be found in Perforce/cvsup. + is available and functional, and may be found in Perforce. Certain key files are provided in a tarball for download on this page.

==== //depot/projects/trustedbsd/www/sebsd.page#11 (text+ko) ==== @@ -38,7 +38,7 @@ - $P4: //depot/projects/trustedbsd/www/sebsd.page#10 $ + $P4: //depot/projects/trustedbsd/www/sebsd.page#11 $ @@ -76,10 +76,6 @@ Perforce: //depot/projects/trustedbsd/sebsd/...

-

- Collection: - p4-cvs-trustedbsd-sebsd -

-->

SEBSD is a port of NSA's FLASK/TE implementation in ==== //depot/projects/trustedbsd/www/sourcecode.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/sourcecode.page#2 $ + $P4: //depot/projects/trustedbsd/www/sourcecode.page#3 $ @@ -49,8 +49,8 @@ Apple, rather than downloaded directly from the TrustedBSD site by end users.

-

Individual component web pages may include Perforce, CVSUP, or - direct source code download options.

+

Individual component web pages may include Perforce, or direct + source code download options.