summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc6
-rw-r--r--tools/build/options/WITH_GNU_CPIO6
2 files changed, 0 insertions, 12 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index dd5497e..78d32d7 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -776,12 +776,6 @@ OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
OLD_FILES+=usr/share/man/man1/kgdb.1.gz
.endif
-.if ${MK_GNU_CPIO} == no
-OLD_FILES+=usr/bin/gcpio
-OLD_FILES+=usr/share/info/cpio.info.gz
-OLD_FILES+=usr/share/man/man1/gcpio.1.gz
-.endif
-
.if ${MK_GPIB} == no
OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
OLD_FILES+=usr/include/dev/ieee488/ugpib.h
diff --git a/tools/build/options/WITH_GNU_CPIO b/tools/build/options/WITH_GNU_CPIO
deleted file mode 100644
index b4e756a..0000000
--- a/tools/build/options/WITH_GNU_CPIO
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" $FreeBSD$
-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.)
OpenPOWER on IntegriCloud