commit:     b28378fc2358c24785f41fdf92c00d617998ea3d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 20:00:21 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 20:00:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28378fc

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

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-misc/openssh/openssh-7.7_p1-r102.ebuild | 3 +++
 net-misc/openssh/openssh-7.7_p1-r6.ebuild   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/net-misc/openssh/openssh-7.7_p1-r102.ebuild 
b/net-misc/openssh/openssh-7.7_p1-r102.ebuild
index c4747a2597e..83b9dd34711 100644
--- 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 e84b7d126a3..2d068fd5c8e 100644
--- 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 )
 

Reply via email to