From owner-freebsd-current Sat Aug 5 12:14:54 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.11/8.6.6) id MAA26227 for current-outgoing; Sat, 5 Aug 1995 12:14:54 -0700 Received: from grunt.grondar.za (grunt.grondar.za [196.7.18.129]) by freefall.cdrom.com (8.6.11/8.6.6) with ESMTP id MAA26219 for ; Sat, 5 Aug 1995 12:14:43 -0700 Received: from grumble.grondar.za (grumble.grondar.za [196.7.18.130]) by grunt.grondar.za (8.6.11/8.6.9) with ESMTP id VAA00338; Sat, 5 Aug 1995 21:14:08 +0200 Received: from localhost (localhost [127.0.0.1]) by grumble.grondar.za (8.6.11/8.6.9) with SMTP id VAA22622; Sat, 5 Aug 1995 21:14:06 +0200 Message-Id: <199508051914.VAA22622@grumble.grondar.za> X-Authentication-Warning: grumble.grondar.za: Host localhost didn't use HELO protocol To: "Rodney W. Grimes" cc: ache@astral.msk.su (=?KOI8-R?Q?=E1=CE=C4=D2=C5=CA_=FE=C5=D2=CE=CF=D7?= aka), mark@grondar.za, current@freefall.cdrom.com, jkh@time.cdrom.com Subject: Re: current make world falls over. (Second effort) Date: Sat, 05 Aug 1995 21:14:06 +0200 From: Mark Murray Sender: current-owner@FreeBSD.org Precedence: bulk > > >> You pick wrong libtelnet version (standard libtelnet instead > > >> of secure one). > > >> It is Mark, who make this thing build from top level, previously > > >> you need to build libtelnet/telnetd/telnet by hand. > > > > >You need to build the secure/lib/libtelnet once by hand.... > > > > It isn't a problem, the problem is that 'make world' > > tries to build stuff from secure and tries to build > > telnetd with wrong libtelnet (standard). > > That is a bug in src/Makefile. In the lib: target we need to pickup > secure/lib/libtelnet if we are infact building the secure bits. > > Please create a patch and submit it to me for review. Here we go (Again!) --- lib/Makefile.ORG Fri Aug 4 21:29:34 1995 +++ lib/Makefile Sat Aug 5 11:15:40 1995 @@ -13,7 +13,11 @@ SUBDIR+= libc libcompat libcom_err libcrypt libcurses libedit \ libf2c libforms \ libkvm libmd libmytinfo libncurses libpcap libresolv librpcsvc \ - libscsi libskey libss libtelnet libtermcap libutil liby + libscsi libskey libss libtermcap libutil liby + +.if !exists(../secure) || defined(NOCRYPT) || defined(NOSECURE) +SUBDIR+= libtelnet +.endif .if defined(WANT_CSRG_LIBM) SUBDIR+= libm --- usr.bin/Makefile.ORG Sat Aug 5 17:20:32 1995 +++ usr.bin/Makefile Sat Aug 5 11:20:39 1995 @@ -20,11 +20,15 @@ printf quota ranlib rdist renice rev rlogin rpcgen \ rpcinfo rs rsh rup ruptime rusers rwall \ rwho script sed sgmlfmt sgmls shar showmount size soelim split \ - strings strip su symorder talk tconv tcopy tee telnet tftp time tip \ + strings strip su symorder talk tconv tcopy tee tftp time tip \ tn3270 touch tput tr true tset tsort tty ul uname unexpand \ unifdef uniq unvis users uudecode uuencode vacation \ vgrind vi vis w wall wc what whereis which who whois window \ write xargs xinstall xstr yacc yes ypcat ypmatch ypwhich + +.if !exists(../secure) || defined(NOCRYPT) || defined(NOSECURE) +SUBDIR+=telnet +.endif # Cmp, look and tail all use mmap, so new-VM only. # F77 and pascal are VAX/Tahoe only. --- libexec/Makefile.ORG Sat Aug 5 21:07:54 1995 +++ libexec/Makefile Sat Aug 5 21:08:29 1995 @@ -2,7 +2,11 @@ SUBDIR= atrun bootpd bootpgw comsat fingerd ftpd getNAME getty lfs_cleanerd \ mail.local makekey rexecd rlogind rpc.rstatd rpc.rusersd \ - rpc.rwalld rshd talkd telnetd tftpd uucpd xtend + rpc.rwalld rshd talkd tftpd uucpd xtend + +.if !exists(../secure) || defined(NOCRYPT) || defined(NOSECURE) +SUBDIR+=telnetd +.endif # Present but disabled: kpasswdd -- Mark Murray 46 Harvey Rd, Claremont, Cape Town 7700, South Africa +27 21 61-3768 GMT+0200 Finger mark@grumble.grondar.za for PGP key