From nobody Mon Oct 03 17:25:08 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 4Mh7504R1yz4dll9; Mon, 3 Oct 2022 17:25:08 +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 4Mh7503y20z3sSp; Mon, 3 Oct 2022 17:25:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817908; 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=b5Com8n0p/iuL+2vAH3goNBFv/uF6IEVk5xH/uUb2eQ=; b=afZKVW66MvagIfvdz5gcSLTCLONxOuFHcKfh54ZxDPqsPSzi1XOTXgCwkej+gFevpKbSzR E/R4vx3tbAvQ2ps7i2VqQCSV2b9ajY91gD2IMBl6yRy02r/m/CHOtMm5P1+c9YhUzBdcOw mZvbiEF9CiCcpLROdcEWuvyGCxV0Iz6RExKoA23zYSDrsmdrtzEjekE8cncmG3hLAqw0eJ 04bkrIvzdt50KiGKe9oOhZBxNLhVmk9T1pB5ZeurQW1wvJwrcyAqf/rkSZ/6J5ZVgbLHkf hheHh3rX/x9MW7YTjpE43MDuRcwrcHe9AXRxVRQC3/NIuQixRt8TZx5wZrO1oQ== 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 4Mh7502tMszHPd; Mon, 3 Oct 2022 17:25:08 +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 293HP8vv031969; Mon, 3 Oct 2022 17:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293HP8OL031968; Mon, 3 Oct 2022 17:25:08 GMT (envelope-from git) Date: Mon, 3 Oct 2022 17:25:08 GMT Message-Id: <202210031725.293HP8OL031968@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: f6ce8414ebdd - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f6ce8414ebdd1c97a6ed83abc90a96d0c55a6b50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817908; 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=b5Com8n0p/iuL+2vAH3goNBFv/uF6IEVk5xH/uUb2eQ=; b=OEMl1r5nD1QFBaDJTQoX1ZN7HW70ZFlqn6vxP48oMSBAUGlx5HMQiXYqagELiK622gfh2u hdONafa+/O2wmyRr8tT/QEOrcHRFzdza7KPa477jB2DLra33v9BHeQPyUkehEGEFLXdVTu Rc9H7ecMaNzbRl6eBiQ67ohh/kCw8XnC1W8y5DSV8OXiYcHrSYlUQ0Y3glPP69/ft6N95/ 6jwiQSiStDzv7vlDKxhrqcen4Rvkp+dbfiGLgAVMFskVVm/3tJqsZnE5490PHaMHooqhjp KrM667qTHJeIgpya22JBBvrlHkQdzHJQR2QKJqXDq/KUqmU75p0rRa7FgYNDPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664817908; a=rsa-sha256; cv=none; b=rTj9NeSnnjpBD53Xf1oJ8MbECRQlnQrLIIlpRV2fb/rLHVbN5k3K5a1tPtSp1ukFg8xW84 gYix7nbcUH+kfRoCSTxdem7GQBircQC3f3g0yK5knTMz+vQBx1iIhwjSEQa5MQDqxvQCUs S3uvsu+/fAFuo+4MyZpjSGg40EFC2BjMZC1BQDAqmEQyRbquc8oqMNgNz+pNIN6fRCAKXc xo+yaTO+QlfqPl+y1IbppRFHqqTE44oIFdcOik7wXeDhMp0+IzPqR/SXlj3W0lQYQRNU7z F8PIlFZppIzE/iTDVFlTXpD9k9TVUt1HEIsYdMnOtpDhtq+QXdngeKDNM/1Ttg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ce8414ebdd1c97a6ed83abc90a96d0c55a6b50 commit f6ce8414ebdd1c97a6ed83abc90a96d0c55a6b50 Author: Brooks Davis AuthorDate: 2022-09-29 16:54:32 +0000 Commit: Brooks Davis CommitDate: 2022-10-03 17:24:10 +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 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 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