1 |
commit: e3278c05c4781b31b185b6d8daa0d3e65e413521 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 4 17:00:10 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 4 17:00:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3278c05 |
7 |
|
8 |
net-misc/openssh: stackprotector is broken on musl ppc |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
net-misc/openssh/openssh-7.9_p1-r4.ebuild | 4 ++-- |
14 |
net-misc/openssh/openssh-8.0_p1-r1.ebuild | 4 ++-- |
15 |
net-misc/openssh/openssh-8.0_p1.ebuild | 4 ++-- |
16 |
3 files changed, 6 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
19 |
index 22614b8fc65..de21ccc51cb 100644 |
20 |
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
21 |
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild |
22 |
@@ -300,8 +300,8 @@ src_configure() { |
23 |
$(use_with !elibc_Cygwin hardening) #659210 |
24 |
) |
25 |
|
26 |
- # stackprotect is broken on musl x86 |
27 |
- use elibc_musl && use x86 && myconf+=( --without-stackprotect ) |
28 |
+ # stackprotect is broken on musl x86 and ppc |
29 |
+ use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) |
30 |
|
31 |
# The seccomp sandbox is broken on x32, so use the older method for now. #553748 |
32 |
use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) |
33 |
|
34 |
diff --git a/net-misc/openssh/openssh-8.0_p1-r1.ebuild b/net-misc/openssh/openssh-8.0_p1-r1.ebuild |
35 |
index b0bcb15646d..c541630005b 100644 |
36 |
--- a/net-misc/openssh/openssh-8.0_p1-r1.ebuild |
37 |
+++ b/net-misc/openssh/openssh-8.0_p1-r1.ebuild |
38 |
@@ -293,8 +293,8 @@ src_configure() { |
39 |
$(use_with !elibc_Cygwin hardening) #659210 |
40 |
) |
41 |
|
42 |
- # stackprotect is broken on musl x86 |
43 |
- use elibc_musl && use x86 && myconf+=( --without-stackprotect ) |
44 |
+ # stackprotect is broken on musl x86 and ppc |
45 |
+ use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) |
46 |
|
47 |
# The seccomp sandbox is broken on x32, so use the older method for now. #553748 |
48 |
use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) |
49 |
|
50 |
diff --git a/net-misc/openssh/openssh-8.0_p1.ebuild b/net-misc/openssh/openssh-8.0_p1.ebuild |
51 |
index 8c02120a21f..c468c3f26f8 100644 |
52 |
--- a/net-misc/openssh/openssh-8.0_p1.ebuild |
53 |
+++ b/net-misc/openssh/openssh-8.0_p1.ebuild |
54 |
@@ -293,8 +293,8 @@ src_configure() { |
55 |
$(use_with !elibc_Cygwin hardening) #659210 |
56 |
) |
57 |
|
58 |
- # stackprotect is broken on musl x86 |
59 |
- use elibc_musl && use x86 && myconf+=( --without-stackprotect ) |
60 |
+ # stackprotect is broken on musl x86 and ppc |
61 |
+ use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) |
62 |
|
63 |
# The seccomp sandbox is broken on x32, so use the older method for now. #553748 |
64 |
use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) |