Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/
Date: Thu, 28 Jun 2018 20:00:52
Message-Id: 1530216021.b28378fc2358c24785f41fdf92c00d617998ea3d.blueness@gentoo
1 commit: b28378fc2358c24785f41fdf92c00d617998ea3d
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 28 20:00:21 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 28 20:00:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28378fc
7
8 net-misc/openssh: stackprotector is broken on musl x86
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-misc/openssh/openssh-7.7_p1-r102.ebuild | 3 +++
13 net-misc/openssh/openssh-7.7_p1-r6.ebuild | 3 +++
14 2 files changed, 6 insertions(+)
15
16 diff --git a/net-misc/openssh/openssh-7.7_p1-r102.ebuild b/net-misc/openssh/openssh-7.7_p1-r102.ebuild
17 index c4747a2597e..83b9dd34711 100644
18 --- a/net-misc/openssh/openssh-7.7_p1-r102.ebuild
19 +++ b/net-misc/openssh/openssh-7.7_p1-r102.ebuild
20 @@ -293,6 +293,9 @@ src_configure() {
21 $(use_with ssl ssl-engine)
22 )
23
24 + # stackprotect is broken on musl x86
25 + use elibc_musl && use x86 && myconf+=( --without-stackprotect )
26 +
27 # The seccomp sandbox is broken on x32, so use the older method for now. #553748
28 use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
29
30
31 diff --git a/net-misc/openssh/openssh-7.7_p1-r6.ebuild b/net-misc/openssh/openssh-7.7_p1-r6.ebuild
32 index e84b7d126a3..2d068fd5c8e 100644
33 --- a/net-misc/openssh/openssh-7.7_p1-r6.ebuild
34 +++ b/net-misc/openssh/openssh-7.7_p1-r6.ebuild
35 @@ -293,6 +293,9 @@ src_configure() {
36 $(use_with ssl ssl-engine)
37 )
38
39 + # stackprotect is broken on musl x86
40 + use elibc_musl && use x86 && myconf+=( --without-stackprotect )
41 +
42 # The seccomp sandbox is broken on x32, so use the older method for now. #553748
43 use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )