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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 2C9D71FF164
for <inbox@lore.proxmox.com>; Fri, 23 May 2025 10:31:08 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B185015EEB;
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:17 +0200
Message-Id: <20250523083020.63853-2-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. [base64.rs, rfc2047.rs, crates.io]
Subject: [pve-devel] [PATCH debcargo-config proxmox/trixie 1/4] import
email-encoding from bookworm
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 | 13 +++++
src/email-encoding/debian/copyright | 37 ++++++++++++
.../debian/copyright.debcargo.hint | 49 ++++++++++++++++
src/email-encoding/debian/debcargo.toml | 2 +
.../debian/patches/downgrade_base64.diff | 57 +++++++++++++++++++
src/email-encoding/debian/patches/series | 1 +
6 files changed, 159 insertions(+)
create mode 100644 src/email-encoding/debian/changelog
create mode 100644 src/email-encoding/debian/copyright
create mode 100644 src/email-encoding/debian/copyright.debcargo.hint
create mode 100644 src/email-encoding/debian/debcargo.toml
create mode 100644 src/email-encoding/debian/patches/downgrade_base64.diff
create mode 100644 src/email-encoding/debian/patches/series
diff --git a/src/email-encoding/debian/changelog b/src/email-encoding/debian/changelog
new file mode 100644
index 0000000000..c4e978bbdc
--- /dev/null
+++ b/src/email-encoding/debian/changelog
@@ -0,0 +1,13 @@
+rust-email-encoding (0.2.0-1~bpo12+pve1) proxmox-rust; urgency=medium
+
+ * Rebuild for Debian Bookworm / Proxmox
+
+ -- Proxmox Support Team <support@proxmox.com> Fri, 04 Aug 2023 14:24:43 +0200
+
+rust-email-encoding (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+ * Team upload.
+ * Package email-encoding 0.2.0 from crates.io using debcargo 2.6.0
+ * Downgrade base64 dependency from 0.21 to 0.13
+
+ -- Lukas Wagner <l.wagner@proxmox.com> Mon, 31 Jul 2023 14:08:53 +0200
diff --git a/src/email-encoding/debian/copyright b/src/email-encoding/debian/copyright
new file mode 100644
index 0000000000..3c1cb98d32
--- /dev/null
+++ b/src/email-encoding/debian/copyright
@@ -0,0 +1,37 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: email-encoding
+Upstream-Contact: Paolo Barbolini <paolo@paolo565.org>
+Source: https://github.com/lettre/email-encoding
+
+Files: *
+Copyright: 2021-2022 Paolo Barbolini <paolo@paolo565.org>
+License: MIT or Apache-2.0
+
+Files: debian/*
+Copyright:
+ 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2023 Lukas Wagner <l.wagner@proxmox.com>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/email-encoding/debian/copyright.debcargo.hint b/src/email-encoding/debian/copyright.debcargo.hint
new file mode 100644
index 0000000000..e8d3e445ac
--- /dev/null
+++ b/src/email-encoding/debian/copyright.debcargo.hint
@@ -0,0 +1,49 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: email-encoding
+Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
+Source: https://github.com/lettre/email-encoding
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
+License: MIT or Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: LICENSE-MIT
+Copyright: 2021-2022 Paolo Barbolini <paolo@paolo565.org>
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2023 Lukas Wagner <l.wagner@proxmox.com>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/email-encoding/debian/debcargo.toml b/src/email-encoding/debian/debcargo.toml
new file mode 100644
index 0000000000..d69a1a27b7
--- /dev/null
+++ b/src/email-encoding/debian/debcargo.toml
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Lukas Wagner <l.wagner@proxmox.com>"]
diff --git a/src/email-encoding/debian/patches/downgrade_base64.diff b/src/email-encoding/debian/patches/downgrade_base64.diff
new file mode 100644
index 0000000000..42733f1d8c
--- /dev/null
+++ b/src/email-encoding/debian/patches/downgrade_base64.diff
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 0000000000..c39b492007
--- /dev/null
+++ b/src/email-encoding/debian/patches/series
@@ -0,0 +1 @@
+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