FreeBSD 5.1-BETA2 install results

[Ruslan Ermilov]

On Wed, May 21, 2003 at 07:10:24PM -0400, Mike Schreckengost wrote:
[...]
> I just performed a 'clean' install of 5.0-BETA2, and have encountered a few 
> issues which may (or may not!) be considered as 'bugs'.

> Issues encountered:
> 
[...]
> 3) The 'krb5' and 'ports' distributions failed to install over FTP from 
> ftp://ftp5.FreeBSD.org. I noticed in a prior post to this list that the 
> krb5 distro was folded into 'crypto', which appears to be correct. However, 
> sysinstall still looks for 'krb5' separately and issues an error when it 
> can't be found.
> 
That's clearly still the case; attached is the patch.  Please someone
from re@ review and commit it.


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software AG,
ru at FreeBSD.org		FreeBSD committer,
+380.652.512.251	Simferopol, Ukraine

http://www.FreeBSD.org	The Power To Serve
http://www.oracle.com	Enabling The Information Age
-------------- next part --------------
Index: dist.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.c,v
retrieving revision 1.220
diff -u -p -r1.220 dist.c
--- dist.c	8 Mar 2003 12:07:13 -0000	1.220
+++ dist.c	22 May 2003 06:17:40 -0000
@@ -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 *sel
     distReset(NULL);
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_SYS;
-    CRYPTODists |= DIST_CRYPTO_BIN;
+    CRYPTODists |= DIST_CRYPTO_CRYPTO;
     i = distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
Index: dist.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.h,v
retrieving revision 1.56
diff -u -p -r1.56 dist.h
--- dist.h	17 Jan 2003 19:05:31 -0000	1.56
+++ dist.h	22 May 2003 06:17:23 -0000
@@ -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 */
@@ -152,9 +145,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 */
 
Index: menus.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.371
diff -u -p -r1.371 menus.c
--- menus.c	5 May 2003 09:00:13 -0000	1.371
+++ menus.c	22 May 2003 06:14:58 -0000
@@ -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",
Index: sysinstall.8
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/sysinstall.8,v
retrieving revision 1.57
diff -u -p -r1.57 sysinstall.8
--- sysinstall.8	8 Mar 2003 12:07:13 -0000	1.57
+++ sysinstall.8	22 May 2003 06:18:23 -0000
@@ -392,7 +392,7 @@ Resets all selected distributions to the
 .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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20030522/373fa3ab/attachment.bin