diff options
| author | delphij <delphij@FreeBSD.org> | 2010-03-29 18:24:08 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-03-29 18:24:08 +0000 |
| commit | 70d4783088d7892b70a079e52d770e6c7e930bce (patch) | |
| tree | b0ef7c88aa99a99b08d8f03f68b20b639dca5b20 /share | |
| parent | ea19a2d365de4656d1229118225a97974cf9c909 (diff) | |
| download | FreeBSD-src-70d4783088d7892b70a079e52d770e6c7e930bce.zip FreeBSD-src-70d4783088d7892b70a079e52d770e6c7e930bce.tar.gz | |
MFC r205702:
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.
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/src.conf.5 | 9 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 8c53f16..2d06d44 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: stable/8/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm .\" $FreeBSD$ -.Dd January 30, 2010 +.Dd March 29, 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: stable/8/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: stable/8/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}) |
