From patchwork Wed May 11 23:49:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allan McRae X-Patchwork-Id: 2058 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.30) for (single-drop); Wed, 11 May 2022 23:49:34 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id sqMCF45LfGIE6gMAK+/4rw (envelope-from ) for ; Wed, 11 May 2022 23:49:34 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (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 mail.archlinux.org (Postfix) with ESMTPS id 193D7FBAF8E; Wed, 11 May 2022 23:49:33 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id DD002FABD09; Wed, 11 May 2022 23:49:32 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id 4E26EFABCFA for ; Wed, 11 May 2022 23:49:31 +0000 (UTC) From: Allan McRae DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1652312970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Z8J2lE/gJ7eWZ9OtROYERGVu9YzyLzz8dbl3K1fy/M0=; b=IXmM+Q94gdFEfgWEorhQszRxxTdh9vaQOkiYFVZsmNxJdVIsOmuHI1c8nJBpsw5DcZIgaH 4LORppYr2qGWCEBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1652312970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Z8J2lE/gJ7eWZ9OtROYERGVu9YzyLzz8dbl3K1fy/M0=; b=hjJk35L6mcroDjcA8/2MAVOaAUnER1ubc5fmSbwPw5ZkDnvrn+9gJ/mRGdhY8mex0Fu1iM Axybz146eOJF4TnDvq0vy1jbUlV42qthgroAkYqn1UjHuuoh5DBOPdsZTbGbBPOa4+1NxD Pl73wJ5TglsFBxSvCuTALd3fdTXqEGTJ+Peh4ZehDsESTX9HzcwU2xOIArnfdsTAHAnSRn wq1xmb6i453sJKa3nLawYmUuy4hI92UoaYTW8dspftXO+kdhNMqhrLiaoi/OrDTuy3xk8v GUN9YtzG9sgk+oj5o5hh6UqHaIaCqJfyZp4ZePRQLjwGCB35THkwJXzOSV5Mabtx1h0Gf0 6RfD6wblXe5CQacn9zgXbchAfMsSKR1nLhUz6fY+fmuv9noJyRq5SuZcpUfWhcciCRCkRd NwMMMkwjfXMQMcfgvaZL5o8vY3WnBGLU1rH5klU6QmMMbUJQCVsvUxct4sw32huB6KLI3E r0DpkY+4AXrMOwdDwXdWLwxA1UpYQdd7Ve55TZz6SCVIWMhCDgbpFQGV2A3uEV1hPxz5fT TwtluzSINaYyGHbSIHc/14JbanitdLA3jQ00ZxuIRH3+6XXa5oHGqaWqe7NU+Kkdt4l5K/ LuS/F1i388gmilJ2QLk97RjE59ZWmZk3C8CfhBi5/F3mNXfEzkhLA= To: pacman-dev@lists.archlinux.org Subject: [PATCH] libmakepkg: Do not "strip" files when the format is not recognised Date: Thu, 12 May 2022 09:49:20 +1000 Message-Id: <20220511234920.15234-1-allan@archlinux.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" X-Rspamd-Queue-Id: 193D7FBAF8E Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=IXmM+Q94; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b=hjJk35L6; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org; dmarc=pass (policy=none) header.from=archlinux.org X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_IN_DNSWL_MED(-0.40)[95.216.189.61:received,2a01:4f9:c010:9eb4::1:from]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-ed25519,archlinux.org:s=dkim-rsa]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[archlinux.org:+]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[allan@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_ONE(0.00)[1]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org We use a multi step process during stripping to ensure permissions do not get changed. However, if the initial objcopy fails, the subsequent cat results in a blank file. Abandon early if objcopy fails. Fixes FS#74486 Signed-off-by: Allan McRae --- scripts/libmakepkg/tidy/strip.sh.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 688bcf1b..4cf2107c 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -80,7 +80,12 @@ strip_file() { # copy debug symbols to debug directory mkdir -p "$dbgdir/${binary%/*}" - objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" + + # abandon processing files that are not a recognised format + if ! objcopy --only-keep-debug "$binary" "$dbgdir/$binary.debug" 2>/dev/null; then + return + fi + local tempfile=$(mktemp "$binary.XXXXXX") objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" "$tempfile" cat "$tempfile" > "$binary"