svn commit: r251794 - in head: . contrib/cvs etc etc/mtree gnu/usr.bin gnu/usr.bin/cvs share/doc/psd share/doc/psd/28.cvs share/mk tools/build/mk tools/build/options tools/tools/nanobsd/gateworks

Eitan Adler eadler at FreeBSD.org
Sat Jun 15 20:29:10 UTC 2013 

Author: eadler
Date: Sat Jun 15 20:29:07 2013
New Revision: 251794
URL: http://svnweb.freebsd.org/changeset/base/251794

Log:
  Remove CVS from the base system.
  
  Discussed with:	many
  Reviewed by:	peter, zi
  Approved by:	core

Deleted:
  head/contrib/cvs/
  head/gnu/usr.bin/cvs/
  head/share/doc/psd/28.cvs/
Modified:
  head/ObsoleteFiles.inc
  head/UPDATING
  head/etc/inetd.conf
  head/etc/mtree/BSD.usr.dist
  head/gnu/usr.bin/Makefile
  head/share/doc/psd/Makefile
  head/share/mk/bsd.own.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/build/options/WITHOUT_KERBEROS_SUPPORT
  head/tools/tools/nanobsd/gateworks/common

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/ObsoleteFiles.inc	Sat Jun 15 20:29:07 2013	(r251794)
@@ -38,6 +38,33 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130614: remove CVS from base
+OLD_FILES+=usr/bin/cvs
+OLD_FILES+=usr/bin/cvsbug
+OLD_FILES+=usr/share/examples/cvs/contrib/README
+OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
+OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
+OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
+OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
+OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
+OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
+OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
+OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
+OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
+OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
+OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
+OLD_FILES+=usr/share/examples/cvs/contrib/log
+OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
+OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
+OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
+OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
+OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
+OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
+OLD_FILES+=usr/share/info/cvs.info.gz
+OLD_FILES+=usr/share/info/cvsclient.info.gz
+OLD_FILES+=usr/share/man/man1/cvs.1.gz
+OLD_FILES+=usr/share/man/man5/cvs.5.gz
+OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3.

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/UPDATING	Sat Jun 15 20:29:07 2013	(r251794)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130615:
+	CVS has been removed from the base system.  An exact copy
+	of the code is available from the devel/cvs port.
+
 20130613:
 	Some people report the following error after the switch to bmake:
 

Modified: head/etc/inetd.conf
==============================================================================
--- head/etc/inetd.conf	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/etc/inetd.conf	Sat Jun 15 20:29:07 2013	(r251794)
@@ -58,8 +58,8 @@
 # --allow-root path correctly or you open a trivial to exploit but
 # deadly security hole.
 #
-#cvspserver	stream	tcp	nowait	root	/usr/bin/cvs	cvs --allow-root=/your/cvsroot/here pserver
-#cvspserver	stream	tcp	nowait	root	/usr/bin/cvs	cvs --allow-root=/your/cvsroot/here kserver
+#cvspserver	stream	tcp	nowait	root	/usr/local/bin/cvs	cvs --allow-root=/your/cvsroot/here pserver
+#cvspserver	stream	tcp	nowait	root	/usr/local/bin/cvs	cvs --allow-root=/your/cvsroot/here kserver
 #
 # RPC based services (you MUST have rpcbind running to use these)
 #

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/etc/mtree/BSD.usr.dist	Sat Jun 15 20:29:07 2013	(r251794)
@@ -148,8 +148,6 @@
                 ..
                 27.nfsrfc
                 ..
-                28.cvs
-                ..
             ..
             smm
                 01.setup
@@ -223,10 +221,6 @@
             ..
             csh
             ..
-            cvs
-                contrib
-                ..
-            ..
             cvsup
             ..
             diskless

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/gnu/usr.bin/Makefile	Sat Jun 15 20:29:07 2013	(r251794)
@@ -4,7 +4,6 @@
 
 SUBDIR= ${_binutils} \
 	${_cc} \
-	${_cvs} \
 	dialog \
 	diff \
 	diff3 \
@@ -26,10 +25,6 @@ _groff=		groff
 .endif
 .endif
 
-.if ${MK_CVS} != "no"
-_cvs=		cvs
-.endif
-
 .if ${MK_GPL_DTC} != "no"
 _dtc=		dtc
 .endif

Modified: head/share/doc/psd/Makefile
==============================================================================
--- head/share/doc/psd/Makefile	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/share/doc/psd/Makefile	Sat Jun 15 20:29:07 2013	(r251794)
@@ -35,7 +35,6 @@ SUBDIR+=22.rpcgen \
 	24.xdr \
 	25.xdrrfc \
 	26.rpcrfc \
-	27.nfsrpc \
-	28.cvs
+	27.nfsrpc
 
 .include <bsd.subdir.mk>

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/share/mk/bsd.own.mk	Sat Jun 15 20:29:07 2013	(r251794)
@@ -272,7 +272,6 @@ __DEFAULT_YES_OPTIONS = \
     CROSS_COMPILER \
     CRYPT \
     CTM \
-    CVS \
     CXX \
     DICT \
     DYNAMICROOT \

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sat Jun 15 20:29:07 2013	(r251794)
@@ -889,35 +889,6 @@ OLD_FILES+=usr/share/man/man1/ctm_smail.
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 .endif
 
-.if ${MK_CVS} == no
-OLD_FILES+=usr/bin/cvs
-OLD_FILES+=usr/bin/cvsbug
-OLD_FILES+=usr/share/examples/cvs/contrib/README
-OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
-OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
-OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
-OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
-OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
-OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
-OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
-OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
-OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
-OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
-OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
-OLD_FILES+=usr/share/examples/cvs/contrib/log
-OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
-OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
-OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
-OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
-OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
-OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
-OLD_FILES+=usr/share/info/cvs.info.gz
-OLD_FILES+=usr/share/info/cvsclient.info.gz
-OLD_FILES+=usr/share/man/man1/cvs.1.gz
-OLD_FILES+=usr/share/man/man5/cvs.5.gz
-OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
-.endif
-
 # devd(8) and gperf(1) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC

Modified: head/tools/build/options/WITHOUT_KERBEROS_SUPPORT
==============================================================================
--- head/tools/build/options/WITHOUT_KERBEROS_SUPPORT	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/build/options/WITHOUT_KERBEROS_SUPPORT	Sat Jun 15 20:29:07 2013	(r251794)
@@ -1,6 +1,5 @@
 .\" $FreeBSD$
 Set to build some programs without Kerberos support, like
-.Xr cvs 1 ,
 .Xr ssh 1 ,
 .Xr telnet 1 ,
 .Xr sshd 8 ,

Modified: head/tools/tools/nanobsd/gateworks/common
==============================================================================
--- head/tools/tools/nanobsd/gateworks/common	Sat Jun 15 13:38:21 2013	(r251793)
+++ head/tools/tools/nanobsd/gateworks/common	Sat Jun 15 20:29:07 2013	(r251794)
@@ -113,7 +113,6 @@ WITHOUT_BSNMP=true
 WITHOUT_CALENDAR=true
 WITHOUT_CDDL=true
 WITHOUT_CTM=true
-WITHOUT_CVS=true
 WITHOUT_DICT=true
 WITHOUT_EXAMPLES=true
 WITHOUT_FLOPPY=true

More information about the svn-src-all mailing list