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 3510915802F for ; Sat, 11 Mar 2023 18:50:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5129CE0817; Sat, 11 Mar 2023 18:50:45 +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 38723E0817 for ; Sat, 11 Mar 2023 18:50:45 +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 23A7B340E36 for ; Sat, 11 Mar 2023 18:50:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D01988F for ; Sat, 11 Mar 2023 18:50:42 +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: <1678560628.68d4571e78f348eac41d64ba306ec2a8226ad17c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/docker/docker-23.0.1.ebuild X-VCS-Directories: app-containers/docker/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 68d4571e78f348eac41d64ba306ec2a8226ad17c X-VCS-Branch: master Date: Sat, 11 Mar 2023 18:50:42 +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: aa178f53-5522-48c8-b423-d786fb8ff298 X-Archives-Hash: 0b26e58ca1e8a2f686a242ef7fea629c commit: 68d4571e78f348eac41d64ba306ec2a8226ad17c Author: Sam James gentoo org> AuthorDate: Sat Mar 11 18:48:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 11 18:50:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d4571e app-containers/docker: drop USE=hardened hacks 1. These aren't needed on hardened systems anyway (we've had default PIE on normal, non-hardened systems for years); 2. The relevant variables are gone upstream, see https://github.com/moby/moby/commit/877baae03e1810b6a6afaa8b767b8df25f5c5cae, which fails because of the grep sanity check in the ebuild (correctly); 3. If we did need to keep this check, we would need to do it based on a e.g. toolchain-funcs function to check if the toolchain defaults to PIE, but not based on USE=hardened. Closes: https://bugs.gentoo.org/900849 Signed-off-by: Sam James gentoo.org> app-containers/docker/docker-23.0.1.ebuild | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app-containers/docker/docker-23.0.1.ebuild b/app-containers/docker/docker-23.0.1.ebuild index e52d11e4501a..407387c83b71 100644 --- a/app-containers/docker/docker-23.0.1.ebuild +++ b/app-containers/docker/docker-23.0.1.ebuild @@ -253,14 +253,6 @@ src_compile() { fi done - if use hardened; then - sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die - grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' - 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' - fi - # build daemon ./hack/make.sh dynbinary || die 'dynbinary failed' }