From owner-freebsd-current@FreeBSD.ORG Wed Jul 23 03:34:07 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 96EAD37B401; Wed, 23 Jul 2003 03:34:07 -0700 (PDT) Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.157.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76D2F43F3F; Wed, 23 Jul 2003 03:34:06 -0700 (PDT) (envelope-from mark@grondar.org) Received: from storm.FreeBSD.org.uk (Ugrondar@localhost [127.0.0.1]) by storm.FreeBSD.org.uk (8.12.9/8.12.9) with ESMTP id h6NAY5Ho032696; Wed, 23 Jul 2003 11:34:05 +0100 (BST) (envelope-from mark@grondar.org) Received: (from Ugrondar@localhost)h6NAY5KN032695; Wed, 23 Jul 2003 11:34:05 +0100 (BST) X-Authentication-Warning: storm.FreeBSD.org.uk: Ugrondar set sender to mark@grondar.org using -f Received: from grondar.org (localhost [127.0.0.1])h6NAXoZ2072722; Wed, 23 Jul 2003 11:33:50 +0100 (BST) (envelope-from mark@grondar.org) From: Mark Murray Message-Id: <200307231033.h6NAXoZ2072722@grimreaper.grondar.org> To: Ruslan Ermilov In-Reply-To: Your message of "Wed, 23 Jul 2003 09:45:57 +0300." <20030723064557.GE45101@sunbay.com> Date: Wed, 23 Jul 2003 11:33:50 +0100 Sender: mark@grondar.org X-Spam-Status: No, hits=0.2 required=5.0 tests=EMAIL_ATTRIBUTION,FROM_NO_LOWER,IN_REP_TO, QUOTED_EMAIL_TEXT,REPLY_WITH_QUOTES version=2.55 X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: current@freebsd.org Subject: Re: make release broken [FIX] 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: Wed, 23 Jul 2003 10:34:07 -0000 Hi Please do not commit this. M Ruslan Ermilov writes: > > --A9z/3b/E4MkkD+7G > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Tue, Jul 22, 2003 at 07:42:33PM +0300, Ruslan Ermilov wrote: > > Hi! > >=20 > > As many of you probably know, recent telnet commit broke snapshot > > building. Since I needed a working "make release" to go on with > > my task on floppy-less "make release" (for AMD64, etc.), I had to > > just fix it. Attached is the patch. It also fixes another issue > > with this telnet commit: it ensures that crypto telnet[d] do not > > end up in the "base" distribution. > >=20 > Missed in the patch: set DISTRIBUTION=3Dcrypto in lib/libtelnet/Makefile, > so that we still have crypto/usr/include/arpa/telnet.h. > > %%% > Index: Makefile > =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/lib/libtelnet/Makefile,v > retrieving revision 1.16 diff -u -r1.16 Makefile > --- Makefile 20 Jul 2003 23:29:46 -0000 1.16 > +++ Makefile 23 Jul 2003 06:37:09 -0000 > @@ -13,10 +13,11 @@ > =20 > WARNS?=3D 2 > =20 > -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) > +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OP= > ENSSL) > +DISTRIBUTION=3D crypto > SRCS+=3D encrypt.c auth.c enc_des.c sra.c pk.c > CFLAGS+=3D -DENCRYPTION -DAUTHENTICATION -DSRA > -.if !defined(NO_KERBEROS) > +.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS) > SRCS+=3D kerberos5.c > CFLAGS+=3D -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} > CFLAGS+=3D -DFORWARD -Dnet_write=3Dtelnet_net_write > %%% > > > Cheers, > --=20 > Ruslan Ermilov Sysadmin and DBA, > ru@sunbay.com Sunbay Software Ltd, > ru@FreeBSD.org FreeBSD committer > > --A9z/3b/E4MkkD+7G > Content-Type: application/pgp-signature > Content-Disposition: inline > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.2.1 (FreeBSD) > > iD8DBQE/Hi8lUkv4P6juNwoRArAKAJ0QpXpQ9YPuG5gXUo/5p+uia83CiACfTkYW > Myhb+SttdXFnNahueIHJ7Us= > =LyZK > -----END PGP SIGNATURE----- > > --A9z/3b/E4MkkD+7G-- -- Mark Murray iumop ap!sdn w,I idlaH