From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51F2B159C96 for ; Fri, 26 Jul 2024 08:28:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D825E2A31; Fri, 26 Jul 2024 08:28:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65770E2A31 for ; Fri, 26 Jul 2024 08:28:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53C52335CAF for ; Fri, 26 Jul 2024 08:28:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B91AA1B9A for ; Fri, 26 Jul 2024 08:28:54 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1721982489.3dff12d1212dece67236358b1f198108abac2642.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/telnet-bsd/, net-misc/telnet-bsd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/telnet-bsd/files/telnet-bsd-1.2-openpty-util.patch net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild X-VCS-Directories: net-misc/telnet-bsd/ net-misc/telnet-bsd/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3dff12d1212dece67236358b1f198108abac2642 X-VCS-Branch: master Date: Fri, 26 Jul 2024 08:28:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5bc37deb-a5e0-47ea-973c-13e88f996ce8 X-Archives-Hash: 8cc16e4b62e902cb568c358aa61ac056 commit: 3dff12d1212dece67236358b1f198108abac2642 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jul 26 08:28:09 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jul 26 08:28:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dff12d1 net-misc/telnet-bsd-1.2-r4: fix compilation on Solaris and Darwin openpty is defined in util.h or temios.h instead of pty.h on Linux Signed-off-by: Fabian Groffen gentoo.org> .../files/telnet-bsd-1.2-openpty-util.patch | 31 ++++++++++++++++++++++ net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild | 1 + 2 files changed, 32 insertions(+) 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 + #endif ++#ifdef HAVE_UTIL_H ++#include ++#endif ++#ifdef HAVE_TERMIOS_H ++#include ++#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-r4.ebuild index 8ba189abbfd1..582837e7ab7c 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${P}-fbsd.patch "${FILESDIR}"/${PN}-1.2-format-security.patch "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${P}-openpty-util.patch ) src_prepare() {