commit: 3194d18b9e7a583b3dc764bd1fdceada10417859 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Sep 23 23:15:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 23 23:17:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3194d18b
net-misc/openssh: depend on newer gcc-config or clang-toolchain-symlinks Made the classic mistake I always moan about! Blockers don't affect dependency resolution, although they do mean "eventual consistency" in that it ensures you do upgrade by the end of the run. Let's be safe given we're talking miscompilation here (i.e. runtime failure) and depend on newer gcc-config (or newer clang-toolchain-symlinks) in openssh to make sure the merge order is correct. Bug: https://bugs.gentoo.org/872416 Bug: https://bugs.gentoo.org/872548 See: cc6a27ec99c1e08ac51c69ff0ab4c2b8a5578e2e Fixes: 961f11b11a0022c5a4a4a34cc4065d13a48906ba Signed-off-by: Sam James <sam <AT> gentoo.org> .../{openssh-9.0_p1-r5.ebuild => openssh-9.0_p1-r6.ebuild} | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net-misc/openssh/openssh-9.0_p1-r5.ebuild b/net-misc/openssh/openssh-9.0_p1-r6.ebuild similarity index 98% rename from net-misc/openssh/openssh-9.0_p1-r5.ebuild rename to net-misc/openssh/openssh-9.0_p1-r6.ebuild index 072e3ca8f2df..84ce8c292cc7 100644 --- a/net-misc/openssh/openssh-9.0_p1-r5.ebuild +++ b/net-misc/openssh/openssh-9.0_p1-r6.ebuild @@ -57,7 +57,9 @@ REQUIRED_USE=" # tests currently fail with XMSS REQUIRED_USE+="test? ( !xmss )" +# Blocker on older gcc-config for bug #872416 LIB_DEPEND=" + !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] @@ -88,11 +90,18 @@ RDEPEND="${RDEPEND} !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth ) " -# Blocker on older gcc-config for bug #872416 +# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - !<sys-devel/gcc-config-2.6 sys-devel/autoconf virtual/pkgconfig + || ( + >=sys-devel/gcc-config-2.6 + || ( + >=sys-devel/clang-toolchain-symlinks-14-r1:14 + >=sys-devel/clang-toolchain-symlinks-15-r1:15 + >=sys-devel/clang-toolchain-symlinks-16-r1:* + ) + ) verify-sig? ( sec-keys/openpgp-keys-openssh ) "
