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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06F5B13832E for ; Wed, 27 Jul 2016 23:11:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BA9BE0B68; Wed, 27 Jul 2016 23:11:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A255E0B68 for ; Wed, 27 Jul 2016 23:11:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33380340DAC for ; Wed, 27 Jul 2016 23:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 403DD7D4 for ; Wed, 27 Jul 2016 23:11:48 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1469661095.650b3c65b67fdd23d98c920c3f7c586789c4dc41.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-1.12.0_rc5.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 650b3c65b67fdd23d98c920c3f7c586789c4dc41 X-VCS-Branch: master Date: Wed, 27 Jul 2016 23:11:48 +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-Archives-Salt: 60db6e6e-6064-4935-8ed9-e1b015b3970a X-Archives-Hash: ab761c737b778df4ff3a85c5954cef43 commit: 650b3c65b67fdd23d98c920c3f7c586789c4dc41 Author: William Hubbs gentoo org> AuthorDate: Wed Jul 27 23:06:41 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Jul 27 23:11:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650b3c65 app-emulation/docker: 1.12.0-rc5: apply hardened patch for #587726 Package-Manager: portage-2.2.28 app-emulation/docker/docker-1.12.0_rc5.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app-emulation/docker/docker-1.12.0_rc5.ebuild b/app-emulation/docker/docker-1.12.0_rc5.ebuild index 8120c57..dfae766 100644 --- a/app-emulation/docker/docker-1.12.0_rc5.ebuild +++ b/app-emulation/docker/docker-1.12.0_rc5.ebuild @@ -194,8 +194,11 @@ src_compile() { grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary || die - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' + -i hack/make/dynbinary-client || die + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' fi # let's set up some optional features :)