From 1a7a97d7c4a7c58d1b9bd28008827ee219e5cff9 Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Wed, 29 Nov 2023 08:11:09 -0500 Subject: [PATCH] telnetd removed. use freebsd-telnetd from mports --- ObsoleteFiles.inc | 5 ++- UPDATING | 3 ++ lib/libpam/pam.d/Makefile | 6 ---- lib/libpam/pam.d/telnetd | 25 -------------- libexec/Makefile | 5 --- libexec/telnetd/Makefile | 42 ------------------------ libexec/telnetd/Makefile.depend | 24 -------------- libexec/telnetd/Makefile.depend.options | 5 --- tools/build/mk/OptionalObsoleteFiles.inc | 2 -- 9 files changed, 7 insertions(+), 110 deletions(-) delete mode 100644 lib/libpam/pam.d/telnetd delete mode 100644 libexec/telnetd/Makefile delete mode 100644 libexec/telnetd/Makefile.depend delete mode 100644 libexec/telnetd/Makefile.depend.options diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 89095458df9..1a02be68d1e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -39,7 +39,10 @@ # for generating a list from a directory # find /usr/lib/perl5/5.36.0 -exec echo {} \; | cut -b 2-150 | xargs printf "OLD_FILES+=%s\n" - +# 20231129: telnetd(8) removed +OLD_FILES+=etc/pam.d/telnetd +OLD_FILES+=usr/libexec/telnetd +OLD_FILES+=usr/share/man/man8/telnetd.8.gz # 20230909: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/UPDATING b/UPDATING index ba1f4feb83b..d7765313674 100644 --- a/UPDATING +++ b/UPDATING @@ -1,5 +1,8 @@ Updating Information for MidnightBSD users. +20231129: + telnetd(8) removed. Use mports/net/freebsd-telnetd if you need it + 20230905: openssl 1.1.1w diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index f1bc721d244..1e95389e0c8 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -31,10 +31,4 @@ afterinstallconfig: ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp .endif -.if ${MK_TELNET} != "no" -CONFGROUPS+= TELNET -TELNET+= telnetd -TELNETPACKAGE+= telnet -.endif - .include diff --git a/lib/libpam/pam.d/telnetd b/lib/libpam/pam.d/telnetd deleted file mode 100644 index 4eda79a454b..00000000000 --- a/lib/libpam/pam.d/telnetd +++ /dev/null @@ -1,25 +0,0 @@ -# -# -# PAM configuration for the "telnetd" service -# - -# auth -auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn allow_local -#auth sufficient pam_krb5.so no_warn try_first_pass -#auth sufficient pam_ssh.so no_warn try_first_pass -auth required pam_unix.so no_warn try_first_pass - -# account -account required pam_nologin.so -#account required pam_krb5.so -account required pam_login_access.so -account required pam_unix.so - -# session -#session optional pam_ssh.so want_agent -session required pam_lastlog.so no_fail - -# password -#password sufficient pam_krb5.so no_warn try_first_pass -password required pam_unix.so no_warn try_first_pass diff --git a/libexec/Makefile b/libexec/Makefile index 31b815c377f..2d7bb194692 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -40,7 +40,6 @@ SUBDIR= ${_atf} \ ${_rtld-elf} \ save-entropy \ ${_smrsh} \ - ${_telnetd} \ ${_tests} \ ${_tftp-proxy} \ ulog-helper \ @@ -116,10 +115,6 @@ SUBDIR+= talkd SUBDIR+= tcpd .endif -.if ${MK_TELNET} != "no" -_telnetd= telnetd -.endif - .if ${MK_TFTP} != "no" SUBDIR+= tftpd .endif diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile deleted file mode 100644 index c10c49c7c6a..00000000000 --- a/libexec/telnetd/Makefile +++ /dev/null @@ -1,42 +0,0 @@ - -# Do not define -DKLUDGELINEMODE, as it does not interact well with many -# telnet implementations. - -.include - -TELNETDIR= ${SRCTOP}/contrib/telnet -.PATH: ${TELNETDIR}/telnetd - -PROG= telnetd -MAN= telnetd.8 - -SRCS= global.c slc.c state.c sys_term.c telnetd.c \ - termstat.c utility.c - -WARNS?= 2 -WFORMAT?= 0 - -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ - -DENV_HACK -DSTREAMSPTY - -.if ${MK_INET6_SUPPORT} != "no" -CFLAGS+= -DINET6 -.endif - -CFLAGS+= -I${TELNETDIR} -CFLAGS+= -I${TELNETDIR}/telnet - -LIBADD= telnet util ncursesw - -.if ${MK_OPENSSL} != "no" -SRCS+= authenc.c -CFLAGS+= -DAUTHENTICATION -DENCRYPTION -LIBADD+= mp crypto pam -.endif - -.if ${MK_KERBEROS_SUPPORT} != "no" -CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -LIBADD+= krb5 roken -.endif - -.include diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.depend deleted file mode 100644 index 0b8085ec479..00000000000 --- a/libexec/telnetd/Makefile.depend +++ /dev/null @@ -1,24 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/arpa \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcom_err \ - lib/libcompiler_rt \ - lib/libcrypt \ - lib/libmp \ - lib/libpam/libpam \ - lib/libtelnet \ - lib/libthr \ - lib/libutil \ - lib/ncurses/ncursesw \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/libexec/telnetd/Makefile.depend.options b/libexec/telnetd/Makefile.depend.options deleted file mode 100644 index 479892a78be..00000000000 --- a/libexec/telnetd/Makefile.depend.options +++ /dev/null @@ -1,5 +0,0 @@ -# This file is not autogenerated - take care! - -DIRDEPS_OPTIONS= KERBEROS_SUPPORT OPENSSL - -.include diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5d358e3efd7..609864d5b02 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8621,9 +8621,7 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat .if ${MK_TELNET} == no OLD_FILES+=etc/pam.d/telnetd OLD_FILES+=usr/bin/telnet -OLD_FILES+=usr/libexec/telnetd OLD_FILES+=usr/share/man/man1/telnet.1.gz -OLD_FILES+=usr/share/man/man8/telnetd.8.gz .endif .if ${MK_TESTS} == yes