From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4F2015800F for ; Fri, 13 Jan 2023 05:34:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A803FE0950; Fri, 13 Jan 2023 05:34:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6826AE0950 for ; Fri, 13 Jan 2023 05:34:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F824340AEC for ; Fri, 13 Jan 2023 05:34:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C77882C for ; Fri, 13 Jan 2023 05:33:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673587987.036c5283994e19f567c9c674a8567a8b49879aa1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/252-no-stack-protector-bpf.patch sys-apps/systemd/systemd-252.4-r1.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 036c5283994e19f567c9c674a8567a8b49879aa1 X-VCS-Branch: master Date: Fri, 13 Jan 2023 05:33:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: efbc5e4d-1cb2-4bce-b390-93d336bc1d27 X-Archives-Hash: 5245a438c2be94c8fb935710fe63e36f commit: 036c5283994e19f567c9c674a8567a8b49879aa1 Author: Sam James gentoo org> AuthorDate: Fri Jan 13 05:33:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 13 05:33:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036c5283 sys-apps/systemd: fix build w/ clang+ssp Bug: https://bugs.gentoo.org/890004 Signed-off-by: Sam James gentoo.org> .../systemd/files/252-no-stack-protector-bpf.patch | 26 ++++++++++++++++++++++ sys-apps/systemd/systemd-252.4-r1.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/sys-apps/systemd/files/252-no-stack-protector-bpf.patch b/sys-apps/systemd/files/252-no-stack-protector-bpf.patch new file mode 100644 index 000000000000..4e4d1a1bafa5 --- /dev/null +++ b/sys-apps/systemd/files/252-no-stack-protector-bpf.patch @@ -0,0 +1,26 @@ +https://github.com/systemd/systemd/pull/26050 + +From d6a0784a350fb27698ed04f7ada17137324b31bb Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 13 Jan 2023 05:17:56 +0000 +Subject: [PATCH] bpf: disable -fstack-protector in meson + +In Gentoo, we recently started making Clang behave the same way as +our GCC, with -fstack-protector and some friends enabled by default. + +SSP doesn't make sense for BPF, so disable it explicitly. + +See also e.g. https://www.spinics.net/lists/netdev/msg556400.html. + +Bug: https://bugs.gentoo.org/890004 +--- a/src/core/bpf/meson.build ++++ b/src/core/bpf/meson.build +@@ -7,6 +7,7 @@ endif + bpf_clang_flags = [ + '-std=gnu11', + '-Wno-compare-distinct-pointer-types', ++ '-fno-stack-protector', + '-O2', + '-target', + 'bpf', + diff --git a/sys-apps/systemd/systemd-252.4-r1.ebuild b/sys-apps/systemd/systemd-252.4-r1.ebuild index 6391f42dbf34..e3c0075dcfaa 100644 --- a/sys-apps/systemd/systemd-252.4-r1.ebuild +++ b/sys-apps/systemd/systemd-252.4-r1.ebuild @@ -241,6 +241,7 @@ src_unpack() { src_prepare() { local PATCHES=( "${FILESDIR}/252-tmpfiles-ub.patch" + "${FILESDIR}/252-no-stack-protector-bpf.patch" ) if ! use vanilla; then