git: c0f94ccbb241 - main - bsdbox: remove previously broken telnet(d) support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Sep 2022 16:56:50 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=c0f94ccbb241f530c9f89d5259efb695e4f6de95
commit c0f94ccbb241f530c9f89d5259efb695e4f6de95
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-09-29 16:54:32 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-09-29 16:56:25 +0000
bsdbox: remove previously broken telnet(d) support
Support for telnet(d) was commented out some time ago. Remove now that
telnetd is gone.
Reviewed by: imp, delphij, emaste
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D36782
---
tools/bsdbox/Makefile | 3 ---
tools/bsdbox/Makefile.telnetd | 14 --------------
2 files changed, 17 deletions(-)
diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile
index ce40eb8b75a2..d1c03813f792 100644
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -100,9 +100,6 @@ CRUNCH_LIBS+= -lm
#.include "Makefile.textproc"
.include "Makefile.login"
.include "Makefile.kld"
-# telnet/telnetd are too broken to include as a crunchgen'ed binary,
-# thanks to some of the horrible layering violations going on.
-# .include "Makefile.telnetd"
.include "Makefile.fs"
CRUNCH_LIBS+= -lcrypto -lssl -lz
diff --git a/tools/bsdbox/Makefile.telnetd b/tools/bsdbox/Makefile.telnetd
deleted file mode 100644
index 5a77176fd3ac..000000000000
--- a/tools/bsdbox/Makefile.telnetd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build telnetd
-# Question - why is telnetds objects ending up in the srcdir? -adrian
-
-# This won't work yet - because telnetd relies on libtelnet.a which includes
-# kerberos support by default; building telnetd without kerberos support
-# requires the cross-build world to be built the same.
-# -adrian
-
-# $FreeBSD$
-
-CRUNCH_PROGS_libexec+= telnetd
-CRUNCH_PROGS_usr.bin+= telnet
-CRUNCH_LIBS+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken -ltelnetd
-# CRUNCH_BUILDOPTS_telnetd= MK_KERBEROS_SUPPORT=no