From owner-freebsd-current@FreeBSD.ORG Wed May 21 23:44:34 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B815537B401; Wed, 21 May 2003 23:44:34 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6C4143F75; Wed, 21 May 2003 23:44:21 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h4M6i0Ed064121 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 22 May 2003 09:44:07 +0300 (EEST) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h4M6i0C9064114; Thu, 22 May 2003 09:44:00 +0300 (EEST) (envelope-from ru) Date: Thu, 22 May 2003 09:44:00 +0300 From: Ruslan Ermilov To: Mike Schreckengost Message-ID: <20030522064400.GA59146@sunbay.com> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tjCHc7DPkfUGtrlw" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.4i cc: re@FreeBSD.org cc: current@FreeBSD.org Subject: Re: FreeBSD 5.1-BETA2 install results X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2003 06:44:35 -0000 --tjCHc7DPkfUGtrlw Content-Type: multipart/mixed; boundary="YiEDa0DAkWCtVeE4" Content-Disposition: inline --YiEDa0DAkWCtVeE4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 f= ew=20 > issues which may (or may not!) be considered as 'bugs'. > Issues encountered: >=20 [...] > 3) The 'krb5' and 'ports' distributions failed to install over FTP from= =20 > ftp://ftp5.FreeBSD.org. I noticed in a prior post to this list that the= =20 > krb5 distro was folded into 'crypto', which appears to be correct. Howeve= r,=20 > sysinstall still looks for 'krb5' separately and issues an error when it= =20 > can't be found. >=20 That's clearly still the case; attached is the patch. Please someone =66rom re@ review and commit it. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@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 --YiEDa0DAkWCtVeE4 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Content-Transfer-Encoding: quoted-printable Index: dist.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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[] =3D { /* The CRYPTO distribution */ static Distribution CRYPTODistTable[] =3D { 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 |=3D DIST_SRC; - if (CRYPTODists) { - if (CRYPTODists & DIST_CRYPTO_KERBEROS5) - CRYPTODists |=3D DIST_CRYPTO_CRYPTO; + if (CRYPTODists) Dists |=3D DIST_CRYPTO; - } else if ((Dists & DIST_CRYPTO) && !CRYPTODists) CRYPTODists |=3D DIST_CRYPTO_ALL; #ifndef X_AS_PKG @@ -378,7 +374,7 @@ distSetKernDeveloper(dialogMenuItem *sel distReset(NULL); Dists =3D _DIST_DEVELOPER; SrcDists =3D DIST_SRC_SYS; - CRYPTODists |=3D DIST_CRYPTO_BIN; + CRYPTODists |=3D DIST_CRYPTO_CRYPTO; i =3D distMaybeSetPorts(self); distVerifyFlags(); return i; Index: dist.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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__ <=3D 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 =20 /* Subtypes for SRC distribution */ @@ -152,9 +145,6 @@ =20 #define _DIST_DEVELOPER \ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) - -#define DIST_CRYPTO_BIN \ - ( DIST_CRYPTO_CRYPTO | DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5 ) =20 #endif /* _DIST_H_INCLUDE */ =20 Index: menus.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 =3D { #endif { " crypto", "Basic encryption services", dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRY= PTO_CRYPTO, }, - { " krb5", "Kerberos5 authentication services", - dmenuFlagCheck, dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRY= PTO_KERBEROS5 }, { " dict", "Spelling checker dictionary files", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT }, { " doc", "Miscellaneous FreeBSD online docs", Index: sysinstall.8 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 --YiEDa0DAkWCtVeE4-- --tjCHc7DPkfUGtrlw Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+zHGwUkv4P6juNwoRAgTpAJwLj5q6GGb9u+dJoK/XKgW1EdGgugCeL5B5 EdSkD8c1q+e9I0RNeIAUsT8= =BOdY -----END PGP SIGNATURE----- --tjCHc7DPkfUGtrlw--