From nobody Mon Oct 03 17:25:59 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mh76006vRz4dlcD; Mon, 3 Oct 2022 17:26:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mh75z6gXvz3snY; Mon, 3 Oct 2022 17:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+70DKO1TsKaTOAHNqq8h+T69LFgAm6Ew7bPdV09GQI=; b=Vb67rs2GjDKI+rQ7XBIqv3QBw2fwJO9yJ9ew32a5dyvgpyNhriAbIK3wzUx8d7VcTbPiGY aoEInGDdlsvDLhBuAaxh3Yi5gf6N1cl6OVXbFcOE2ZaRarfGkbi4ERv5VMLqzjHRtDvc+L qzY3H1x0QjGVmkwlREBLQQnwfxkCjNxxE8Nptkx/y2rXeySYLCpH+HPoeXwBncXukwN1em 2CBtvtXKKayMwqXLmBjQJzpexT83wqP10mo/B39bO8fkF668dBocTXJBw6MGwGCPbx4wqJ 1wghAwA5b9GZGqcnUWIpa6oF/PDKinEzejCqXLmqbzzZpWfs89eCxovCPjCf4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mh75z5lgZzHGb; Mon, 3 Oct 2022 17:25:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 293HPxM8032305; Mon, 3 Oct 2022 17:25:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293HPxZ4032304; Mon, 3 Oct 2022 17:25:59 GMT (envelope-from git) Date: Mon, 3 Oct 2022 17:25:59 GMT Message-Id: <202210031725.293HPxZ4032304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 0a1a1699c361 - stable/12 - bsdbox: remove previously broken telnet(d) support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0a1a1699c3618ffbbbe215501e6c8192d49ec10c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+70DKO1TsKaTOAHNqq8h+T69LFgAm6Ew7bPdV09GQI=; b=PVINUQ7FMYjvuOMu3ClxSfTF5+ieY7+7YgQHM2zxRD/PS7Y/+sAHSrB8LKnaYpUxWgJsE2 o1eV+om1wr5W+q2vTLxTmBmT6IFXKWLuLgOwpPvMvQ5Qyss0TW6IIQUNTAvWfdAuFfxSpd a6RAkeWyf5IqrNwiQOE+B6iEEBNvtzDWAyVq2zIzsUeR0IFDbyG0n7fDXx9f78tSCZIgGo pdS2+Ksb8JslGyU1Qko1sIsM3lP/opYq13oYVd42EaT2rOYflHZwVpPZx3g3BaHk5udubC hp6LW+l4OnTTuDIhk04FYQa1T0JZ6FPaCbf1O+ekfpaJwkG5IHK/+eapTWRvZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664817959; a=rsa-sha256; cv=none; b=B8PzNIRrCnRAeJCLe5G1CX560c4xdnlFnzBFuc+oj4/7k4/LjwOUSBVq+S/Dh8rPATxtav ciLKQjTZpc1lrmJO9B6xQ6mY06SwLIzbdRNoeFlCSCaqhf4padADuuupHi99lo/6cMSScO qB2TkedmcvNAI8dCyWSgedWhtUOGsoaVbnAzrVYNJRgslsR+5RjwL7R/edsMRSafTEFtjc 5cZYDTLVr8vdFF0Ys+WQmn7uliorR0a2ycH+WRPgQsB2N9wV4wjdSXSOsVNkqr6CQdnW9S bo66z0knM7ddL0W933SsyimD7MUO/fUM4CihoHoj/hFd3wK7ERmHyD2m+kajPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0a1a1699c3618ffbbbe215501e6c8192d49ec10c commit 0a1a1699c3618ffbbbe215501e6c8192d49ec10c Author: Brooks Davis AuthorDate: 2022-09-29 16:54:32 +0000 Commit: Brooks Davis 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