Date: Mon, 29 Mar 2010 18:24:08 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r205848 - in stable/8: . contrib/cpio gnu/usr.bin gnu/usr.bin/cpio share/man/man5 share/mk tools/build/mk tools/build/options usr.bin/cpio Message-ID: <201003291824.o2TIO8fF035001@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Mar 29 18:24:08 2010 New Revision: 205848 URL: http://svn.freebsd.org/changeset/base/205848 Log: 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. Deleted: stable/8/contrib/cpio/ stable/8/gnu/usr.bin/cpio/ stable/8/tools/build/options/WITH_GNU_CPIO Modified: stable/8/ObsoleteFiles.inc (contents, props changed) stable/8/gnu/usr.bin/Makefile (contents, props changed) stable/8/share/man/man5/src.conf.5 stable/8/share/mk/bsd.own.mk stable/8/tools/build/mk/OptionalObsoleteFiles.inc stable/8/usr.bin/cpio/Makefile Directory Properties: stable/8/contrib/ (props changed) stable/8/share/man/man5/ (props changed) stable/8/share/mk/ (props changed) stable/8/tools/build/mk/ (props changed) stable/8/tools/build/options/ (props changed) stable/8/usr.bin/cpio/ (props changed) Modified: stable/8/ObsoleteFiles.inc ============================================================================== --- stable/8/ObsoleteFiles.inc Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/ObsoleteFiles.inc Mon Mar 29 18:24:08 2010 (r205848) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100329: gcpio removal +OLD_FILES+=usr/bin/gcpio +OLD_FILES+=usr/share/info/cpio.info.gz +OLD_FILES+=usr/share/man/man1/gcpio.1.gz # 20100301: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz Modified: stable/8/gnu/usr.bin/Makefile ============================================================================== --- stable/8/gnu/usr.bin/Makefile Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/gnu/usr.bin/Makefile Mon Mar 29 18:24:08 2010 (r205848) @@ -5,7 +5,6 @@ SUBDIR= bc \ ${_binutils} \ ${_cc} \ - ${_cpio} \ ${_cvs} \ dc \ dialog \ @@ -34,10 +33,6 @@ _groff= groff .endif .endif -.if ${MK_GNU_CPIO} == "yes" -_cpio= cpio -.endif - .if ${MK_CVS} != "no" _cvs= cvs .endif Modified: stable/8/share/man/man5/src.conf.5 ============================================================================== --- stable/8/share/man/man5/src.conf.5 Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/share/man/man5/src.conf.5 Mon Mar 29 18:24:08 2010 (r205848) @@ -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 .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. Modified: stable/8/share/mk/bsd.own.mk ============================================================================== --- stable/8/share/mk/bsd.own.mk Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/share/mk/bsd.own.mk Mon Mar 29 18:24:08 2010 (r205848) @@ -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: stable/8/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc Mon Mar 29 18:24:08 2010 (r205848) @@ -394,12 +394,6 @@ OLD_FILES+=usr/share/man/man1/gcov.1.gz # to be filled in #.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 # none #.endif Modified: stable/8/usr.bin/cpio/Makefile ============================================================================== --- stable/8/usr.bin/cpio/Makefile Mon Mar 29 18:04:06 2010 (r205847) +++ stable/8/usr.bin/cpio/Makefile Mon Mar 29 18:24:08 2010 (r205848) @@ -19,10 +19,8 @@ LDADD+= -larchive -lz -lbz2 -lmd LDADD+= -lcrypto .endif -.if ${MK_GNU_CPIO} != "yes" SYMLINKS=bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 -.endif .PHONY: check test
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003291824.o2TIO8fF035001>