gentoo resync : 20.03.2022

3 files changed, 101 insertions, 0 deletions

diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 847dd90d548b..de16f6460c0e 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,7 +1,10 @@
 AUX net.issue.sample 117 BLAKE2B 8b0b60e93aeacd53eb46318317dc54d747fa6a7c009da72944df5012e4dd437eea386ad3936a72929932bc1915da57c4a220ba7205a2580d6e19dadc1e7f4149 SHA512 f290b0fc214dd58acfb186c269180aae29c42768bfeab21aa72604ad8ce50c354f18d9b568d04885554c5d1c27017dd7132e406933050450d8605d16d9263b79
 AUX netkit-telnetd-0.17-cflags-gnu_source.patch 828 BLAKE2B 947bb4a47a9e032ab89647b5b30f6e6b494ec3aeeff5bc5c03ba3d5d6137077f435c08bddc284418584119b5001bf4b5f1beddf6b7b15e36608e7001f5498ebe SHA512 9baa5178d32bec960fd7c8c3041468243f14a9554ad82093186df872446d920d3c3073f2773db10f0e1edec9dbc60e194afad2abf189a9a253b2ce0595e6715d
+AUX netkit-telnetd-0.17-r13-gentooification.patch 880 BLAKE2B 2727806eb103efa78df375f2e9d192c06b45ef00a8bf1f4f2537f555c74c532c58a677ea5c668782495310768eceefa86453d8b40160a802f39e19b880d85e8f SHA512 d6fbdc90ee4682316c8e41bb41d72813795ebf3cd2afb5d986a44b47ff99c40e16f28ffa428cccaff3abd06dbe710bee06cad689f6c7673b1fa4b9dd6e20f721
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
+DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459
 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e
+EBUILD netkit-telnetd-0.17-r13.ebuild 1778 BLAKE2B c5211c7584d8415468584d166c59755d1a14913278f8f0a4c2c76acc1ed88217232e6727b34a1f695d3cc3c271b8fa5179c012591ceeec92dded609c5d0f4e6e SHA512 105b5a685ce80e3572cf7aa32cc2ce1e0fe8c0b17fa49734bc074e44e5d05829d9a21d6712d817c98390067dd547719667d5b0ea62579e142026846252aca6e1
 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch
new file mode 100644
index 000000000000..3ca6b15a788a
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch
@@ -0,0 +1,43 @@
+diff -Naur a/telnetd/CMakeLists.txt b/telnetd/CMakeLists.txt
+--- a/telnetd/CMakeLists.txt	2022-02-07 17:37:04.831149960 +0100
++++ b/telnetd/CMakeLists.txt	2022-02-07 17:42:48.482998276 +0100
+@@ -6,11 +6,11 @@
+     -DNO_REVOKE \
+     -DKLUDGELINEMODE \
+     -DDIAGNOSTICS \
+-    -DLOGIN_WRAPPER='\"/usr/lib/telnetlogin\"' \
++    -DLOGIN_WRAPPER='\"/usr/sbin/telnetlogin\"' \
+ ")
+ 
+ add_executable(
+-    in.telnetd
++    telnetd
+     global.c
+     setproctitle.c
+     slc.c
+@@ -21,19 +21,22 @@
+     utility.c
+ )
+ target_link_libraries(
+-    in.telnetd
++    telnetd
+     ncurses
+     util
+ )
+ install(
+-    TARGETS in.telnetd
++    TARGETS telnetd
+     DESTINATION ${SBIN_DIR}
+ )
+ 
+ install(
+     FILES telnetd.8
+     DESTINATION ${MAN_DIR}/man8/
+-    RENAME in.telnetd.8
++)
++install(
++    FILES issue.net.5
++    DESTINATION ${MAN_DIR}/man5/
+ )
+ install(
+     CODE "execute_process( \
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
new file mode 100644
index 000000000000..7423dd55a7dc
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+PATCHLEVEL=42
+DESCRIPTION="Standard Linux telnet client and server"
+#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+# This might be the best HOMEPAGE now?
+HOMEPAGE="https://launchpad.net/netkit-telnet"
+# http://packages.debian.org/stablesource/netkit-telnet
+# http://packages.debian.org/testing/source/netkit-telnet
+# No upstream mirror exists anymore?
+# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
+SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2:=
+	!net-misc/telnet-bsd"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/netkit-telnet-${PV}
+
+src_prepare() {
+	# Patch: [0]
+	# Gentoo used to lack a maintainer for this package.
+	# A security problem arose. While reviewing our options for how
+	# should we proceed with the security bug we decided it would be
+	# better to just stay in sync with debian's own netkit-telnet
+	# package. Lots of bug fixes by them over time which were not in
+	# our telnetd.
+	rm "${WORKDIR}/debian/patches/use-cmake-as-buildsystem-debian-extras.patch" || die
+	eapply "${WORKDIR}/debian/patches"
+	eapply "${FILESDIR}/netkit-telnetd-0.17-r13-gentooification.patch"
+
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+
+	dosym telnetd /usr/sbin/in.telnetd
+	dodoc "${FILESDIR}/net.issue.sample"
+	newdoc telnet/README README.telnet
+	newdoc telnet/TODO TODO.telnet
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}/telnetd.xinetd" telnetd
+}