From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 20:51:47 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CE681065693;
	Sat, 30 Jan 2010 20:51:47 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D7948FC17;
	Sat, 30 Jan 2010 20:51:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UKplaq005134;
	Sat, 30 Jan 2010 20:51:47 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UKplnw005131;
	Sat, 30 Jan 2010 20:51:47 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001302051.o0UKplnw005131@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 20:51:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203251 - in projects/capabilities8: share/mk
	usr.bin/gzip
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 20:51:47 -0000

Author: rwatson
Date: Sat Jan 30 20:51:46 2010
New Revision: 203251
URL: http://svn.freebsd.org/changeset/base/203251

Log:
  Merge c173934 and c173936 from the p4 TrustedBSD Capabilities branch to
  capbilities8:
  
    LIBCAPABILITY->LIBCAPSICUM.
  
    Clean up some loose end references to libcapability.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/share/mk/bsd.libnames.mk
  projects/capabilities8/usr.bin/gzip/Makefile

Modified: projects/capabilities8/share/mk/bsd.libnames.mk
==============================================================================
--- projects/capabilities8/share/mk/bsd.libnames.mk	Sat Jan 30 20:42:26 2010	(r203250)
+++ projects/capabilities8/share/mk/bsd.libnames.mk	Sat Jan 30 20:51:46 2010	(r203251)
@@ -30,7 +30,7 @@ LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
-LIBCAPABILITY?=	${DESTDIR}${LIBDIR}/libcapability.a
+LIBCAPSICUM?=	${DESTDIR}${LIBDIR}/libcapsicum.a
 LIBCOM_ERR?=	${DESTDIR}${LIBDIR}/libcom_err.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a

Modified: projects/capabilities8/usr.bin/gzip/Makefile
==============================================================================
--- projects/capabilities8/usr.bin/gzip/Makefile	Sat Jan 30 20:42:26 2010	(r203250)
+++ projects/capabilities8/usr.bin/gzip/Makefile	Sat Jan 30 20:51:46 2010	(r203251)
@@ -7,7 +7,7 @@ PROG=		gzip
 MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
 SRCS=		gzip.c gzsandbox.c
 
-DPADD=		${LIBZ} ${LIBCAPABILITY}
+DPADD=		${LIBZ} ${LIBCAPSICUM}
 LDADD=		-lz -lcapsicum
 WARNS?=		6
 CFLAGS+=	-rdynamic			# For sandbox cap_main