The World Order has changed. We no longer need separate "secure"

collections for crypto code; these are merged into cvs-all and
src-all.
OKed by:	jdp

9 files changed, 18 insertions, 313 deletions

diff --git a/share/examples/cvsup/4.x-secure-stable-supfile b/share/examples/cvsup/4.x-secure-stable-supfile
deleted file mode 100644
index abea5ab..0000000
--- a/share/examples/cvsup/4.x-secure-stable-supfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $FreeBSD$
-#
-# This file contains all of the "CVSup collections" that make up the
-# source tree of the FreeBSD-stable international secure distribution.
-# If you are outside the USA or Canada, use this file.
-#
-# CVSup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently (far more so than with sup, which CVSup is aimed
-# at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows
-# to keep your CVS tree up-to-date:
-#
-#	cvsup secure-stable-supfile
-#
-# If not running X, or invoking cvsup from a non-interactive script, then
-# run it as follows:
-#
-#	cvsup -g -L 2 secure-stable-supfile
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# base=/usr
-#		This specifies the root where CVSup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/usr" will generate this information in
-#		/usr/sup.  Even if you are CVSupping a large number of
-#		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.  You can override the
-#		"base" setting on the command line with cvsup's "-b base"
-#		option.  This directory must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/crypto" and "/usr/src/secure").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-*default host=cvsup.internat.FreeBSD.org
-*default base=/usr
-*default prefix=/usr
-# The following line is for 4-stable.  If you want 3.x-stable, change
-# "RELENG_4" to "RELENG_3".
-*default release=cvs tag=RELENG_4
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-*default compress
-
-## The international secure collections.
-cvs-crypto
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
-#src-crypto
-#src-secure
-#src-sys-crypto
diff --git a/share/examples/cvsup/4.x-stable-supfile b/share/examples/cvsup/4.x-stable-supfile
index d604e99..179d243 100644
--- a/share/examples/cvsup/4.x-stable-supfile
+++ b/share/examples/cvsup/4.x-stable-supfile
@@ -101,19 +101,10 @@ src-all
 #src-tools
 #src-usrbin
 #src-usrsbin
-
-## Export-restricted collections.
-#
-# Only people in the USA and Canada may fetch these collections.  If
-# you are not in the USA or Canada, please use the collections in the
-# "secure-stable-supfile" instead.
-#
-# The easiest way to get the export-restricted code is to use the
-# "cvs-crypto" mega-collection.
-#cvs-crypto
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
+# These are the individual collections that make up FreeBSD's crypto
+# collection. They are no longer export-restricted and are a part of
+# src-all
 #src-crypto
+#src-eBones
 #src-secure
 #src-sys-crypto
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
index 98f069c0..2d1f12b 100644
--- a/share/examples/cvsup/README
+++ b/share/examples/cvsup/README
@@ -5,30 +5,21 @@ the FreeBSD sources via the Internet.  These supfiles will work
 with CVSup version 14.0 or later.  For general information on CVSup
 itself, please see http://www.freebsd.org/handbook/cvsup.html
 
-To maintain the sources for the FreeBSD-current release, use these files:
+To maintain the sources for the FreeBSD-current release, use:
 
     standard-supfile		Main source tree
 
-    secure-supfile		International secure distribution
-				(outside USA and Canada)
-
     ports-supfile		Ports collection
 
-To maintain the sources for the FreeBSD-stable release, use these files:
+To maintain the sources for the FreeBSD-stable release, use:
 
     stable-supfile		Main source tree
 
-    secure-stable-supfile	International secure distribution
-				(outside USA and Canada)
-
 To maintain a copy of the CVS repository containing all versions of
-FreeBSD, use these files:
+FreeBSD, use:
 
     cvs-supfile			Main source tree and ports collection
 
-    secure-cvs-supfile		International secure distribution
-				(outside USA and Canada)
-
 To maintain a copy of the FreeBSD bug database, use the file:
 
     gnats-supfile               FreeBSD bug database
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
index 408e4ca..3cb9ec2 100644
--- a/share/examples/cvsup/cvs-supfile
+++ b/share/examples/cvsup/cvs-supfile
@@ -85,27 +85,13 @@ src-all
 #src-tools
 #src-usrbin
 #src-usrsbin
-
-## Export-restricted collections.
-#
-# Only people in the USA and Canada may fetch these collections.  If
-# you are not in the USA or Canada, please use the collections in the
-# "secure-cvs-supfile" instead.
-#
-# The easiest way to get the export-restricted code is to use the
-# "cvs-crypto" mega-collection.  It does not include "src-crypto-rsa".
-#cvs-crypto
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
+# These are the individual collections that make up FreeBSD's crypto
+# collection. They are no longer export-restricted and are a part of
+# src-all
 #src-crypto
 #src-eBones
 #src-secure
 #src-sys-crypto
-#
-# This collection contains the openssl implementation of RSA.  Only request
-# it if you are looking at it for educational purposes or have an RSA license.
-#src-crypto-rsa
 
 ## Ports Collection.
 #
diff --git a/share/examples/cvsup/secure-cvs-supfile b/share/examples/cvsup/secure-cvs-supfile
deleted file mode 100644
index 22ca8f0..0000000
--- a/share/examples/cvsup/secure-cvs-supfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-#
-# This file contains all of the "CVSup collections" that make up the CVS
-# development tree of the FreeBSD international secure distribution.  If
-# you are outside the USA or Canada, use this file.
-#
-# CVSup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently (far more so than with sup, which CVSup is aimed
-# at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows
-# to keep your CVS tree up-to-date:
-#
-#	cvsup secure-cvs-supfile
-#
-# If not running X, or invoking cvsup from a non-interactive script, then
-# run it as follows:
-#
-#	cvsup -g -L 2 secure-cvs-supfile
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# base=/usr
-#		This specifies the root where CVSup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/usr" will generate this information in
-#		/usr/sup.  Even if you are CVSupping a large number of
-#		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.  You can override the
-#		"base" setting on the command line with cvsup's "-b base"
-#		option.  This directory must exist in order to run CVSup.
-#
-# prefix=/home/ncvs
-#		This specifies where to place the requested files.  A
-#		setting of "/home/ncvs" will place all of the files
-#		requested in /home/ncvs (e.g., "/home/ncvs/src/bin",
-#		"/home/ncvs/ports/archivers").  The prefix directory
-#		must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-*default host=cvsup.internat.FreeBSD.org
-*default base=/usr
-*default prefix=/home/ncvs
-*default release=cvs
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-*default compress
-
-## The international secure collections.
-cvs-crypto
-src-crypto-rsa
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
-#src-crypto
-#src-eBones
-#src-secure
-#src-sys-crypto
diff --git a/share/examples/cvsup/secure-stable-supfile b/share/examples/cvsup/secure-stable-supfile
deleted file mode 100644
index fa329a1..0000000
--- a/share/examples/cvsup/secure-stable-supfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-#
-# This file contains all of the "CVSup collections" that make up the
-# source tree of the FreeBSD-stable international secure distribution.
-# If you are outside the USA or Canada, use this file.
-#
-# CVSup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently (far more so than with sup, which CVSup is aimed
-# at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows
-# to keep your CVS tree up-to-date:
-#
-#	cvsup secure-stable-supfile
-#
-# If not running X, or invoking cvsup from a non-interactive script, then
-# run it as follows:
-#
-#	cvsup -g -L 2 secure-stable-supfile
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# base=/usr
-#		This specifies the root where CVSup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/usr" will generate this information in
-#		/usr/sup.  Even if you are CVSupping a large number of
-#		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.  You can override the
-#		"base" setting on the command line with cvsup's "-b base"
-#		option.  This directory must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/crypto" and "/usr/src/secure").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-*default host=cvsup.internat.FreeBSD.org
-*default base=/usr
-*default prefix=/usr
-# The following line is for 3-stable.  If you want 2.2-stable, change
-# "RELENG_3" to "RELENG_2_2".
-*default release=cvs tag=RELENG_3
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-*default compress
-
-## The international secure collections.
-cvs-crypto
-src-crypto-rsa
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
-#src-crypto
-#src-secure
-#src-sys-crypto
diff --git a/share/examples/cvsup/secure-supfile b/share/examples/cvsup/secure-supfile
deleted file mode 100644
index 5a9d6c4..0000000
--- a/share/examples/cvsup/secure-supfile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-#
-# This file contains all of the "CVSup collections" that make up the
-# source tree of the FreeBSD-current international secure distribution.
-# If you are outside the USA or Canada, use this file.
-#
-# CVSup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently (far more so than with sup, which CVSup is aimed
-# at replacing).  If you're running CVSup interactively, and are
-# currently using an X display server, you should run CVSup as follows
-# to keep your CVS tree up-to-date:
-#
-#	cvsup secure-supfile
-#
-# If not running X, or invoking cvsup from a non-interactive script, then
-# run it as follows:
-#
-#	cvsup -g -L 2 secure-supfile
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# base=/usr
-#		This specifies the root where CVSup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/usr" will generate this information in
-#		/usr/sup.  Even if you are CVSupping a large number of
-#		collections, you will be hard pressed to generate more than
-#		~1MB of data in this directory.  You can override the
-#		"base" setting on the command line with cvsup's "-b base"
-#		option.  This directory must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/crypto" and "/usr/src/secure").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-*default host=cvsup.internat.FreeBSD.org
-*default base=/usr
-*default prefix=/usr
-*default release=cvs tag=.
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-*default compress
-
-## The international secure collections.
-cvs-crypto
-src-crypto-rsa
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
-#src-crypto
-#src-secure
-#src-sys-crypto
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
index e6d067d..a6d2eb3 100644
--- a/share/examples/cvsup/stable-supfile
+++ b/share/examples/cvsup/stable-supfile
@@ -101,23 +101,10 @@ src-all
 #src-tools
 #src-usrbin
 #src-usrsbin
-
-## Export-restricted collections.
-#
-# Only people in the USA and Canada may fetch these collections.  If
-# you are not in the USA or Canada, please use the collections in the
-# "secure-stable-supfile" instead.
-#
-# The easiest way to get the export-restricted code is to use the
-# "cvs-crypto" mega-collection.  It does not include "src-crypto-rsa".
-#cvs-crypto
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
+# These are the individual collections that make up FreeBSD's crypto
+# collection. They are no longer export-restricted and are a part of
+# src-all
 #src-crypto
+#src-eBones
 #src-secure
 #src-sys-crypto
-#
-# This collection contains the openssl implementation of RSA.  Only request
-# it if you are looking at it for educational purposes or have an RSA license.
-#src-crypto-rsa
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
index 259995c..82889ac 100644
--- a/share/examples/cvsup/standard-supfile
+++ b/share/examples/cvsup/standard-supfile
@@ -84,23 +84,10 @@ src-all
 #src-tools
 #src-usrbin
 #src-usrsbin
-
-## Export-restricted collections.
-#
-# Only people in the USA and Canada may fetch these collections.  If
-# you are not in the USA or Canada, please use the collections in the
-# "secure-supfile" instead.
-#
-# The easiest way to get the export-restricted code is to use the
-# "cvs-crypto" mega-collection.  It does not include "src-crypto-rsa".
-#cvs-crypto
-#
-# These are the individual collections that make up "cvs-crypto".  If
-# you use these, be sure to comment out "cvs-crypto" above.
+# These are the individual collections that make up FreeBSD's crypto
+# collection. They are no longer export-restricted and are a part of
+# src-all
 #src-crypto
+#src-eBones
 #src-secure
 #src-sys-crypto
-#
-# This collection contains the openssl implementation of RSA.  Only request
-# it if you are looking at it for educational purposes or have an RSA license.
-#src-crypto-rsa