summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2010-03-26 17:02:32 +0000
committerdelphij <delphij@FreeBSD.org>2010-03-26 17:02:32 +0000
commitc77aa7eff5c02dcd44470555b9ff20e043cbbfe5 (patch)
tree5a2fbc89ff7ee943a93256a784acba403a9475db /share
parent8e6a6c380c1336a18e76be1d009aed8c83774fd1 (diff)
downloadFreeBSD-src-c77aa7eff5c02dcd44470555b9ff20e043cbbfe5.zip
FreeBSD-src-c77aa7eff5c02dcd44470555b9ff20e043cbbfe5.tar.gz
Remove GNU cpio after fix of CVE-2010-0624.
Note that this is actually a no-op for most users, as this GNU cpio was broken on -HEAD and 8-STABLE since last March until the recent fix. FreeBSD 8.0+ uses BSD cpio by default and the code is being actively maintained. Blessed by: kientzle With hat: secteam MFC after: 3 days
Diffstat (limited to 'share')
-rw-r--r--share/man/man5/src.conf.59
-rw-r--r--share/mk/bsd.own.mk1
2 files changed, 1 insertions, 9 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 241d101..8720a72 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm
.\" $FreeBSD$
-.Dd January 16, 2010
+.Dd March 26, 2010
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -339,13 +339,6 @@ When set, it also enforces the following options:
.It
.Va WITHOUT_GNU_SUPPORT
.El
-.It Va WITH_GNU_CPIO
-.\" from FreeBSD: head/tools/build/options/WITH_GNU_CPIO 179813 2008-06-16 05:48:15Z dougb
-Set to build GNU cpio as a part of the base system,
-and symlink
-.Pa /usr/bin/cpio
-to this version.
-(This will override the symlink to the BSD version.)
.It Va WITHOUT_GNU_GREP
.\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP 179813 2008-06-16 05:48:15Z dougb
Set to not build GNU grep as a part of the base system.
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 84ae433..777ff36 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -407,7 +407,6 @@ MK_${var}:= yes
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
- GNU_CPIO \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
OpenPOWER on IntegriCloud