From patchwork Tue May 20 02:58:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D12B327BC49; Tue, 20 May 2025 03:59:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF7E327BC4A for ; Tue, 20 May 2025 03:59:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHDC6-0006D6-BQ; Mon, 19 May 2025 22:59:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHDC4-0006CG-QC for guix-patches@gnu.org; Mon, 19 May 2025 22:59:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHDC4-0005tB-Gi for guix-patches@gnu.org; Mon, 19 May 2025 22:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=VLW4XEfGm0Iqej8OIAUuSyG9zccZMvgoY6rkDt8nwuM=; b=WCwS9MHSjCms42yViZeyVuEy1Yg7vqw2uIIOgdxwrhQTJVO7UurFXXpdZ3YHzRazB+711k7B8QoSM7hBFpqhPS4KfwcPVkxVjwNeLNOq3DzHV7Rcw43lAQ/nk5gOGzKZPIeQvKXShbWEglFJ7c3DzQaRMBOfrrUpNhm4OBWLb8V5ocSRC2HrmC63ggaFrVFU86xh0ktEwtdDKpgQlfCXdn4eg9dZviqiqqauqdNZdX6gFej77DK/VuEciVfMChdqQ4X/GSEX+N5GiwuXU/7VlVOx47DIVftWhkF62ARgGD7JOLQGbRFCQ+jgTTQgf3Xht96XHEZz6QkNbwBVxUsuZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHDC4-0000Ul-CC; Mon, 19 May 2025 22:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78337] [PATCH v2 5/6] gnu: libarchive: Update to 3.7.7. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: z572@z572.online, guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 02:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78337@debbugs.gnu.org Cc: Zheng Junjie , Maxim Cournoyer , Zheng Junjie X-Debbugs-Original-Xcc: Zheng Junjie Received: via spool by 78337-submit@debbugs.gnu.org id=B78337.17477099401849 (code B ref 78337); Tue, 20 May 2025 02:59:04 +0000 Received: (at 78337) by debbugs.gnu.org; 20 May 2025 02:59:00 +0000 Received: from localhost ([127.0.0.1]:50176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHDBz-0000Te-Mn for submit@debbugs.gnu.org; Mon, 19 May 2025 22:59:00 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:44302) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uHDBt-0000SB-5e for 78337@debbugs.gnu.org; Mon, 19 May 2025 22:58:54 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-30e7bfef364so3686389a91.1 for <78337@debbugs.gnu.org>; Mon, 19 May 2025 19:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747709927; x=1748314727; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VLW4XEfGm0Iqej8OIAUuSyG9zccZMvgoY6rkDt8nwuM=; b=GDeArT9ee17oYBmxrq32S6vhXQ8Wk1rzTSrC+PxIAH+mXQmBZGy4Fpx2R4i43X9U7s WFPpJxuDCQtRHtd3ikeVO8CIwSEtndPoxJ1B124uDCFJ9V8cDir49eCli3vT08j+mcMi w7TOPRt5mLHYQ3hpNI9mtO6/+t0pZBUCD4hP4cwLocEsmev5onUFRirRvNDsNiN/o8qJ M+jCj4zjvGKs/A4vxsS9/J13xe/c9rwcsLq7zsE66OC2C01lLnUE6T1JVmCyF8m1B0S0 6pEmE3mhAYrNTMMP5n80cVtqZjHZ/EAYY0P53r07JXnSHB0/qXDoRXQk94ZPC95NbE1B qu7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747709927; x=1748314727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VLW4XEfGm0Iqej8OIAUuSyG9zccZMvgoY6rkDt8nwuM=; b=TJDRlIF56rbdWA0p+Ns1w/LWuSM/N/RV41QW5eoySpifVz5H9/4PTiRmCVH470laTq jqEQzMPcaRqSl8OHDhrXeUcHHdPTjQbhc5eWsBLm+Qb3sfI4E0LgHRvC5VnhgcAjCAVc ZY4mljOxRtaL+6dUhQ3sY4YU2clpQAC9QsRHkuAgeQLNaXJf0719zs5mEITAdUPaEmQw 4xxEnhiIsAPLERiAmmPbCsUvYkAF48vvBjKOwfge3klNTqjHsLBfHubMKfslJBz9/OBh U3Wp1N6F5YklB+BEDFTCtX/1JZKeDju/FrHXOsh4If46YJH2dc0Cu7YuQlqT0yHhqNJt RpWQ== X-Gm-Message-State: AOJu0YyaFsPxTPMCCCGNKn+hCiUPrG6+a3JTM/pwN6o7DxgBW1EBldeM pLkD64vFYXW878dZv2k58RYP23sOd43ypGZw2pqQ1q0JRqw8gRX/2QSq02bflw== X-Gm-Gg: ASbGnctwqB/unAtF8XXJkhFlkA4rzSZvFbYiJr5B/PrTgiFyYg137McSJ0vl2Uz9kHn 7qOxBBbpExMXzYV6+PLH+82qh5Pkgz27QRDbNmDIknzpiq5+O/DTPAUxPOwk06NZZDgAMVSb9HO M0RfootcVFVuyrRlZB+eIZ7BXJ4afHejs8TkNJsKLjECgTR6iPQDOE6ZCVMvw0ZixX6WuGpVNBR /eZtmcu+yLUZYra2WBK4/8qHFpEs381+McdEG+P7WLaOtNrF+4g5R0wFtteWjq6pRRaLK+FAqi6 N73TPuZnq5NHEcq29coJSzjh6Z+NM2Oyomlr+HORPPrK9Rt0qkgQuMZPXBXRib7erzEs4Zk= X-Google-Smtp-Source: AGHT+IHZadErGXSrKP65bpMsKXE20NTgU6KfLKT2XQBqg4KKfyoLeyiXaFPiyNt/UGT8PtLoXVY2Aw== X-Received: by 2002:a17:90b:3905:b0:305:2d27:7ba5 with SMTP id 98e67ed59e1d1-30e7d4ebda4mr21460156a91.6.1747709926667; Mon, 19 May 2025 19:58:46 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30f365d460fsm480078a91.23.2025.05.19.19.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 May 2025 19:58:46 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 20 May 2025 11:58:15 +0900 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <62f70621a69a09b7195dca52741ed454bec9b3d7.1747709896.git.maxim.cournoyer@gmail.com> References: <62f70621a69a09b7195dca52741ed454bec9b3d7.1747709896.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Zheng Junjie * gnu/packages/backup.scm (libarchive): Update to 3.7.7. * gnu/packages/backup.scm (libarchive/fixed): Delete variable. * gnu/packages/patches/libarchive-remove-potential-backdoor.patch: Remove it * gnu/local.mk (dist_patch_DATA): Unregister it. Change-Id: Ia6474f9dae9a3d1a707d94fcace9bd50b2e3ac4c Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - gnu/packages/backup.scm | 22 +-------- ...libarchive-remove-potential-backdoor.patch | 47 ------------------- 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-remove-potential-backdoor.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0cbe521c73..d561d5ea5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1719,7 +1719,6 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ %D%/packages/patches/libaio-32bit-test.patch \ %D%/packages/patches/libaio-riscv-test5.patch \ - %D%/packages/patches/libarchive-remove-potential-backdoor.patch \ %D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b4aca86774..876167898b 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -263,8 +263,7 @@ (define-public hdup (define-public libarchive (package (name "libarchive") - (replacement libarchive/fixed) - (version "3.6.1") + (version "3.7.7") (source (origin (method url-fetch) @@ -273,10 +272,9 @@ (define-public libarchive (string-append "https://github.com/libarchive/libarchive" "/releases/download/v" version "/libarchive-" version ".tar.xz"))) - (patches (search-patches "libarchive-remove-potential-backdoor.patch")) (sha256 (base32 - "1rj8q5v26lxxr8x4b4nqbrj7p06qvl91hb8cdxi3xx3qp771lhas")))) + "1vps57mrpqmrk4zayh5g5amqfq7031s5zzkkxsm7r71rqf1wv6l7")))) (build-system gnu-build-system) (inputs (list bzip2 @@ -353,22 +351,6 @@ (define-public libarchive @command{bsdcat}, @command{bsdcpio} and @command{bsdtar} commands.") (license license:bsd-2))) -(define libarchive/fixed - (package - (inherit libarchive) - (version "3.7.7") - (source - (origin - (method url-fetch) - (uri (list (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.xz") - (string-append "https://github.com/libarchive/libarchive" - "/releases/download/v" version "/libarchive-" - version ".tar.xz"))) - (sha256 - (base32 - "1vps57mrpqmrk4zayh5g5amqfq7031s5zzkkxsm7r71rqf1wv6l7")))))) - (define-public rdup (package (name "rdup") diff --git a/gnu/packages/patches/libarchive-remove-potential-backdoor.patch b/gnu/packages/patches/libarchive-remove-potential-backdoor.patch deleted file mode 100644 index 2b9a9e2ffe..0000000000 --- a/gnu/packages/patches/libarchive-remove-potential-backdoor.patch +++ /dev/null @@ -1,47 +0,0 @@ -Remove code added by 'JiaT75', the malicious actor that backdoored `xz`: - -https://github.com/libarchive/libarchive/pull/2101 - -At libarchive, they are reviewing all code contributed by this actor: - -https://github.com/libarchive/libarchive/issues/2103 - -See the original disclosure and subsequent discussion for more -information about this incident: - -https://seclists.org/oss-sec/2024/q1/268 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/pull/2101/commits/e200fd8abfb4cf895a1cab4d89b67e6eefe83942 - -From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001 -From: Ed Maste -Date: Fri, 29 Mar 2024 18:02:06 -0400 -Subject: [PATCH] tar: make error reporting more robust and use correct errno - (#2101) - -As discussed in #1609. ---- - tar/read.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tar/read.c b/tar/read.c -index af3d3f42..a7f14a07 100644 ---- a/tar/read.c -+++ b/tar/read.c -@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) - if (r != ARCHIVE_OK) { - if (!bsdtar->verbose) - safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); -- fprintf(stderr, ": %s: ", archive_error_string(a)); -- fprintf(stderr, "%s", strerror(errno)); -+ safe_fprintf(stderr, ": %s: %s", -+ archive_error_string(a), -+ strerror(archive_errno(a))); - if (!bsdtar->verbose) - fprintf(stderr, "\n"); - bsdtar->return_value = 1; --- -2.41.0 -