Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jan 2012 21:57:59 +0000 (UTC)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r229319 - in head: share/man/man5 share/mk tools/build/options
Message-ID:  <201201022157.q02Lvxmi089384@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rwatson
Date: Mon Jan  2 21:57:58 2012
New Revision: 229319
URL: http://svn.freebsd.org/changeset/base/229319

Log:
  Add WITHOUT_CAPSICUM src.conf(5) define, which can be used to compile out
  use of Capsicum by userspace applications.
  
  MFC after:	3 weeks
  Sponsored by:	Google, Inc.

Added:
  head/tools/build/options/WITHOUT_CAPSICUM   (contents, props changed)
Modified:
  head/share/man/man5/src.conf.5
  head/share/mk/bsd.own.mk

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Mon Jan  2 20:39:59 2012	(r229318)
+++ head/share/man/man5/src.conf.5	Mon Jan  2 21:57:58 2012	(r229319)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
 .\" $FreeBSD$
-.Dd December 2, 2011
+.Dd December 30, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -251,6 +251,9 @@ Set to build some programs without optio
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CALENDAR 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr calendar 1 .
+.It Va WITHOUT_CAPSICUM
+.\" $FreeBSD$
+Set to not build Capsicum support into system programs.
 .It Va WITHOUT_CDDL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb
 Set to not build code licensed under Sun's CDDL.
@@ -821,7 +824,7 @@ Set to not build
 .Xr ppp 8
 and related programs.
 .It Va WITHOUT_PROFILE
-.\" from FreeBSD: head/tools/build/options/WITH_PROFILE 228143 2011-11-29 19:46:17Z fjoe
+.\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 228196 2011-12-02 09:09:54Z fjoe
 Set to avoid compiling profiled libraries.
 .It Va WITHOUT_QUOTAS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Mon Jan  2 20:39:59 2012	(r229318)
+++ head/share/mk/bsd.own.mk	Mon Jan  2 21:57:58 2012	(r229319)
@@ -322,6 +322,7 @@ __DEFAULT_YES_OPTIONS = \
     BSNMP \
     BZIP2 \
     CALENDAR \
+    CAPSICUM \
     CDDL \
     CPP \
     CRYPT \

Added: head/tools/build/options/WITHOUT_CAPSICUM
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_CAPSICUM	Mon Jan  2 21:57:58 2012	(r229319)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build Capsicum support into system programs.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201022157.q02Lvxmi089384>