From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (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 lists.proxmox.com (Postfix) with ESMTPS id 9BB53B0D1 for ; Thu, 29 Jun 2023 12:30:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74E6F3E845 for ; Thu, 29 Jun 2023 12:30:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 29 Jun 2023 12:30:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F409E41F8F for ; Thu, 29 Jun 2023 12:30:08 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 29 Jun 2023 12:30:03 +0200 Message-Id: <20230629103003.1021543-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.071 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox] release file: extend component fixup to bookworm X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jun 2023 10:30:41 -0000 else mirroring bookworm-security will skip *all* components.. Signed-off-by: Fabian Grünbichler --- Reported on the forum: https://forum.proxmox.com/threads/proxmox-offline-mirror-released.115219/page-3#post-568763 and fix verified by recompiling proxmox-offline-mirror with patched librust-proxmox-apt-dev this special casing could maybe be moved to POM at some point.. proxmox-apt/src/deb822/release_file.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proxmox-apt/src/deb822/release_file.rs b/proxmox-apt/src/deb822/release_file.rs index fcfedac..3973dad 100644 --- a/proxmox-apt/src/deb822/release_file.rs +++ b/proxmox-apt/src/deb822/release_file.rs @@ -347,9 +347,10 @@ impl TryFrom for ReleaseFile { if let Some(val) = value.extra_fields.get("Acquire-By-Hash") { parsed.aquire_by_hash = *val == "yes"; } - // Fixup bullseye-security release files which have invalid components + // Fixup bullseye+-security release files which have invalid components + let codename = parsed.codename.as_deref(); if parsed.label.as_deref() == Some("Debian-Security") - && parsed.codename.as_deref() == Some("bullseye-security") + && (codename == Some("bullseye-security") || codename == Some("bookworm-security")) { parsed.components = parsed .components -- 2.39.2