svn commit: r205702 - in head: . contrib/cpio gnu/usr.bin
gnu/usr.bin/cpio share/man/man5 share/mk tools/build/mk
tools/build/options usr.bin/cpio
Xin LI
delphij at FreeBSD.org
Fri Mar 26 17:02:32 UTC 2010
Author: delphij
Date: Fri Mar 26 17:02:32 2010
New Revision: 205702
URL: http://svn.freebsd.org/changeset/base/205702
Log:
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
Deleted:
head/contrib/cpio/
head/gnu/usr.bin/cpio/
head/tools/build/options/WITH_GNU_CPIO
Modified:
head/ObsoleteFiles.inc
head/gnu/usr.bin/Makefile
head/share/man/man5/src.conf.5
head/share/mk/bsd.own.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/cpio/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Fri Mar 26 16:45:21 2010 (r205701)
+++ head/ObsoleteFiles.inc Fri Mar 26 17:02:32 2010 (r205702)
@@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100326: gcpio removal
+OLD_FILES+=usr/bin/gcpio
+OLD_FILES+=usr/share/info/cpio.info.gz
+OLD_FILES+=usr/share/man/man1/gcpio.1.gz
+
# 20100322: libz update
OLD_LIBS+=lib/libz.so.5
.if ${TARGET_ARCH} == "amd64"
Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile Fri Mar 26 16:45:21 2010 (r205701)
+++ head/gnu/usr.bin/Makefile Fri Mar 26 17:02:32 2010 (r205702)
@@ -4,7 +4,6 @@
SUBDIR= ${_binutils} \
${_cc} \
- ${_cpio} \
${_cvs} \
dialog \
diff \
@@ -28,10 +27,6 @@ _groff= groff
.endif
.endif
-.if ${MK_GNU_CPIO} == "yes"
-_cpio= cpio
-.endif
-
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5 Fri Mar 26 16:45:21 2010 (r205701)
+++ head/share/man/man5/src.conf.5 Fri Mar 26 17:02:32 2010 (r205702)
@@ -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
.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.
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Fri Mar 26 16:45:21 2010 (r205701)
+++ head/share/mk/bsd.own.mk Fri Mar 26 17:02:32 2010 (r205702)
@@ -407,7 +407,6 @@ MK_${var}:= yes
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
- GNU_CPIO \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 26 16:45:21 2010 (r205701)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 26 17:02:32 2010 (r205702)
@@ -776,12 +776,6 @@ OLD_FILES+=usr/share/man/man1/gdbserver.
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
Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile Fri Mar 26 16:45:21 2010 (r205701)
+++ head/usr.bin/cpio/Makefile Fri Mar 26 17:02:32 2010 (r205702)
@@ -19,10 +19,8 @@ DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.endif
-.if ${MK_GNU_CPIO} != "yes"
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1
-.endif
.PHONY: check test
More information about the svn-src-all
mailing list