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 72C3A1FF164
	for <inbox@lore.proxmox.com>; Fri, 23 May 2025 10:30:35 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 4051315D01;
	Fri, 23 May 2025 10:30:30 +0200 (CEST)
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 23 May 2025 10:30:20 +0200
Message-Id: <20250523083020.63853-5-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.432 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_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible
 spam tricks
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 PROLO_LEO1                0.1 Meta Catches all Leo drug variations so far
 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. [crates.io, autoconfigure.rs, lib.rs]
Subject: [pve-devel] [PATCH debcargo-config proxmox/trixie 4/4] update
 lettre to 0.11.13
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/lettre/debian/changelog                   |   8 +
 src/lettre/debian/copyright.debcargo.hint     |   4 +-
 src/lettre/debian/patches/relax-deps.patch    |  14 +-
 .../patches/remove_unused_features.patch      | 284 ++++++++++--------
 4 files changed, 177 insertions(+), 133 deletions(-)

diff --git a/src/lettre/debian/changelog b/src/lettre/debian/changelog
index ce312dba28..7752ed7840 100644
--- a/src/lettre/debian/changelog
+++ b/src/lettre/debian/changelog
@@ -1,3 +1,11 @@
+rust-lettre (0.11.13-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package lettre 0.11.13 from crates.io using debcargo 2.7.8
+  * Port to trixie
+  * Relax dependency: hostname 0.4 -> 0.3
+
+ -- Lukas Wagner <l.wagner@proxmox.com>  Thu, 22 May 2025 16:32:59 +0200
+
 rust-lettre (0.11.1-2~bpo21+pve2) proxmox-rust; urgency=medium
 
   * Rebuild for Debian Bookworm / Proxmox with debcargo 2.7.8 and base64
diff --git a/src/lettre/debian/copyright.debcargo.hint b/src/lettre/debian/copyright.debcargo.hint
index 714caf351a..9cf2a236b0 100644
--- a/src/lettre/debian/copyright.debcargo.hint
+++ b/src/lettre/debian/copyright.debcargo.hint
@@ -18,8 +18,8 @@ Comment:
 
 Files: LICENSE
 Copyright:
- 2014-2022 Alexis Mousset <contact@amousset.me>
- 2019-2022 Paolo Barbolini <paolo@paolo565.org>
+ 2014-2024 Alexis Mousset <contact@amousset.me>
+ 2019-2024 Paolo Barbolini <paolo@paolo565.org>
  2018 K. <kayo@illumium.org>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
diff --git a/src/lettre/debian/patches/relax-deps.patch b/src/lettre/debian/patches/relax-deps.patch
index ee7a6e97b1..bb670e79c5 100644
--- a/src/lettre/debian/patches/relax-deps.patch
+++ b/src/lettre/debian/patches/relax-deps.patch
@@ -2,12 +2,12 @@ Index: lettre/Cargo.toml
 ===================================================================
 --- lettre.orig/Cargo.toml
 +++ lettre/Cargo.toml
-@@ -127,7 +127,7 @@ version = "0.1"
+@@ -260,7 +260,7 @@ optional = true
+ default-features = false
+ 
+ [dependencies.hostname]
+-version = "0.4"
++version = "0.3"
  optional = true
  
- [dependencies.base64]
--version = "0.21"
-+version = ">= 0.21, <0.23"
- optional = true
- 
- [dependencies.chumsky]
+ [dependencies.httpdate]
diff --git a/src/lettre/debian/patches/remove_unused_features.patch b/src/lettre/debian/patches/remove_unused_features.patch
index 69fd8d377d..93556977f3 100644
--- a/src/lettre/debian/patches/remove_unused_features.patch
+++ b/src/lettre/debian/patches/remove_unused_features.patch
@@ -2,125 +2,8 @@ Index: lettre/Cargo.toml
 ===================================================================
 --- lettre.orig/Cargo.toml
 +++ lettre/Cargo.toml
-@@ -114,24 +114,6 @@ required-features = [
-     "builder",
- ]
- 
--[[example]]
--name = "asyncstd1_smtp_tls"
--required-features = [
--    "smtp-transport",
--    "async-std1",
--    "async-std1-rustls-tls",
--    "builder",
--]
--
--[[example]]
--name = "asyncstd1_smtp_starttls"
--required-features = [
--    "smtp-transport",
--    "async-std1",
--    "async-std1-rustls-tls",
--    "builder",
--]
--
- [[bench]]
- name = "transport_smtp"
- harness = false
-@@ -140,10 +122,6 @@ harness = false
- name = "mailbox_parsing"
- harness = false
- 
--[dependencies.async-std]
--version = "1.8"
--optional = true
--
- [dependencies.async-trait]
- version = "0.1"
- optional = true
-@@ -152,17 +130,9 @@ optional = true
- version = "0.21"
- optional = true
- 
--[dependencies.boring]
--version = "3"
--optional = true
--
- [dependencies.chumsky]
- version = "0.9"
- 
--[dependencies.ed25519-dalek]
--version = "2"
--optional = true
--
- [dependencies.email-encoding]
- version = "0.2"
- optional = true
-@@ -220,23 +190,6 @@ optional = true
- version = "0.5"
- optional = true
- 
--[dependencies.rsa]
--version = "0.9"
--optional = true
--
--[dependencies.rustls]
--version = "0.21"
--features = ["dangerous_configuration"]
--optional = true
--
--[dependencies.rustls-native-certs]
--version = "0.6.2"
--optional = true
--
--[dependencies.rustls-pemfile]
--version = "1"
--optional = true
--
- [dependencies.serde]
- version = "1"
- features = ["derive"]
-@@ -255,11 +208,6 @@ optional = true
- version = "0.5.1"
- optional = true
- 
--[dependencies.tokio1_boring]
--version = "3"
--optional = true
--package = "tokio-boring"
--
- [dependencies.tokio1_crate]
- version = "1"
- optional = true
-@@ -270,11 +218,6 @@ version = "0.3"
- optional = true
- package = "tokio-native-tls"
- 
--[dependencies.tokio1_rustls]
--version = "0.24"
--optional = true
--package = "tokio-rustls"
--
- [dependencies.tracing]
- version = "0.1.16"
- features = ["std"]
-@@ -290,14 +233,6 @@ version = "1"
- features = ["v4"]
- optional = true
- 
--[dependencies.webpki-roots]
--version = "0.25"
--optional = true
--
--[dev-dependencies.async-std]
--version = "1.8"
--features = ["attributes"]
--
- [dev-dependencies.criterion]
- version = "0.5"
- 
-@@ -333,18 +268,6 @@ version = "0.3"
- version = "2"
+@@ -60,18 +60,6 @@ repository = "lettre/lettre"
+ status = "actively-developed"
  
  [features]
 -async-std1 = [
@@ -138,7 +21,7 @@ Index: lettre/Cargo.toml
  builder = [
      "dep:httpdate",
      "dep:mime",
-@@ -359,12 +282,6 @@ default = [
+@@ -86,12 +74,6 @@ default = [
      "hostname",
      "builder",
  ]
@@ -151,7 +34,7 @@ Index: lettre/Cargo.toml
  file-transport = [
      "dep:uuid",
      "tokio1_crate?/fs",
-@@ -377,15 +294,9 @@ file-transport-envelope = [
+@@ -104,16 +86,9 @@ file-transport-envelope = [
  ]
  mime03 = ["dep:mime"]
  pool = ["dep:futures-util"]
@@ -159,6 +42,7 @@ Index: lettre/Cargo.toml
 -    "dep:webpki-roots",
 -    "dep:rustls",
 -    "dep:rustls-pemfile",
+-    "dep:rustls-pki-types",
 -]
  sendmail-transport = [
      "tokio1_crate?/process",
@@ -167,7 +51,7 @@ Index: lettre/Cargo.toml
  ]
  smtp-transport = [
      "dep:base64",
-@@ -403,21 +314,11 @@ tokio1 = [
+@@ -131,21 +106,11 @@ tokio1 = [
      "dep:futures-io",
      "dep:futures-util",
  ]
@@ -186,9 +70,161 @@ Index: lettre/Cargo.toml
 -    "rustls-tls",
 -    "dep:tokio1_rustls",
 -]
+ web = ["dep:web-time"]
+ 
+ [lib]
+@@ -153,26 +118,6 @@ name = "lettre"
+ path = "src/lib.rs"
+ 
+ [[example]]
+-name = "asyncstd1_smtp_starttls"
+-path = "examples/asyncstd1_smtp_starttls.rs"
+-required-features = [
+-    "smtp-transport",
+-    "async-std1",
+-    "async-std1-rustls-tls",
+-    "builder",
+-]
+-
+-[[example]]
+-name = "asyncstd1_smtp_tls"
+-path = "examples/asyncstd1_smtp_tls.rs"
+-required-features = [
+-    "smtp-transport",
+-    "async-std1",
+-    "async-std1-rustls-tls",
+-    "builder",
+-]
+-
+-[[example]]
+ name = "autoconfigure"
+ path = "examples/autoconfigure.rs"
+ required-features = [
+@@ -281,10 +226,6 @@ name = "transport_smtp"
+ path = "benches/transport_smtp.rs"
+ harness = false
+ 
+-[dependencies.async-std]
+-version = "1.8"
+-optional = true
+-
+ [dependencies.async-trait]
+ version = "0.1"
+ optional = true
+@@ -293,17 +234,9 @@ optional = true
+ version = "0.22"
+ optional = true
+ 
+-[dependencies.boring]
+-version = "4"
+-optional = true
+-
+ [dependencies.chumsky]
+ version = "0.9"
+ 
+-[dependencies.ed25519-dalek]
+-version = "2"
+-optional = true
+-
+ [dependencies.email-encoding]
+ version = "0.3"
+ optional = true
+@@ -320,16 +253,6 @@ optional = true
+ version = "0.3.7"
+ optional = true
+ 
+-[dependencies.futures-rustls]
+-version = "0.26"
+-features = [
+-    "logging",
+-    "tls12",
+-    "ring",
+-]
+-optional = true
+-default-features = false
+-
+ [dependencies.futures-util]
+ version = "0.3.7"
+ features = ["io"]
+@@ -367,33 +290,6 @@ optional = true
+ version = "0.5"
+ optional = true
+ 
+-[dependencies.rsa]
+-version = "0.9"
+-optional = true
+-
+-[dependencies.rustls]
+-version = "0.23.5"
+-features = [
+-    "ring",
+-    "logging",
+-    "std",
+-    "tls12",
+-]
+-optional = true
+-default-features = false
+-
+-[dependencies.rustls-native-certs]
+-version = "0.8"
+-optional = true
+-
+-[dependencies.rustls-pemfile]
+-version = "2"
+-optional = true
+-
+-[dependencies.rustls-pki-types]
+-version = "1.7"
+-optional = true
+-
+ [dependencies.serde]
+ version = "1"
+ features = ["derive"]
+@@ -412,11 +308,6 @@ optional = true
+ version = "0.5.1"
+ optional = true
+ 
+-[dependencies.tokio1_boring]
+-version = "4"
+-optional = true
+-package = "tokio-boring"
+-
+ [dependencies.tokio1_crate]
+ version = "1"
+ optional = true
+@@ -427,17 +318,6 @@ version = "0.3"
+ optional = true
+ package = "tokio-native-tls"
+ 
+-[dependencies.tokio1_rustls]
+-version = "0.26"
+-features = [
+-    "logging",
+-    "tls12",
+-    "ring",
+-]
+-optional = true
+-default-features = false
+-package = "tokio-rustls"
+-
+ [dependencies.tracing]
+ version = "0.1.16"
+ features = ["std"]
+@@ -457,14 +337,6 @@ optional = true
+ version = "1.1.0"
+ optional = true
+ 
+-[dependencies.webpki-roots]
+-version = "0.26"
+-optional = true
+-
+-[dev-dependencies.async-std]
+-version = "1.8"
+-features = ["attributes"]
+-
+ [dev-dependencies.criterion]
+ version = "0.5"
  
- [badges.is-it-maintained-issue-resolution]
- repository = "lettre/lettre"
 Index: lettre/examples/asyncstd1_smtp_starttls.rs
 ===================================================================
 --- lettre.orig/examples/asyncstd1_smtp_starttls.rs
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel