summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-07-07 09:43:34 +0100
committerSam James <sam@gentoo.org>2024-07-07 09:43:57 +0100
commitd791fcea11352d79bb896d131433a4c12d5e2fee (patch)
tree80a9334e8331ec230e14974afa09b4cd47f93526
parentnet-misc/openssh: Fix compile error on musl (diff)
downloadgentoo-d791fcea11352d79bb896d131433a4c12d5e2fee.tar.gz
gentoo-d791fcea11352d79bb896d131433a4c12d5e2fee.tar.bz2
gentoo-d791fcea11352d79bb896d131433a4c12d5e2fee.zip
net-misc/openssh: switch to upstream variant of patch
Bug: https://bugs.gentoo.org/935353 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch9
1 files 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;
}
+