net-misc/openssh: stackprotector is broken on musl x86

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/net-misc/openssh/openssh-7.7_p1-r102.ebuild b/net-misc/openssh/openssh-7.7_p1-r102.ebuild
index c4747a2597eeccc7bcf218057f8b1d01872a4ea2..83b9dd34711921de50f1c9cf1b61b82e0f72d013 100644 (file)
--- a/net-misc/openssh/openssh-7.7_p1-r102.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r102.ebuild
@@ -293,6 +293,9 @@ src_configure() {
                $(use_with ssl ssl-engine)
        )
 
+       # stackprotect is broken on musl x86
+       use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
        # The seccomp sandbox is broken on x32, so use the older method for now. #553748
        use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
 

diff --git a/net-misc/openssh/openssh-7.7_p1-r6.ebuild b/net-misc/openssh/openssh-7.7_p1-r6.ebuild
index e84b7d126a32f2f8c870545280ff3b08e6ac1597..2d068fd5c8e6cf149977c2eee5d9736234174b97 100644 (file)
--- a/net-misc/openssh/openssh-7.7_p1-r6.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r6.ebuild
@@ -293,6 +293,9 @@ src_configure() {
                $(use_with ssl ssl-engine)
        )
 
+       # stackprotect is broken on musl x86
+       use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
        # The seccomp sandbox is broken on x32, so use the older method for now. #553748
        use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )