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

[Anthony G. Basile]

commit:     e3278c05c4781b31b185b6d8daa0d3e65e413521
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 17:00:10 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May  4 17:00:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3278c05

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

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-misc/openssh/openssh-7.9_p1-r4.ebuild | 4 ++--
 net-misc/openssh/openssh-8.0_p1-r1.ebuild | 4 ++--
 net-misc/openssh/openssh-8.0_p1.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild 
b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 22614b8fc65..de21ccc51cb 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -300,8 +300,8 @@ src_configure() {
                $(use_with !elibc_Cygwin hardening) #659210
        )
 
-       # stackprotect is broken on musl x86
-       use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+       # stackprotect is broken on musl x86 and ppc
+       use elibc_musl && ( use x86 || use ppc ) && 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-8.0_p1-r1.ebuild 
b/net-misc/openssh/openssh-8.0_p1-r1.ebuild
index b0bcb15646d..c541630005b 100644
--- a/net-misc/openssh/openssh-8.0_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r1.ebuild
@@ -293,8 +293,8 @@ src_configure() {
                $(use_with !elibc_Cygwin hardening) #659210
        )
 
-       # stackprotect is broken on musl x86
-       use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+       # stackprotect is broken on musl x86 and ppc
+       use elibc_musl && ( use x86 || use ppc ) && 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-8.0_p1.ebuild 
b/net-misc/openssh/openssh-8.0_p1.ebuild
index 8c02120a21f..c468c3f26f8 100644
--- a/net-misc/openssh/openssh-8.0_p1.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1.ebuild
@@ -293,8 +293,8 @@ src_configure() {
                $(use_with !elibc_Cygwin hardening) #659210
        )
 
-       # stackprotect is broken on musl x86
-       use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+       # stackprotect is broken on musl x86 and ppc
+       use elibc_musl && ( use x86 || use ppc ) && 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 )