[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/

["Sam James" <sam@gentoo.org>]

commit:     d791fcea11352d79bb896d131433a4c12d5e2fee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 08:43:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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;
  	}
+