Date: Wed, 14 May 2003 08:47:23 +0100 From: Mark Murray <mark@grondar.org> To: Scott Long <scott_long@btc.adaptec.com> Cc: current@freebsd.org Subject: Re: FreeBSD 5.1-BETA: miniinst.iso missing perl5 pkg Message-ID: <200305140747.h4E7lNgN004095@grimreaper.grondar.org> In-Reply-To: Your message of "Tue, 13 May 2003 18:15:33 MDT." <3EC18AA5.7080307@btc.adaptec.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <4048.1052898148.1@grondar.org>
Scott Long writes:
> > Also the developer installs does error on the krb5 distribution, which was
> > documented also with the 5.1-BETA disc1.iso in an earlier post.
>
> Yes, I'm working to track this down. Thanks for the report.
Here's a fix for sysinstall/krb5. Please test.
M
--
Mark Murray
iumop ap!sdn w,I idlaH
------- =_aaaaaaaaaa0
Content-Type: text/plain; file="sysinstall.diff"; charset="us-ascii"
Content-ID: <4048.1052898148.2@grondar.org>
Content-Description: sysinstall.diff
Index: dist.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.c,v
retrieving revision 1.220
diff -u -d -r1.220 dist.c
--- dist.c 8 Mar 2003 12:07:13 -0000 1.220
+++ dist.c 10 May 2003 13:56:13 -0000
@@ -110,10 +110,9 @@
/* 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"),
+ DTE_TARBALL("skrb5", &CRYPTODists, CRYPTO_SKERBEROS, "/usr/src"),
{ NULL },
};
@@ -263,11 +262,8 @@
{
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
Index: dist.h
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.h,v
retrieving revision 1.56
diff -u -d -r1.56 dist.h
--- dist.h 17 Jan 2003 19:05:31 -0000 1.56
+++ dist.h 10 May 2003 13:58:45 -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_SKERBEROS 0x0008
#define DIST_CRYPTO_ALL 0x007F
/* Subtypes for SRC distribution */
@@ -154,7 +147,7 @@
( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
#define DIST_CRYPTO_BIN \
- ( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5 )
+ ( DIST_CRYPTO_CRYPTO )
#endif /* _DIST_H_INCLUDE */
Index: menus.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.371
diff -u -d -r1.371 menus.c
--- menus.c 5 May 2003 09:00:13 -0000 1.371
+++ menus.c 10 May 2003 17:31:24 -0000
@@ -46,7 +46,7 @@
Dists |= DIST_SRC;
SrcDists = DIST_SRC_ALL;
CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
- DIST_CRYPTO_SKERBEROS5);
+ DIST_CRYPTO_SKERBEROS);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@@ -56,7 +56,7 @@
Dists &= ~DIST_SRC;
SrcDists = 0;
CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
- DIST_CRYPTO_SKERBEROS5);
+ DIST_CRYPTO_SKERBEROS);
return DITEM_SUCCESS | DITEM_REDRAW;
}
@@ -965,10 +965,8 @@
{ " compat4x", "FreeBSD 4.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X },
#endif
- { " crypto", "Basic encryption services",
+ { " crypto", "Authentication and 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",
@@ -1036,7 +1034,7 @@
{ " share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
{ " skrb5", "/usr/src/kerberos5 (sources for Kerberos5)",
- dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
+ dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS },
{ " ssecure", "/usr/src/secure (BSD encryption sources)",
dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE },
{ " sys", "/usr/src/sys (FreeBSD kernel)",
Index: sysinstall.8
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/sysinstall.8,v
retrieving revision 1.57
diff -u -d -r1.57 sysinstall.8
--- sysinstall.8 8 Mar 2003 12:07:13 -0000 1.57
+++ sysinstall.8 14 May 2003 07:46:13 -0000
@@ -449,14 +449,14 @@
systems only)
.It Li ports
The ports collection.
-.It Li krb5
-Kerberos5 binaries.
.It Li ssecure
/usr/src/secure
.It Li sbase
/usr/src/[top level files]
.It Li scontrib
/usr/src/contrib
+.It Li scrypto
+/usr/src/crypto
.It Li sgnu
/usr/src/gnu
.It Li setc
------- =_aaaaaaaaaa0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305140747.h4E7lNgN004095>