Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/
Date: Fri, 15 Mar 2019 13:19:21
Message-Id: 1552655949.6ea715e600364ec22e461a4ca77536004ed6a0b8.polynomial-c@gentoo
1 commit: 6ea715e600364ec22e461a4ca77536004ed6a0b8
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sun Mar 10 03:04:27 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 15 13:19:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea715e6
7
8 sys-apps/sysvinit: Do not force -fstack-protector-strong.
9
10 Fixes: https://bugs.gentoo.org/679504
11 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 sys-apps/sysvinit/sysvinit-2.94.ebuild | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
18 index bb9842d5c6a..ea95cca195f 100644
19 --- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
20 +++ b/sys-apps/sysvinit/sysvinit-2.94.ebuild
21 @@ -36,7 +36,10 @@ PATCHES=(
22
23 src_prepare() {
24 default
25 - sed -i '/^CPPFLAGS =$/d' src/Makefile || die
26 + sed -i \
27 + -e '/^CPPFLAGS =$/d' \
28 + -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
29 + src/Makefile || die
30
31 # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
32 sed -i -r \