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 A73EE1581C1 for ; Sun, 7 Jul 2024 08:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D96F72BC013; Sun, 7 Jul 2024 08:44:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C30822BC013 for ; Sun, 7 Jul 2024 08:44:19 +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 17C8B340C76 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 1B8B21DC6 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: <1720341837.d791fcea11352d79bb896d131433a4c12d5e2fee.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d791fcea11352d79bb896d131433a4c12d5e2fee 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: 89a547da-7067-42c2-ae0c-5cba17311cce X-Archives-Hash: 10ddefd619eade2cdd2756df0e580f62 commit: d791fcea11352d79bb896d131433a4c12d5e2fee Author: Sam James gentoo org> AuthorDate: Sun Jul 7 08:43:34 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 7 08:43:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d791fcea net-misc/openssh: switch to upstream variant of patch Bug: https://bugs.gentoo.org/935353 Signed-off-by: Sam James gentoo.org> net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 index 98c480445f53..c0546e747a1f 100644 --- a/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch +++ b/net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch @@ -1,13 +1,14 @@ -# Pulled patch from Voidlinux -# Bug: https://bugs.gentoo.org/935353 +https://bugzilla.mindrot.org/show_bug.cgi?id=3707 +https://bugs.gentoo.org/935353 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c -@@ -366,7 +366,7 @@ +@@ -366,7 +366,7 @@ ssh_systemd_notify(const char *fmt, ...) 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) { ++ if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) { error_f("socket \"%s\" connect: %s", path, strerror(errno)); goto out; } +