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.
Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer
Index: release/Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.787
diff -u -r1.787 Makefile
--- release/Makefile 4 Jul 2003 14:39:17 -0000 1.787
+++ release/Makefile 21 Jul 2003 20:14:33 -0000
@@ -236,7 +236,8 @@
.if !defined(FIXCRYPTO)
FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
FIXCRYPTO+= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
- lib/libfetch usr.bin/fetch
+ lib/libfetch usr.bin/fetch \
+ lib/libtelnet libexec/telnetd usr.bin/telnet
.if !defined(NO_SENDMAIL)
FIXCRYPTO+= usr.sbin/sendmail
.endif
Index: lib/libtelnet/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libtelnet/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- lib/libtelnet/Makefile 20 Jul 2003 23:29:46 -0000 1.16
+++ lib/libtelnet/Makefile 21 Jul 2003 19:58:26 -0000
@@ -13,10 +13,10 @@
WARNS?= 2
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
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
Index: libexec/telnetd/Makefile
===================================================================
RCS file: /home/ncvs/src/libexec/telnetd/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- libexec/telnetd/Makefile 20 Jul 2003 23:29:46 -0000 1.21
+++ libexec/telnetd/Makefile 21 Jul 2003 20:19:17 -0000
@@ -28,12 +28,13 @@
DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
LDADD+= -lkrb5 -lasn1 -lroken -lcom_err
Index: usr.bin/telnet/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/telnet/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- usr.bin/telnet/Makefile 20 Jul 2003 23:29:46 -0000 1.23
+++ usr.bin/telnet/Makefile 22 Jul 2003 11:41:02 -0000
@@ -20,25 +20,26 @@
DPADD= ${LIBTERMCAP} ${LIBTELNET}
LDADD= -ltermcap ${LIBTELNET}
-.if !defined(RELEASE_CRUNCH)
-CFLAGS+= -DINET6 -DIPSEC
-DPADD+= ${LIBIPSEC}
-LDADD+= -lipsec
-.else
+.if defined(RELEASE_CRUNCH)
.PATH: ${TELNETDIR}/libtelnet
SRCS+= genget.c getent.c misc.c
CFLAGS+= -DHAS_CGETENT
-.endif
+.else
+CFLAGS+= -DINET6 -DIPSEC
+DPADD+= ${LIBIPSEC}
+LDADD+= -lipsec
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+DISTRIBUTION= crypto
SRCS+= authenc.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD+= -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
-.if !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/../../kerberos5) && !defined(NO_KERBEROS)
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
+.endif
.endif
.endif
pgp00000.pgp
Description: PGP signature
