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 EADFC717E8; Fri, 11 Jun 2021 13:44:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 393C210F06; Fri, 11 Jun 2021 13:44:47 +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 id 10F711090E; Fri, 11 Jun 2021 13:44:28 +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 D279442F38; Fri, 11 Jun 2021 13:44:27 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 11 Jun 2021 13:43:57 +0200 Message-Id: <20210611114418.28772-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210611114418.28772-1-f.ebner@proxmox.com> References: <20210611114418.28772-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.299 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SCC_5_SHORT_WORD_LINES 1 5 lines with many short words SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [check.rs, repositories.rs, proxmox.com] Subject: [pve-devel] [PATCH v6 proxmox-apt 08/11] update for bullseye 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: Fri, 11 Jun 2021 11:44:51 -0000 and also adapt the tests. Signed-off-by: Fabian Ebner --- New in v6. src/repositories/check.rs | 24 +++++++++---------- tests/repositories.rs | 4 ++-- tests/sources.list.d.expected/case.sources | 4 ++-- .../sources.list.d.expected/multiline.sources | 2 +- .../options_comment.list | 4 ++-- .../pbs-enterprise.list | 2 +- tests/sources.list.d.expected/pve.list | 12 +++++----- tests/sources.list.d.expected/standard.list | 6 ++--- .../sources.list.d.expected/standard.sources | 4 ++-- tests/sources.list.d/case.sources | 4 ++-- tests/sources.list.d/multiline.sources | 2 +- tests/sources.list.d/options_comment.list | 4 ++-- tests/sources.list.d/pbs-enterprise.list | 2 +- tests/sources.list.d/pve.list | 12 +++++----- tests/sources.list.d/standard.list | 6 ++--- tests/sources.list.d/standard.sources | 4 ++-- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/repositories/check.rs b/src/repositories/check.rs index e0ec93e..689b48d 100644 --- a/src/repositories/check.rs +++ b/src/repositories/check.rs @@ -6,34 +6,34 @@ use crate::types::{ }; /// The (code)names of old Debian releases. -pub const OLD_SUITES: [&str; 7] = [ +pub const OLD_SUITES: [&str; 8] = [ "lenny", "squeeze", "wheezy", "jessie", "stretch", + "buster", "oldoldstable", "oldstable", ]; /// The codename of the current stable Debian release. -pub const STABLE_SUITE: &str = "buster"; +pub const STABLE_SUITE: &str = "bullseye"; /// The codename of the next stable Debian release. -pub const NEXT_STABLE_SUITE: &str = "bullseye"; +pub const NEXT_STABLE_SUITE: &str = "bookworm"; /// The (code)names of new/testing Debian releases. -pub const NEW_SUITES: [&str; 6] = [ - "bookworm", - "trixie", - "testing", - "unstable", - "sid", - "experimental", -]; +pub const NEW_SUITES: [&str; 5] = ["trixie", "testing", "unstable", "sid", "experimental"]; /// Splits the suite into its base part and variant. pub fn suite_variant(suite: &str) -> (&str, &str) { - let variants = ["-backports-sloppy", "-backports", "-updates", "/updates"]; + let variants = [ + "-backports-sloppy", + "-backports", + "-updates", + "/updates", + "-security", + ]; for variant in variants.iter() { if let Some(base) = suite.strip_suffix(variant) { diff --git a/tests/repositories.rs b/tests/repositories.rs index ee7f1a8..4b287b5 100644 --- a/tests/repositories.rs +++ b/tests/repositories.rs @@ -267,8 +267,8 @@ fn test_common_digest() -> Result<(), Error> { standard_file.parse()?; let expected_digest = [ - 187, 82, 67, 137, 156, 156, 49, 84, 1, 221, 240, 24, 193, 201, 247, 252, 6, 128, 137, 241, - 169, 176, 78, 193, 4, 190, 117, 136, 96, 28, 46, 78, + 150, 249, 15, 114, 233, 199, 154, 68, 39, 40, 212, 214, 227, 141, 121, 90, 236, 12, 147, + 203, 201, 250, 56, 104, 55, 42, 253, 63, 15, 177, 247, 237, ]; let mut files = vec![pve_file, standard_file]; diff --git a/tests/sources.list.d.expected/case.sources b/tests/sources.list.d.expected/case.sources index 307aab6..0c71323 100644 --- a/tests/sources.list.d.expected/case.sources +++ b/tests/sources.list.d.expected/case.sources @@ -1,7 +1,7 @@ # comment in here Types: deb deb-src URIs: http://ftp.at.debian.org/debian -Suites: buster-updates +Suites: bullseye-updates Components: main contrib languages: it de fr Enabled: false @@ -11,6 +11,6 @@ languages-Remove: de # comment in here Types: deb deb-src URIs: http://ftp.at.debian.org/debian -Suites: buster +Suites: bullseye Components: main contrib diff --git a/tests/sources.list.d.expected/multiline.sources b/tests/sources.list.d.expected/multiline.sources index d96acea..fa7a9e9 100644 --- a/tests/sources.list.d.expected/multiline.sources +++ b/tests/sources.list.d.expected/multiline.sources @@ -1,7 +1,7 @@ # comment in here Types: deb deb-src URIs: http://ftp.at.debian.org/debian -Suites: buster buster-updates +Suites: bullseye bullseye-updates Components: main contrib Languages: it de fr Enabled: false diff --git a/tests/sources.list.d.expected/options_comment.list b/tests/sources.list.d.expected/options_comment.list index 8c905c0..caef5e0 100644 --- a/tests/sources.list.d.expected/options_comment.list +++ b/tests/sources.list.d.expected/options_comment.list @@ -1,6 +1,6 @@ # comment -deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian buster main contrib +deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian bullseye main contrib # non-free :( -deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian buster non-free +deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian bullseye non-free diff --git a/tests/sources.list.d.expected/pbs-enterprise.list b/tests/sources.list.d.expected/pbs-enterprise.list index acb2990..cb6e779 100644 --- a/tests/sources.list.d.expected/pbs-enterprise.list +++ b/tests/sources.list.d.expected/pbs-enterprise.list @@ -1,2 +1,2 @@ -deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise +deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise diff --git a/tests/sources.list.d.expected/pve.list b/tests/sources.list.d.expected/pve.list index 805cef7..222bb10 100644 --- a/tests/sources.list.d.expected/pve.list +++ b/tests/sources.list.d.expected/pve.list @@ -1,15 +1,15 @@ -deb http://ftp.debian.org/debian buster main contrib +deb http://ftp.debian.org/debian bullseye main contrib -deb http://ftp.debian.org/debian buster-updates main contrib +deb http://ftp.debian.org/debian bullseye-updates main contrib # PVE pve-no-subscription repository provided by proxmox.com, # NOT recommended for production use -deb http://download.proxmox.com/debian/pve buster pve-no-subscription +deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription -# deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise +# deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise -deb-src https://enterprise.proxmox.com/debian/pve buster pve-enterprise +deb-src https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise # security updates -deb http://security.debian.org/debian-security buster/updates main contrib +deb http://security.debian.org/debian-security bullseye-security main contrib diff --git a/tests/sources.list.d.expected/standard.list b/tests/sources.list.d.expected/standard.list index 63c1b60..51f7ed0 100644 --- a/tests/sources.list.d.expected/standard.list +++ b/tests/sources.list.d.expected/standard.list @@ -1,7 +1,7 @@ -deb http://ftp.at.debian.org/debian buster main contrib +deb http://ftp.at.debian.org/debian bullseye main contrib -deb http://ftp.at.debian.org/debian buster-updates main contrib +deb http://ftp.at.debian.org/debian bullseye-updates main contrib # security updates -deb http://security.debian.org buster/updates main contrib +deb http://security.debian.org bullseye-security main contrib diff --git a/tests/sources.list.d.expected/standard.sources b/tests/sources.list.d.expected/standard.sources index 56ce280..85539b3 100644 --- a/tests/sources.list.d.expected/standard.sources +++ b/tests/sources.list.d.expected/standard.sources @@ -1,11 +1,11 @@ Types: deb URIs: http://ftp.at.debian.org/debian -Suites: buster buster-updates +Suites: bullseye bullseye-updates Components: main contrib # security updates Types: deb URIs: http://security.debian.org -Suites: buster/updates +Suites: bullseye-security Components: main contrib diff --git a/tests/sources.list.d/case.sources b/tests/sources.list.d/case.sources index 8979d0c..1a69d14 100644 --- a/tests/sources.list.d/case.sources +++ b/tests/sources.list.d/case.sources @@ -1,6 +1,6 @@ tYpeS: deb deb-src uRis: http://ftp.at.debian.org/debian -suiTes: buster-updates +suiTes: bullseye-updates # comment in here CompOnentS: main contrib languages: it @@ -12,6 +12,6 @@ languages-Remove: de types: deb deb-src Uris: http://ftp.at.debian.org/debian -suites: buster +suites: bullseye # comment in here components: main contrib diff --git a/tests/sources.list.d/multiline.sources b/tests/sources.list.d/multiline.sources index bdbce29..683e7e5 100644 --- a/tests/sources.list.d/multiline.sources +++ b/tests/sources.list.d/multiline.sources @@ -1,6 +1,6 @@ Types: deb deb-src URIs: http://ftp.at.debian.org/debian -Suites: buster buster-updates +Suites: bullseye bullseye-updates # comment in here Components: main contrib Languages: it diff --git a/tests/sources.list.d/options_comment.list b/tests/sources.list.d/options_comment.list index 6b73053..7cc810e 100644 --- a/tests/sources.list.d/options_comment.list +++ b/tests/sources.list.d/options_comment.list @@ -1,3 +1,3 @@ -deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian buster main contrib # comment -deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian buster non-free # non-free :( +deb [ lang=it,de arch=amd64 ] http://ftp.at.debian.org/debian bullseye main contrib # comment +deb [ lang=it,de arch=amd64 lang+=fr lang-=de ] http://ftp.at.debian.org/debian bullseye non-free # non-free :( diff --git a/tests/sources.list.d/pbs-enterprise.list b/tests/sources.list.d/pbs-enterprise.list index 5f8763c..4592181 100644 --- a/tests/sources.list.d/pbs-enterprise.list +++ b/tests/sources.list.d/pbs-enterprise.list @@ -1 +1 @@ -deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise +deb https://enterprise.proxmox.com/debian/pbs bullseye pbs-enterprise diff --git a/tests/sources.list.d/pve.list b/tests/sources.list.d/pve.list index 2c09f15..9da86a3 100644 --- a/tests/sources.list.d/pve.list +++ b/tests/sources.list.d/pve.list @@ -1,12 +1,12 @@ -deb http://ftp.debian.org/debian buster main contrib -deb http://ftp.debian.org/debian buster-updates main contrib +deb http://ftp.debian.org/debian bullseye main contrib +deb http://ftp.debian.org/debian bullseye-updates main contrib # PVE pve-no-subscription repository provided by proxmox.com, # NOT recommended for production use -deb http://download.proxmox.com/debian/pve buster pve-no-subscription -# deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise +deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription +# deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise -deb-src https://enterprise.proxmox.com/debian/pve buster pve-enterprise +deb-src https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise # security updates -deb http://security.debian.org/debian-security buster/updates main contrib +deb http://security.debian.org/debian-security bullseye-security main contrib diff --git a/tests/sources.list.d/standard.list b/tests/sources.list.d/standard.list index 26db887..5fc952e 100644 --- a/tests/sources.list.d/standard.list +++ b/tests/sources.list.d/standard.list @@ -1,6 +1,6 @@ -deb http://ftp.at.debian.org/debian buster main contrib +deb http://ftp.at.debian.org/debian bullseye main contrib -deb http://ftp.at.debian.org/debian buster-updates main contrib +deb http://ftp.at.debian.org/debian bullseye-updates main contrib # security updates -deb http://security.debian.org buster/updates main contrib +deb http://security.debian.org bullseye-security main contrib diff --git a/tests/sources.list.d/standard.sources b/tests/sources.list.d/standard.sources index 605202e..0b0e83e 100644 --- a/tests/sources.list.d/standard.sources +++ b/tests/sources.list.d/standard.sources @@ -1,10 +1,10 @@ Types: deb URIs: http://ftp.at.debian.org/debian -Suites: buster buster-updates +Suites: bullseye bullseye-updates Components: main contrib # security updates Types: deb URIs: http://security.debian.org -Suites: buster/updates +Suites: bullseye-security Components: main contrib -- 2.20.1