Message ID | 20200110015935.981029-1-eschwartz@archlinux.org |
---|---|
State | Accepted, archived |
Delegated to: | Andrew Gregory |
Headers | show
Return-Path: <pacman-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id AB5131620E624 for <patchwork@archlinux.org>; Fri, 10 Jan 2020 02:00:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [127.0.9.0] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for <patchwork@archlinux.org>; Fri, 10 Jan 2020 02:00:21 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id E854B18012A5F9; Fri, 10 Jan 2020 02:00:16 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 3776618012A5F0; Fri, 10 Jan 2020 02:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1578621605; bh=CqlhG1DPLB8ERMLxrfjU762LH8JxOVDWTNgteqO3eow=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=WVPk+t5meVu7IM8dADrlNuArKlzMq2phRdckXj+LzMSj99yKZswphCvdsSXiltRDS A7ptptxTS0FcXmrLxcBYtjzEl9ULB8EH8RI0r3tEph4SXszhA0IHhfHhDK/2WgYJnt e8K1MXV5p6XG020QT3w3w9lFThHSwu9Zh/7UrWSEeysAJ8SWlvmZfEaDpSzRwji8X2 k1ro9u9YxY43IWppXwhmzcSdALnb3mOgdKaIZ9YP6XBA6LUiEE8seG4XjJkxaV2u28 QwfVLg0fX2CwJInhycux8oscXpRYVqbiYePqvC2Jraz8ivWvpDu23GYknpw1NYD6o8 d5kfg7ghjViAq5Iv8mG1MGhqEWw6+tvpiMJA6nTfLU24AsH2Ub7lbG61NIWtsxPr3w PVzjH2FmnQDOcDYTFZR9saWoy8dMLf4nzQIO39kRmICjhR636nN7y6MqPgnsJva+gB u1m7drsHf8Zam7yJHOR4O+tXLPi/05m/3bNsrqUggZ4Ft5lhhfuZBFoAE9bTRTtIbR S5Q8Uhp2wW81NWj+1BCvyzqKtQ6j6vSOOhWsEc69CTIow/nn5Ob5a3x5ddSKOgIMEt axy6ACavHiFagXjsSsVFueTu//aKF8ILVZdvspOZzU/dct/rTcykZ1IvkuyhvsgQ84 sboZkE9D2d4UtguY8wkBqbrc= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5443C2BE5A; Fri, 10 Jan 2020 02:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1578621602; bh=CqlhG1DPLB8ERMLxrfjU762LH8JxOVDWTNgteqO3eow=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=NKl0RhWKx1Mneu6OQPlg2NbjM+pLGv47MLkcAPLtssJpXYvLqKfZ6STF1rm2TThQx UpJktQwFRM+hbuNqxT637eLFSG/NKTVdvROxcBVeXiLYYSDCtiBWJ+YX2DHUBSZxSU gtXB9Dei6POo4NcRP8A8dUz0Zj6ugbwyTXgDMU4pWA6Lu3tNbCPM9wfSl4ZMIKZTdI j5wtrvwPw0AYOsp39lYFW/pliVXe1A78KszEodKxIX/1IjM0pDMGSivPjpZ9Gcx0QY DPe6QnLSEYF7VnKY5j8F8ojjGif71hDko6Mqly7qA54Ypb2a65MhmUQUSWwn0detwC W86tcA3B3kfn/NL9hp3ul8O+aKvDv1yVPBoo4xWWMeRD1cLlXWz1/W4KdUw2J00+Im wHsjhPtPdlk5e+nKKgsECZSaRGbAP/chUd3J1wl+inky3ZKlXdWuPeDCgdcLtOW0MJ jffzX5D8WwtS617Dkdb1qOyB0kej6QYcprIxi1+A3CNhECxyxMP1gCR0F8LcRaUPzi IRev8Q7lkF0dQ+lpWuOm1g12NbsZnvuZM8PiuVdWswxEIz/6GRRyG0R3j1jWzKm0qk Cp9TiiOzr4/4FolWQkUydHMmgvfjPNCuO53Rsk02mUtFCQiMou6FMPdi6or8lBJaUc Ca9xXKAu3shZ9SQYM6W5nLOQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CAFE62BE57 for <pacman-dev@lists.archlinux.org>; Fri, 10 Jan 2020 01:59:58 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Fri, 10 Jan 2020 01:59:58 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id CB8D118012A5E3; Fri, 10 Jan 2020 01:59:57 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 45DD418012A5E2; Fri, 10 Jan 2020 01:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1578621597; bh=CqlhG1DPLB8ERMLxrfjU762LH8JxOVDWTNgteqO3eow=; h=From:To:Subject:Date; b=RfOLXJ/2vOKY0ep4MaSxfyRSjabsKevILjA447ipWogG+grxvAN6lHkA70c8RbCDZ xIzDLMeKoJXZhBMNrgt1rCM7ofhz6p4KUA3gbSyIQF6Y6U+O7UTrSkaaA8jJPrOztx UH4O8Jd6LhMIxB9XZQyZft99P8TsCNETWLOEkpbiH3b8LaOEPCTELfrYgIoEsfF+2z c8at0eGYxwPvKfMul75WDX7QU54c37DO4oUl7n67AIvpIoHx5/MWvq88pjv9dHwjra Jw3OrHgp+rmQGaVKeM/RL3qG45/phC2ninl0xRNw9qYJ/7/+6agqR2LYY0DPZOK6sL DzwNOua3AkWPn3IbY1UojCsfhXQMSpEk9gU4dDk3eeUaRcTh4mzPLUVrhGldckgzAc dGMe0/iHToGQlLit8M9hwNQxGen1p1GfXm9CW4Vrsc9GPiwxV7h886zO11H8ArE8Sd Apw8pboTvMHQlyTovyQN4qpRalbIqwquHe2MieNBn/ddeWP+AVOOLv3TpflcH4XRkV 7IHaD6Bs7SRhaCO3kcunboz7cTUtbTz+Ynl2xdaJwVo/CjswwsdNXX11RcuMZB17b1 180NECezL4D7W11H8WhHXk4uQw1W5Kkh5nGUif1iRiWdH3scXCPIqtF520YxpyJcmo 4WpMV36KGsb9MEayw6AApN1g= From: Eli Schwartz <eschwartz@archlinux.org> To: pacman-dev@archlinux.org Date: Thu, 9 Jan 2020 20:59:35 -0500 Message-Id: <20200110015935.981029-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman development <pacman-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-dev/> List-Post: <mailto:pacman-dev@archlinux.org> List-Help: <mailto:pacman-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=subscribe> Reply-To: Discussion list for pacman development <pacman-dev@archlinux.org> Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" <pacman-dev-bounces@archlinux.org> |
Series |
[pacman-dev] makepkg: fix one more file-seccomp issue
|
expand
|
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1bd810f0..876f00f0 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -111,7 +111,7 @@ tidy_strip() { local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do - case "$(file -bi "$binary")" in + case "$(@FILECMD@ -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) strip_flags="$STRIP_SHARED";; *application/x-archive*) # Libraries (.a)
When file is called via fakeroot, it doesn't matter whether you use -z or not, it is still incompatible with seccomp. Fix by configuring it with FILECMD when used in the fakeroot 'tidy' run. Fixes FS#65100 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- For release/5.2.x only since the call site is gone in master. scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)