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 48DAF1581C1 for ; Sun, 7 Jul 2024 08:44:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 817E12BC08A; Sun, 7 Jul 2024 08:44:20 +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 65BA92BC08A for ; Sun, 7 Jul 2024 08:44:20 +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 5EDC3342F9D for ; Sun, 7 Jul 2024 08:44:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 068BDDC4 for ; Sun, 7 Jul 2024 08:44:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1720341836.452e53a96051ccb5000b6d1b923bc5f25aade72d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch net-misc/openssh/openssh-9.8_p1-r2.ebuild X-VCS-Directories: net-misc/openssh/files/ net-misc/openssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 452e53a96051ccb5000b6d1b923bc5f25aade72d X-VCS-Branch: master Date: Sun, 7 Jul 2024 08:44:17 +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: 773f3e95-4eec-4fa7-90ae-fa7939415b44 X-Archives-Hash: 35afed7c3a13d1e0640f41211a04882f commit: 452e53a96051ccb5000b6d1b923bc5f25aade72d Author: Quincy Fleming protonmail com> AuthorDate: Thu Jul 4 22:00:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 7 08:43:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452e53a9 net-misc/openssh: Fix compile error on musl Closes: https://github.com/gentoo/gentoo/pull/37440 Closes: https://bugs.gentoo.org/935353 Signed-off-by: Quincy Fleming protonmail.com> Signed-off-by: Sam James gentoo.org> net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch | 13 +++++++++++++ net-misc/openssh/openssh-9.8_p1-r2.ebuild | 1 + 2 files changed, 14 insertions(+) diff --git a/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch new file mode 100644 index 000000000000..98c480445f53 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch @@ -0,0 +1,13 @@ +# Pulled patch from Voidlinux +# Bug: https://bugs.gentoo.org/935353 +--- a/openbsd-compat/port-linux.c ++++ b/openbsd-compat/port-linux.c +@@ -366,7 +366,7 @@ + error_f("socket \"%s\": %s", path, strerror(errno)); + goto out; + } +- if (connect(fd, &addr, sizeof(addr)) != 0) { ++ if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) != 0) { + error_f("socket \"%s\" connect: %s", path, strerror(errno)); + goto out; + } diff --git a/net-misc/openssh/openssh-9.8_p1-r2.ebuild b/net-misc/openssh/openssh-9.8_p1-r2.ebuild index b1c11e3796c9..8c6f3c5cb671 100644 --- a/net-misc/openssh/openssh-9.8_p1-r2.ebuild +++ b/net-misc/openssh/openssh-9.8_p1-r2.ebuild @@ -79,6 +79,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" + "${FILESDIR}/${PN}-9.8_p1-musl-connect.patch" ) pkg_pretend() {