Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Oct 2022 17:25:59 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 0a1a1699c361 - stable/12 - bsdbox: remove previously broken telnet(d) support
Message-ID:  <202210031725.293HPxZ4032304@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=0a1a1699c3618ffbbbe215501e6c8192d49ec10c

commit 0a1a1699c3618ffbbbe215501e6c8192d49ec10c
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-09-29 16:54:32 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-10-03 17:25:53 +0000

    bsdbox: remove previously broken telnet(d) support
    
    Support for telnet(d) was commented out some time ago.  Remove because
    telnetd is gone in main and this is unlikely to be fixed.
    
    Reviewed by:    imp, delphij, emaste
    MFC after:      3 days
    Differential Revision:  https://reviews.freebsd.org/D36782
    
    (cherry picked from commit c0f94ccbb241f530c9f89d5259efb695e4f6de95)
---
 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 56ece9d3439e..401cdbc210e7 100644
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -99,9 +99,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210031725.293HPxZ4032304>