From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 65C471FF164 for <inbox@lore.proxmox.com>; Fri, 23 May 2025 10:30:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2358A15E78; Fri, 23 May 2025 10:31:00 +0200 (CEST) From: Lukas Wagner <l.wagner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 23 May 2025 10:30:18 +0200 Message-Id: <20250523083020.63853-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250523083020.63853-1-l.wagner@proxmox.com> References: <20250523083020.63853-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [rfc2047.rs, crates.io, base64.rs] Subject: [pve-devel] [PATCH debcargo-config proxmox/trixie 2/4] update email-encoding to 0.3.1 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> --- src/email-encoding/debian/changelog | 7 +++ .../debian/copyright.debcargo.hint | 6 +- .../debian/patches/downgrade_base64.diff | 57 ------------------- src/email-encoding/debian/patches/series | 1 - 4 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 src/email-encoding/debian/patches/downgrade_base64.diff delete mode 100644 src/email-encoding/debian/patches/series diff --git a/src/email-encoding/debian/changelog b/src/email-encoding/debian/changelog index c4e978bbdc..0ccc97f5e8 100644 --- a/src/email-encoding/debian/changelog +++ b/src/email-encoding/debian/changelog @@ -1,3 +1,10 @@ +rust-email-encoding (0.3.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package email-encoding 0.3.1 from crates.io using debcargo 2.7.8 + * Drop unneeded base64 version relaxation patch + + -- Lukas Wagner <l.wagner@proxmox.com> Thu, 22 May 2025 16:08:00 +0200 + rust-email-encoding (0.2.0-1~bpo12+pve1) proxmox-rust; urgency=medium * Rebuild for Debian Bookworm / Proxmox diff --git a/src/email-encoding/debian/copyright.debcargo.hint b/src/email-encoding/debian/copyright.debcargo.hint index e8d3e445ac..b03aea424c 100644 --- a/src/email-encoding/debian/copyright.debcargo.hint +++ b/src/email-encoding/debian/copyright.debcargo.hint @@ -13,7 +13,7 @@ Comment: the archive. Files: LICENSE-MIT -Copyright: 2021-2022 Paolo Barbolini <paolo@paolo565.org> +Copyright: 2021-2024 Paolo Barbolini <paolo@paolo565.org> License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them @@ -21,8 +21,8 @@ Comment: Files: debian/* Copyright: - 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> - 2023 Lukas Wagner <l.wagner@proxmox.com> + 2023-2025 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> + 2023-2025 Lukas Wagner <l.wagner@proxmox.com> License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/email-encoding/debian/patches/downgrade_base64.diff b/src/email-encoding/debian/patches/downgrade_base64.diff deleted file mode 100644 index 42733f1d8c..0000000000 --- a/src/email-encoding/debian/patches/downgrade_base64.diff +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 0dffd11..7bd1373 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -29,7 +29,7 @@ license = "MIT OR Apache-2.0" - repository = "https://github.com/lettre/email-encoding" - - [dependencies.base64] --version = "0.21" -+version = "0.13" - default-features = false - - [dependencies.memchr] -diff --git a/src/body/base64.rs b/src/body/base64.rs -index d799ec6..402e615 100644 ---- a/src/body/base64.rs -+++ b/src/body/base64.rs -@@ -3,7 +3,7 @@ - use std::fmt::{self, Write}; - use std::str; - --use ::base64::Engine; -+use base64; - - const LINE_LEN: usize = 76; - const CRLF: &str = "\r\n"; -@@ -44,9 +44,7 @@ pub fn encode(b: &[u8], w: &mut dyn Write) -> fmt::Result { - - let mut chunks = b.chunks(LINE_LEN / 4 * 3).peekable(); - while let Some(chunk) = chunks.next() { -- let len = ::base64::engine::general_purpose::STANDARD -- .encode_slice(chunk, &mut buf) -- .unwrap(); -+ let len = base64::encode_config_slice(chunk, base64::STANDARD, &mut buf); - - w.write_str(str::from_utf8(&buf[..len]).expect("base64 produced an invalid encode"))?; - if chunks.peek().is_some() { -diff --git a/src/headers/rfc2047.rs b/src/headers/rfc2047.rs -index 8857aba..a5ebf0e 100644 ---- a/src/headers/rfc2047.rs -+++ b/src/headers/rfc2047.rs -@@ -45,11 +45,11 @@ pub fn encode(mut s: &str, w: &mut EmailWriter<'_>) -> fmt::Result { - // Write the prefix - w.write_str(ENCODING_START_PREFIX)?; - -+ -+ - // Encode `word` -- let encoder = base64::display::Base64Display::new( -- word.as_bytes(), -- &base64::engine::general_purpose::STANDARD, -- ); -+ use base64::display::Base64Display; -+ let encoder = Base64Display::with_config(word.as_bytes(), base64::STANDARD); - write!(w, "{}", encoder)?; - - // Write the suffix diff --git a/src/email-encoding/debian/patches/series b/src/email-encoding/debian/patches/series deleted file mode 100644 index c39b492007..0000000000 --- a/src/email-encoding/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -downgrade_base64.diff -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel