From 7512bc909c84339f413ebf218bf0793aa9e0aecd Mon Sep 17 00:00:00 2001 From: Alexander Langer Date: Sun, 9 Jul 2000 18:09:37 +0000 Subject: [PATCH] Adjust for crypto changes: - Move crypto-stuff from extra part into src-all part - Remove all extra pointers to "export restricted" - Remove all international-crypto parts - internat.freebsd.org --> za.freebsd.org Asked by: jdp --- .../books/handbook/mirrors/chapter.sgml | 264 ++++-------------- .../books/handbook/mirrors/chapter.sgml | 264 ++++-------------- 2 files changed, 108 insertions(+), 420 deletions(-) diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml index 37b29de219..6bbea2c9a7 100644 --- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml @@ -1,7 +1,7 @@ @@ -820,64 +820,6 @@ - - The latest versions of export-restricted code for FreeBSD (2.0C or - later) (eBones and secure) are being made available at the following - locations. If you are outside the U.S. or Canada, please get secure - (DES) and eBones (Kerberos) from one of the following foreign - distribution sites: - - - - South Africa - - - Hostmaster hostmaster@internat.FreeBSD.org for - this domain. - - - - ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/ - - - - ftp://ftp2.internat.FreeBSD.org/pub/FreeBSD/ - - - - - - - Brazil - - - Hostmaster hostmaster@br.FreeBSD.org for this - domain. - - - - ftp://ftp.br.FreeBSD.org/pub/FreeBSD/ - - - - - - - Finland - - - - - ftp://nic.funet.fi/pub/unix/FreeBSD/eurocrypt/ Contact: count@nic.funet.fi. - - - - - @@ -1162,11 +1104,7 @@ Miscellaneous stuff - All the “DES infected” (e.g. export controlled) - source is not included. You will get the - “international” version only. If sufficient - interest appears, we will set up a sec-cur - sequence too. There is a sequence of deltas for the + There is a sequence of deltas for the ports collection too, but interest has not been all that high yet. Tell me if you want an email list for that too and we will consider setting it up. @@ -1215,7 +1153,7 @@ ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/CTM/ + url="ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ @@ -1413,17 +1351,14 @@ linkend="cvsup-collec">here. In this example, we wish to receive the entire main source tree for the FreeBSD system. There is a single large collection - src-all which will give us all of that, - except the export-controlled cryptography support. Let us - assume for this example that we are in the USA or Canada. - Then we can get the cryptography code with one additional - collection, cvs-crypto. As a first step - toward constructing our supfile, we - simply list these collections, one per line: + src-all which will give us all of that. + As a first step toward constructing our + supfile, we + simply list the collections, one per line (in this case, + only one line): -src-all -cvs-crypto +src-all @@ -1765,8 +1700,7 @@ cvs-crypto *default base=/usr/local/etc/cvsup *default release=cvs delete use-rel-suffix compress -src-all -cvs-crypto +src-all @@ -1917,7 +1851,7 @@ cvs-crypto the use of indentation in the list below. The most commonly used collections are - src-all, cvs-crypto, and + src-all, and ports-all. The other collections are used only by small groups of people for specialized purposes, and some mirror sites may not carry all of them. @@ -1927,8 +1861,8 @@ cvs-crypto cvs-all release=cvs - The main FreeBSD CVS repository, excluding the - export-restricted cryptography code. + The main FreeBSD CVS repository, including the + cryptography code. @@ -2382,8 +2316,8 @@ cvs-crypto src-all release=cvs - The main FreeBSD sources, excluding the - export-restricted cryptography code. + The main FreeBSD sources, including the + cryptography code. @@ -2418,6 +2352,27 @@ cvs-crypto + + src-crypto release=cvs + + + Cryptography utilities and libraries from + outside the FreeBSD project, used relatively + unmodified + (/usr/src/crypto). + + + + + src-eBones release=cvs + + + Kerberos and DES + (/usr/src/eBones). Not + used in current releases of FreeBSD. + + + src-etc release=cvs @@ -2509,6 +2464,14 @@ cvs-crypto (/usr/src/release). + + + src-secure release=cvs + + + DES (/usr/src/secure). + + src-sbin @@ -2541,6 +2504,16 @@ cvs-crypto + + src-sys-crypto + release=cvs + + + Kernel cryptography code + (/usr/src/sys/crypto). + + + src-tools release=cvs @@ -2586,55 +2559,6 @@ cvs-crypto - - cvs-crypto release=cvs - - - The export-restricted cryptography code. - - - - src-crypto release=cvs - - - Export-restricted utilities and libraries from - outside the FreeBSD project, used relatively - unmodified - (/usr/src/crypto). - - - - - src-eBones release=cvs - - - Kerberos and DES - (/usr/src/eBones). Not - used in current releases of FreeBSD. - - - - - src-secure release=cvs - - - DES (/usr/src/secure). - - - - - src-sys-crypto - release=cvs - - - Kernel cryptography code - (/usr/src/sys/crypto). - - - - - - distrib release=self @@ -3228,86 +3152,6 @@ cvs-crypto - The export-restricted code for FreeBSD (eBones and secure) is - available via CVSup at the following - international repository. Please use this site to get the - export-restricted code, if you are outside the USA or Canada. - - - - South Africa - - - - - cvsup.internat.FreeBSD.org (maintainer - markm@FreeBSD.org) - - - - - - - Since this site seems to be quite heavily frequented at times, - you might want to use one of the following mirrors to fetch the - export-restricted code. - - - - Denmark - - - - - cvsup.dk.FreeBSD.org (maintainer - jesper@skriver.dk) - - - - - - - Germany - - - - - cvsup.de.FreeBSD.org (maintainer - wosch@FreeBSD.org) - - - - cvsup3.de.FreeBSD.org (maintainer - ag@leo.org) - - - - - - - United Kingdom - - - - - cvsup.uk.FreeBSD.org (maintainer - joe@pavilion.net) - - - - cvsup2.uk.FreeBSD.org (maintainer - brian@FreeBSD.org) - - - - cvsup3.uk.FreeBSD.org (maintainer - ftp-admin@plig.net) - - - - - - The following CVSup site is especially designed for CTM users. Unlike the other CVSup mirrors, it is kept up-to-date by CTM. diff --git a/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml index 37b29de219..6bbea2c9a7 100644 --- a/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml +++ b/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml @@ -1,7 +1,7 @@ @@ -820,64 +820,6 @@ - - The latest versions of export-restricted code for FreeBSD (2.0C or - later) (eBones and secure) are being made available at the following - locations. If you are outside the U.S. or Canada, please get secure - (DES) and eBones (Kerberos) from one of the following foreign - distribution sites: - - - - South Africa - - - Hostmaster hostmaster@internat.FreeBSD.org for - this domain. - - - - ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/ - - - - ftp://ftp2.internat.FreeBSD.org/pub/FreeBSD/ - - - - - - - Brazil - - - Hostmaster hostmaster@br.FreeBSD.org for this - domain. - - - - ftp://ftp.br.FreeBSD.org/pub/FreeBSD/ - - - - - - - Finland - - - - - ftp://nic.funet.fi/pub/unix/FreeBSD/eurocrypt/ Contact: count@nic.funet.fi. - - - - - @@ -1162,11 +1104,7 @@ Miscellaneous stuff - All the “DES infected” (e.g. export controlled) - source is not included. You will get the - “international” version only. If sufficient - interest appears, we will set up a sec-cur - sequence too. There is a sequence of deltas for the + There is a sequence of deltas for the ports collection too, but interest has not been all that high yet. Tell me if you want an email list for that too and we will consider setting it up. @@ -1215,7 +1153,7 @@ ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/CTM/ + url="ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/">ftp://ftp.za.FreeBSD.org/pub/FreeBSD/CTM/ @@ -1413,17 +1351,14 @@ linkend="cvsup-collec">here. In this example, we wish to receive the entire main source tree for the FreeBSD system. There is a single large collection - src-all which will give us all of that, - except the export-controlled cryptography support. Let us - assume for this example that we are in the USA or Canada. - Then we can get the cryptography code with one additional - collection, cvs-crypto. As a first step - toward constructing our supfile, we - simply list these collections, one per line: + src-all which will give us all of that. + As a first step toward constructing our + supfile, we + simply list the collections, one per line (in this case, + only one line): -src-all -cvs-crypto +src-all @@ -1765,8 +1700,7 @@ cvs-crypto *default base=/usr/local/etc/cvsup *default release=cvs delete use-rel-suffix compress -src-all -cvs-crypto +src-all @@ -1917,7 +1851,7 @@ cvs-crypto the use of indentation in the list below. The most commonly used collections are - src-all, cvs-crypto, and + src-all, and ports-all. The other collections are used only by small groups of people for specialized purposes, and some mirror sites may not carry all of them. @@ -1927,8 +1861,8 @@ cvs-crypto cvs-all release=cvs - The main FreeBSD CVS repository, excluding the - export-restricted cryptography code. + The main FreeBSD CVS repository, including the + cryptography code. @@ -2382,8 +2316,8 @@ cvs-crypto src-all release=cvs - The main FreeBSD sources, excluding the - export-restricted cryptography code. + The main FreeBSD sources, including the + cryptography code. @@ -2418,6 +2352,27 @@ cvs-crypto + + src-crypto release=cvs + + + Cryptography utilities and libraries from + outside the FreeBSD project, used relatively + unmodified + (/usr/src/crypto). + + + + + src-eBones release=cvs + + + Kerberos and DES + (/usr/src/eBones). Not + used in current releases of FreeBSD. + + + src-etc release=cvs @@ -2509,6 +2464,14 @@ cvs-crypto (/usr/src/release). + + + src-secure release=cvs + + + DES (/usr/src/secure). + + src-sbin @@ -2541,6 +2504,16 @@ cvs-crypto + + src-sys-crypto + release=cvs + + + Kernel cryptography code + (/usr/src/sys/crypto). + + + src-tools release=cvs @@ -2586,55 +2559,6 @@ cvs-crypto - - cvs-crypto release=cvs - - - The export-restricted cryptography code. - - - - src-crypto release=cvs - - - Export-restricted utilities and libraries from - outside the FreeBSD project, used relatively - unmodified - (/usr/src/crypto). - - - - - src-eBones release=cvs - - - Kerberos and DES - (/usr/src/eBones). Not - used in current releases of FreeBSD. - - - - - src-secure release=cvs - - - DES (/usr/src/secure). - - - - - src-sys-crypto - release=cvs - - - Kernel cryptography code - (/usr/src/sys/crypto). - - - - - - distrib release=self @@ -3228,86 +3152,6 @@ cvs-crypto - The export-restricted code for FreeBSD (eBones and secure) is - available via CVSup at the following - international repository. Please use this site to get the - export-restricted code, if you are outside the USA or Canada. - - - - South Africa - - - - - cvsup.internat.FreeBSD.org (maintainer - markm@FreeBSD.org) - - - - - - - Since this site seems to be quite heavily frequented at times, - you might want to use one of the following mirrors to fetch the - export-restricted code. - - - - Denmark - - - - - cvsup.dk.FreeBSD.org (maintainer - jesper@skriver.dk) - - - - - - - Germany - - - - - cvsup.de.FreeBSD.org (maintainer - wosch@FreeBSD.org) - - - - cvsup3.de.FreeBSD.org (maintainer - ag@leo.org) - - - - - - - United Kingdom - - - - - cvsup.uk.FreeBSD.org (maintainer - joe@pavilion.net) - - - - cvsup2.uk.FreeBSD.org (maintainer - brian@FreeBSD.org) - - - - cvsup3.uk.FreeBSD.org (maintainer - ftp-admin@plig.net) - - - - - - The following CVSup site is especially designed for CTM users. Unlike the other CVSup mirrors, it is kept up-to-date by CTM.