diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2017-04-22 20:48:34 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2017-04-22 20:48:34 -0400 |
| commit | f6eb8369287dafc13fe1b7d2464764f9db90bc97 (patch) | |
| tree | b47052a29e1e828e3a7366bbb050d49862ac0547 /net-misc | |
| parent | net-misc/openssh: needs --without-stackprotect on i686 with gcc-5 (diff) | |
| download | musl-f6eb8369287dafc13fe1b7d2464764f9db90bc97.tar.gz musl-f6eb8369287dafc13fe1b7d2464764f9db90bc97.tar.bz2 musl-f6eb8369287dafc13fe1b7d2464764f9db90bc97.zip | |
net-misc/openssh: restrict --without-stackprotector to just i686
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.3_p1-r7.ebuild | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 0d77c6c8..858bae03 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -20,5 +20,5 @@ DIST openssh-7.3_p1-sctp.patch.xz 9968 SHA256 18c3db45ed1e5495db29626938d8432aee DIST openssh-7.3p1+x509-9.2.diff.gz 588078 SHA256 45f054cbb2b77ac8cc7ab01439e34083382137d47b840ca274555b7e2cf7098b SHA512 fab0da148b0833a651e8a7c36f344aacecef6fa92f8f1cb6302272d98c1ab018831f5850dcaa8f54a39f9ada9b7d5b0a0ea01defc3c6f603bbe211f6bff6a841 WHIRLPOOL 53f63d879f563909c57d23ced273e23eda1eace2a2ddfd54edf5f2ef15218cc7e5d927e54714b6850db541f361c459de50d79b0a4516b43ce4cba8eb66b49485 DIST openssh-7.3p1.tar.gz 1522617 SHA256 3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc SHA512 7ba2d6140f38bd359ebf32ef17626e0ae1c00c3a38c01877b7c6b0317d030f10a8f82a0a51fc3b6273619de9ed73e24b8cf107b1e968f927053a3bedf97ff801 WHIRLPOOL f852026638d173d455f74e3fce16673fc4b10f32d954d5bb8c7c65df8d1ca7efd0938177dd9fb6e1f7354383f21c7bca8a2f01e89793e32f8ca68c30456a611c DIST openssh-lpk-7.3p1-0.3.14.patch.xz 17800 SHA256 cf1f60235cb8b0e561cd36cbf9e4f437e16fd748c2616d3f511c128c02deb76c SHA512 e9a73c5f13e41f6e11c744fdbcdb2e399c394479f79249e901cb3c101efb06f23d51d3ba4869db872184fa034a5910fc93a730fe906266c8d7409e39ad5b1ecd WHIRLPOOL bbdeadbed8f901148713bd9e4a082a4be2992c3151f995febd8be89bbb85d91185e1f0413b5a94a9340f2f404d18c9cee2aa6e032adaee0306aa1c624f6cc09c -EBUILD openssh-7.3_p1-r7.ebuild 11539 SHA256 63fcb03fbc89af04ad3e72490cfd9ceb931699e3337b9e40aee15089bd769b36 SHA512 50b36971c70d87893374f9cd4176ddd13518d4c1a04e2682a1a7134d1d42f0fd18a69821b4d88010ef93f5432b646367c979ac02aeff66223546c41b18063a84 WHIRLPOOL 27c01ef1b50c7efeb452228c14e4b762c3c435dbfb9435bbb0f3b48cb3ea63e1592b5aabcecddb50cfd21b341a776e2df55933254ed27bd0194dfa2945dd604c +EBUILD openssh-7.3_p1-r7.ebuild 11605 SHA256 9e0c2be8c1053141a64150e7254bec720d5100435ef56bcb6408346d80881285 SHA512 24719eaadbe2089cd7c58e878a5a8b4e3da2468ff4282d7278021408676cb549dcf993aa0f770076d1144adacc3d98e8264699680a3ab637e02cbc40057da6bd WHIRLPOOL 06e438e61d120e3274212a594881843866d32b8b5b2410d58557116eaed0f8be1b3d6dcfda9ad63fab4950427c8213e94a340e641693cc889b5d3e14027eba54 MISC metadata.xml 2212 SHA256 50f6e3651c8aeb86cfe90d92cef6a2b55640c400584f5fdbb6418cef7ac16f25 SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 WHIRLPOOL 6d1080bc5c3b10a63836b5286d0d66b925a9d27d35e9855c9f966445458c1d6a752854d019c1740420ea78aef6f60105bef4c771fe61a95aae898034cf100705 diff --git a/net-misc/openssh/openssh-7.3_p1-r7.ebuild b/net-misc/openssh/openssh-7.3_p1-r7.ebuild index 6f494dc2..681a5ee6 100644 --- a/net-misc/openssh/openssh-7.3_p1-r7.ebuild +++ b/net-misc/openssh/openssh-7.3_p1-r7.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit eutils user flag-o-matic multilib autotools pam systemd versionator +inherit eutils user flag-o-matic multilib autotools pam systemd versionator toolchain-funcs # Make it more portable between straight releases # and _p? releases. @@ -196,7 +196,6 @@ src_configure() { use static && append-ldflags -static local myconf=( - --without-stackprotect --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run @@ -222,6 +221,10 @@ src_configure() { $(use_with ssl ssl-engine) ) + if [[ $(tc-arch) == x86 ]]; then + myconf+=( --without-stackprotect) + fi + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) |