diff options
Diffstat (limited to 'net-misc/telnet-bsd')
| -rw-r--r-- | net-misc/telnet-bsd/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch | 31 | ||||
| -rw-r--r-- | net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild (renamed from net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild) | 5 |
3 files changed, 37 insertions, 2 deletions
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest index d398808a2d16..5d8f9fb5f404 100644 --- a/net-misc/telnet-bsd/Manifest +++ b/net-misc/telnet-bsd/Manifest @@ -1,7 +1,8 @@ AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c996e55f059ffde68aa6fbd52828dcbe252331b9e56b8b701a1a3500b1a8e0b804e612e317d69f1bde9fd8cfc872 SHA512 15082f7c3c71b6f0860061d5c8b32dabcd54e7956919c328870c3cbb32fb96dd59c06931216e43beaa39a8c056088b6a73737ae8f7973136ba08f0c67aed2939 AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081 AUX telnet-bsd-1.2-musl.patch 1097 BLAKE2B 3b2d7424a04abd910cc6dcb94b8ca740ed7a2294f768fa23e6559569a25032f1c29e8f8ca8c01195486c6d5354b050996d4aad4af58b33919770f51c22ad6aca SHA512 71d4450eb3a55483d93029fbe5f4fccee30fb63d170dd6b5d0f3f2ae4007a827920b7adfb53858ae048054f5d23ca8492c1f36e5f36ca8513f54bdb0800133d8 +AUX telnet-bsd-1.2-openpty-util.patch 868 BLAKE2B 7065e1bfdf2d69619beeba400648e25945e9d382d5c816c615cb012b800dfb4cb01ed76ed38c8b1c37563bd39f6f05d888df948582ed619b6fd8513e1cdf8494 SHA512 71d6b7cdd08dec944a200f3cdf1e54dbc24891fb1665afca2da9f74e28b43bec233124dc11e97588d85296dfecc34380b38c84440ec1d5302c6c99ae68b0d09a AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d -EBUILD telnet-bsd-1.2-r4.ebuild 1085 BLAKE2B c5f7ef9126843d42de7736e10afdafe7d170576df3726013949bbe65ede863516dae553a2aca0f70be81cc1c9cb9aec40cace4ecaeb83ea4bd5534f023e3bbee SHA512 9b925720ec41b75834c0ad38db56876a955de1def20afa741e5731d50498e5175ca4eb63a805cd5668823cf8148bb03961b3d63a4fab239bfaa34a2b5854b873 +EBUILD telnet-bsd-1.2-r5.ebuild 1189 BLAKE2B b492fdf14178917712f223480c8b6cb416da89385b593cd69d6d6001b45a90341667e9d248a09d26728620027abb280b019ff97258947129f3f8717b1f0a9379 SHA512 761f2d6f4c241120623cfc2031d17b5536079316df55114e922a8c335a62c04a97ea4a15476d31fe32c0599e96b4b87be3c6f06b5fa4227eed894ac09cf29f81 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch new file mode 100644 index 000000000000..332e7951ea53 --- /dev/null +++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch @@ -0,0 +1,31 @@ +build: openpty is declared in different headers on some systems + +Check for util.h next to pty.h for openpty is declared in it on at least +Darwin systems. Solaris needs termios.h + +--- telnet-bsd-1.2/configure.in 2024-07-26 10:13:46.814937718 +0200 ++++ telnet-bsd-1.2/configure.in 2024-07-26 10:19:15.734016104 +0200 +@@ -12,7 +12,7 @@ + AC_SUBST(PACKAGE) + AC_SUBST(VERSION) + +-AC_CHECK_HEADERS([pty.h utmp.h]) ++AC_CHECK_HEADERS([pty.h util.h termios.h utmp.h]) + + if test x"$ac_default_prefix" = x"/usr" + then +--- telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:13:46.859137256 +0200 ++++ telnet-bsd-1.2/telnetd/sys_term.c 2024-07-26 10:19:54.700983107 +0200 +@@ -36,6 +36,12 @@ + #ifdef HAVE_PTY_H + #include <pty.h> + #endif ++#ifdef HAVE_UTIL_H ++#include <util.h> ++#endif ++#ifdef HAVE_TERMIOS_H ++#include <termios.h> ++#endif + + #include "telnetd.h" + #include "pathnames.h" diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild index 8ba189abbfd1..1a89db5b5c43 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,6 +23,8 @@ RDEPEND=" selinux? ( sec-policy/selinux-telnet ) xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd + !net-misc/inetutils[telnet(-)] + !net-misc/inetutils[telnetd(-)] " BDEPEND="virtual/pkgconfig" @@ -30,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-fbsd.patch "${FILESDIR}"/${PN}-1.2-format-security.patch "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${P}-openpty-util.patch ) src_prepare() { |