From owner-freebsd-current@FreeBSD.ORG Tue Jul 22 23:46:05 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 69C7337B401 for ; Tue, 22 Jul 2003 23:46:05 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAD2543F93 for ; Tue, 22 Jul 2003 23:46:01 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h6N6jv0U049915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 23 Jul 2003 09:45:58 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h6N6jve7049910 for current@FreeBSD.org; Wed, 23 Jul 2003 09:45:57 +0300 (EEST) (envelope-from ru) Date: Wed, 23 Jul 2003 09:45:57 +0300 From: Ruslan Ermilov To: current@FreeBSD.org Message-ID: <20030723064557.GE45101@sunbay.com> References: <20030722164233.GA64431@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="A9z/3b/E4MkkD+7G" Content-Disposition: inline In-Reply-To: <20030722164233.GA64431@sunbay.com> User-Agent: Mutt/1.5.4i 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 06:46:05 -0000 --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--