svn commit: r203251 - in projects/capabilities8: share/mk usr.bin/gzip

[Robert Watson]

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