Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/
Date: Wed, 27 Jul 2016 23:11:57
Message-Id: 1469661095.650b3c65b67fdd23d98c920c3f7c586789c4dc41.williamh@gentoo
1 commit: 650b3c65b67fdd23d98c920c3f7c586789c4dc41
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 23:06:41 2016 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 23:11:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650b3c65
7
8 app-emulation/docker: 1.12.0-rc5: apply hardened patch for #587726
9
10 Package-Manager: portage-2.2.28
11
12 app-emulation/docker/docker-1.12.0_rc5.ebuild | 7 +++++--
13 1 file changed, 5 insertions(+), 2 deletions(-)
14
15 diff --git a/app-emulation/docker/docker-1.12.0_rc5.ebuild b/app-emulation/docker/docker-1.12.0_rc5.ebuild
16 index 8120c57..dfae766 100644
17 --- a/app-emulation/docker/docker-1.12.0_rc5.ebuild
18 +++ b/app-emulation/docker/docker-1.12.0_rc5.ebuild
19 @@ -194,8 +194,11 @@ src_compile() {
20 grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
21
22 sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
23 - -i hack/make/dynbinary || die
24 - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
25 + -i hack/make/dynbinary-client || die
26 + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
27 + -i hack/make/dynbinary-daemon || die
28 + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
29 + grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed'
30 fi
31
32 # let's set up some optional features :)