summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuincy Fleming <quincyf467@protonmail.com>2024-07-04 17:00:27 -0500
committerSam James <sam@gentoo.org>2024-07-07 09:43:56 +0100
commit452e53a96051ccb5000b6d1b923bc5f25aade72d (patch)
treed627c1719f160d3cf5ec84c114274a4c0a571269 /net-misc/openssh
parentmedia-libs/quirc: Keyword 1.2-r2 riscv, #935683 (diff)
downloadgentoo-452e53a96051ccb5000b6d1b923bc5f25aade72d.tar.gz
gentoo-452e53a96051ccb5000b6d1b923bc5f25aade72d.tar.bz2
gentoo-452e53a96051ccb5000b6d1b923bc5f25aade72d.zip
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 <quincyf467@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/files/openssh-9.8_p1-musl-connect.patch13
-rw-r--r--net-misc/openssh/openssh-9.8_p1-r2.ebuild1
2 files changed, 14 insertions, 0 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
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() {