summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-09 07:31:37 +0000
committerSam James <sam@gentoo.org>2023-01-09 07:31:37 +0000
commit393a30cb0ee700a2fe25b463c1049ededed0f71c (patch)
tree9f15ef669ea00e89dbeabedd0071f1899c3b9269
parentapp-text/libpaper: Stabilize 2.0.4 ppc, #888703 (diff)
downloadgentoo-393a30cb0ee700a2fe25b463c1049ededed0f71c.tar.gz
gentoo-393a30cb0ee700a2fe25b463c1049ededed0f71c.tar.bz2
gentoo-393a30cb0ee700a2fe25b463c1049ededed0f71c.zip
sys-apps/sysvinit: stop downgrading FORTIFY_SOURCE
Closes: https://bugs.gentoo.org/890271 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--sys-apps/sysvinit/sysvinit-3.06-r1.ebuild (renamed from sys-apps/sysvinit/sysvinit-3.06.ebuild)6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys-apps/sysvinit/sysvinit-3.06.ebuild b/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
index b0a02ff6c995..f34dafcfe0d4 100644
--- a/sys-apps/sysvinit/sysvinit-3.06.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -51,9 +51,13 @@ PATCHES=(
src_prepare() {
default
+ # We already enforce F_S=2 as a minimum in our toolchain, and
+ # allow 3. Also, SSP doesn't always make sense for some platforms
+ # e.g. HPPA. It's default-on in our toolchain where it works.
sed -i \
-e '/^CPPFLAGS =$/d' \
-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+ -e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
src/Makefile || die
# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux