[pve-devel] [PATCH debcargo-config proxmox/trixie 2/4] update email-encoding to 0.3.1

[Lukas Wagner]

Signed-off-by: Lukas Wagner <l.wagner at 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 at 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 at paolo565.org>
+Copyright: 2021-2024 Paolo Barbolini <paolo at 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 at alioth-lists.debian.net>
- 2023 Lukas Wagner <l.wagner at proxmox.com>
+ 2023-2025 Debian Rust Maintainers <pkg-rust-maintainers at alioth-lists.debian.net>
+ 2023-2025 Lukas Wagner <l.wagner at 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