d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The "krb5" distribution was merged with "crypto", record the death.

Browse Source 
Reviewed by:	jhb
Approved by:	re (jhb)
This commit is contained in:
ru 2003-05-22 18:41:16 +00:00
parent 20718124ca
commit e2284b7cf3
6 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/sade/menus.c
View File

@ -967,8 +967,6 @@ DMenu MenuSubDistributions = {
#endif
{ " crypto", "Basic encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
{ " krb5", "Kerberos5 authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
{ " dict", "Spelling checker dictionary files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
{ " doc", "Miscellaneous FreeBSD online docs",

6
usr.sbin/sade/sade.8
View File

@ -392,7 +392,7 @@ Resets all selected distributions to the empty set (no distributions selected).
.Sy Variables :
None
.It distSetCustom
Allows the selection of a custom distribution set (e.g. not just on of the
Allows the selection of a custom distribution set (e.g. not just one of the
existing "canned" sets) with no user interaction.
.Pp
.Sy Variables :
@ -449,8 +449,6 @@ Compatibility with
systems only)
.It Li ports
The ports collection.
.It Li krb5
Kerberos5 binaries.
.It Li ssecure
/usr/src/secure
.It Li sbase
@ -465,6 +463,8 @@ Kerberos5 binaries.
/usr/src/games
.It Li sinclude
/usr/src/include
.It Li skrb5
/usr/src/kerberos5
.It Li slib
/usr/src/lib
.It Li slibexec

8
usr.sbin/sysinstall/dist.c
View File

@ -110,7 +110,6 @@ static Distribution DistTable[] = {
/* The CRYPTO distribution */
static Distribution CRYPTODistTable[] = {
DTE_TARBALL("crypto", &CRYPTODists, CRYPTO_CRYPTO, "/"),
DTE_TARBALL("krb5", &CRYPTODists, CRYPTO_KERBEROS5, "/"),
DTE_TARBALL("ssecure", &CRYPTODists, CRYPTO_SSECURE, "/usr/src"),
DTE_TARBALL("scrypto", &CRYPTODists, CRYPTO_SCRYPTO, "/usr/src"),
DTE_TARBALL("skrb5", &CRYPTODists, CRYPTO_SKERBEROS5, "/usr/src"),
@ -263,11 +262,8 @@ distVerifyFlags(void)
{
if (SrcDists)
Dists |= DIST_SRC;
if (CRYPTODists) {
if (CRYPTODists & DIST_CRYPTO_KERBEROS5)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
if (CRYPTODists)
Dists |= DIST_CRYPTO;
}
else if ((Dists & DIST_CRYPTO) && !CRYPTODists)
CRYPTODists |= DIST_CRYPTO_ALL;
#ifndef X_AS_PKG
@ -378,7 +374,7 @@ distSetKernDeveloper(dialogMenuItem *self)
distReset(NULL);
Dists = _DIST_DEVELOPER;
SrcDists = DIST_SRC_SYS;
CRYPTODists |= DIST_CRYPTO_BIN;
CRYPTODists |= DIST_CRYPTO_CRYPTO;
i = distMaybeSetPorts(self);
distVerifyFlags();
return i;

10
usr.sbin/sysinstall/dist.h
View File

@ -34,14 +34,7 @@
#define DIST_CRYPTO_CRYPTO 0x0001
#define DIST_CRYPTO_SCRYPTO 0x0002
#define DIST_CRYPTO_SSECURE 0x0004
#if __FreeBSD__ <= 3
#define DIST_CRYPTO_KERBEROS 0x0008
#else
#define DIST_CRYPTO_KERBEROS4 0x0008
#define DIST_CRYPTO_KERBEROS5 0x0010
#define DIST_CRYPTO_SKERBEROS4 0x0020
#define DIST_CRYPTO_SKERBEROS5 0x0040
#endif
#define DIST_CRYPTO_ALL 0x007F
/* Subtypes for SRC distribution */
@ -153,9 +146,6 @@
#define _DIST_DEVELOPER \
( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
#define DIST_CRYPTO_BIN \
( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5 )
#endif /* _DIST_H_INCLUDE */

2
usr.sbin/sysinstall/menus.c
View File

@ -967,8 +967,6 @@ DMenu MenuSubDistributions = {
#endif
{ " crypto", "Basic encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
{ " krb5", "Kerberos5 authentication services",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
{ " dict", "Spelling checker dictionary files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
{ " doc", "Miscellaneous FreeBSD online docs",

6
usr.sbin/sysinstall/sysinstall.8
View File

@ -392,7 +392,7 @@ Resets all selected distributions to the empty set (no distributions selected).
.Sy Variables :
None
.It distSetCustom
Allows the selection of a custom distribution set (e.g. not just on of the
Allows the selection of a custom distribution set (e.g. not just one of the
existing "canned" sets) with no user interaction.
.Pp
.Sy Variables :
@ -449,8 +449,6 @@ Compatibility with
systems only)
.It Li ports
The ports collection.
.It Li krb5
Kerberos5 binaries.
.It Li ssecure
/usr/src/secure
.It Li sbase
@ -465,6 +463,8 @@ Kerberos5 binaries.
/usr/src/games
.It Li sinclude
/usr/src/include
.It Li skrb5
/usr/src/kerberos5
.It Li slib
/usr/src/lib
.It Li slibexec