Date: Wed, 23 Jul 2003 09:45:57 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: current@FreeBSD.org Subject: Re: make release broken [FIX] Message-ID: <20030723064557.GE45101@sunbay.com> In-Reply-To: <20030722164233.GA64431@sunbay.com> References: <20030722164233.GA64431@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Tue, Jul 22, 2003 at 07:42:33PM +0300, Ruslan Ermilov wrote:
> Hi!
>
> 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.
>
Missed in the patch: set DISTRIBUTION=crypto in lib/libtelnet/Makefile,
so that we still have crypto/usr/include/arpa/telnet.h.
%%%
Index: Makefile
===================================================================
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 @@
WARNS?= 2
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
SRCS+= kerberos5.c
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
%%%
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE/Hi8lUkv4P6juNwoRArAKAJ0QpXpQ9YPuG5gXUo/5p+uia83CiACfTkYW
Myhb+SttdXFnNahueIHJ7Us=
=LyZK
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030723064557.GE45101>