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 84D13A0533 for ; Wed, 8 Nov 2023 16:40:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6979AA33D for ; Wed, 8 Nov 2023 16:40:10 +0100 (CET) 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 for ; Wed, 8 Nov 2023 16:40:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C012747487 for ; Wed, 8 Nov 2023 16:40:08 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 8 Nov 2023 16:39:56 +0100 Message-Id: <20231108154005.895814-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108154005.895814-1-l.wagner@proxmox.com> References: <20231108154005.895814-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.316 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 debcargo-conf 02/11] update lettre to 0.11.1 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: Wed, 08 Nov 2023 15:40:40 -0000 Signed-off-by: Lukas Wagner --- src/lettre/debian/changelog | 10 +++ .../debian/patches/downgrade_fastrand.patch | 13 ++++ .../debian/patches/downgrade_idna.patch | 13 ++++ src/lettre/debian/patches/downgrade_url.patch | 13 ++++ .../patches/remove_unused_features.patch | 69 ++++++++++--------- src/lettre/debian/patches/series | 4 +- .../patches/upgrade_quoted_printable.patch | 13 ---- 7 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 src/lettre/debian/patches/downgrade_fastrand.patch create mode 100644 src/lettre/debian/patches/downgrade_idna.patch create mode 100644 src/lettre/debian/patches/downgrade_url.patch delete mode 100644 src/lettre/debian/patches/upgrade_quoted_printable.patch diff --git a/src/lettre/debian/changelog b/src/lettre/debian/changelog index d49cbb042..e92c5c070 100644 --- a/src/lettre/debian/changelog +++ b/src/lettre/debian/changelog @@ -1,3 +1,13 @@ +rust-lettre (0.11.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package lettre 0.11.1 from crates.io using debcargo 2.6.0 + * Downgrade fastrand from 2.0 to 1.8 + * Downgrade idna from 0.4 to 0.3 + * Downgrade url from 2.4 to 2.3 + * Drop patch that upgrades quoted_printable + + -- Lukas Wagner Wed, 08 Nov 2023 13:32:49 +0100 + rust-lettre (0.10.4-1~bpo12+pve1) proxmox-rust; urgency=medium * Rebuild for Debian Bookworm / Proxmox diff --git a/src/lettre/debian/patches/downgrade_fastrand.patch b/src/lettre/debian/patches/downgrade_fastrand.patch new file mode 100644 index 000000000..975efeb1c --- /dev/null +++ b/src/lettre/debian/patches/downgrade_fastrand.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 072ea3a..5decb37 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -150,7 +150,7 @@ version = "0.2.1" + default-features = false + + [dependencies.fastrand] +-version = "2.0" ++version = "1.8" + optional = true + + [dependencies.futures-io] diff --git a/src/lettre/debian/patches/downgrade_idna.patch b/src/lettre/debian/patches/downgrade_idna.patch new file mode 100644 index 000000000..1cfaaa26c --- /dev/null +++ b/src/lettre/debian/patches/downgrade_idna.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 5decb37..09d2b9b 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -176,7 +176,7 @@ version = "1" + optional = true + + [dependencies.idna] +-version = "0.4" ++version = "0.3" + + [dependencies.mime] + version = "0.3.4" diff --git a/src/lettre/debian/patches/downgrade_url.patch b/src/lettre/debian/patches/downgrade_url.patch new file mode 100644 index 000000000..4da907540 --- /dev/null +++ b/src/lettre/debian/patches/downgrade_url.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 09d2b9b..5004a3b 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -237,7 +237,7 @@ optional = true + default-features = false + + [dependencies.url] +-version = "2.4" ++version = "2.3" + optional = true + + [dependencies.uuid] diff --git a/src/lettre/debian/patches/remove_unused_features.patch b/src/lettre/debian/patches/remove_unused_features.patch index 0229e41aa..7ce45be0f 100644 --- a/src/lettre/debian/patches/remove_unused_features.patch +++ b/src/lettre/debian/patches/remove_unused_features.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.toml b/Cargo.toml -index 13c34b6..b4413b6 100644 +index 13e3b77..072ea3a 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -114,32 +114,10 @@ required-features = [ +@@ -114,24 +114,6 @@ required-features = [ "builder", ] @@ -27,6 +27,9 @@ index 13c34b6..b4413b6 100644 [[bench]] name = "transport_smtp" harness = false +@@ -140,10 +122,6 @@ harness = false + name = "mailbox_parsing" + harness = false -[dependencies.async-std] -version = "1.8" @@ -35,8 +38,8 @@ index 13c34b6..b4413b6 100644 [dependencies.async-trait] version = "0.1" optional = true -@@ -217,19 +195,6 @@ optional = true - version = "0.8" +@@ -224,19 +202,6 @@ optional = true + version = "0.9" optional = true -[dependencies.rustls] @@ -55,19 +58,19 @@ index 13c34b6..b4413b6 100644 [dependencies.serde] version = "1" features = ["derive"] -@@ -248,11 +213,6 @@ optional = true - version = "0.4.4" +@@ -255,11 +220,6 @@ optional = true + version = "0.5.1" optional = true -[dependencies.tokio1_boring] --version = "2.1.4" +-version = "3" -optional = true -package = "tokio-boring" - [dependencies.tokio1_crate] version = "1" optional = true -@@ -263,11 +223,6 @@ version = "0.3" +@@ -270,11 +230,6 @@ version = "0.3" optional = true package = "tokio-native-tls" @@ -79,8 +82,8 @@ index 13c34b6..b4413b6 100644 [dependencies.tracing] version = "0.1.16" features = ["std"] -@@ -283,10 +238,6 @@ optional = true - version = "0.23" +@@ -294,10 +249,6 @@ optional = true + version = "0.25" optional = true -[dev-dependencies.async-std] @@ -88,35 +91,35 @@ index 13c34b6..b4413b6 100644 -features = ["attributes"] - [dev-dependencies.criterion] - version = "0.4" + version = "0.5" -@@ -322,18 +273,6 @@ version = "0.3" +@@ -333,18 +284,6 @@ version = "0.3" version = "2" [features] -async-std1 = [ -- "async-std", -- "async-trait", -- "futures-io", -- "futures-util", +- "dep:async-std", +- "dep:async-trait", +- "dep:futures-io", +- "dep:futures-util", -] -async-std1-rustls-tls = [ - "async-std1", - "rustls-tls", -- "futures-rustls", +- "dep:futures-rustls", -] --boring-tls = ["boring"] +-boring-tls = ["dep:boring"] builder = [ - "httpdate", - "mime", -@@ -366,15 +305,9 @@ file-transport-envelope = [ + "dep:httpdate", + "dep:mime", +@@ -377,15 +316,9 @@ file-transport-envelope = [ ] - mime03 = ["mime"] - pool = ["futures-util"] + mime03 = ["dep:mime"] + pool = ["dep:futures-util"] -rustls-tls = [ -- "webpki-roots", -- "rustls", -- "rustls-pemfile", +- "dep:webpki-roots", +- "dep:rustls", +- "dep:rustls-pemfile", -] sendmail-transport = [ "tokio1_crate?/process", @@ -124,25 +127,25 @@ index 13c34b6..b4413b6 100644 - "async-std?/unstable", ] smtp-transport = [ - "base64", -@@ -391,21 +324,11 @@ tokio1 = [ - "futures-io", - "futures-util", + "dep:base64", +@@ -403,21 +336,11 @@ tokio1 = [ + "dep:futures-io", + "dep:futures-util", ] -tokio1-boring-tls = [ - "tokio1", - "boring-tls", -- "tokio1_boring", +- "dep:tokio1_boring", -] tokio1-native-tls = [ "tokio1", "native-tls", - "tokio1_native_tls_crate", + "dep:tokio1_native_tls_crate", ] -tokio1-rustls-tls = [ - "tokio1", - "rustls-tls", -- "tokio1_rustls", +- "dep:tokio1_rustls", -] [badges.is-it-maintained-issue-resolution] diff --git a/src/lettre/debian/patches/series b/src/lettre/debian/patches/series index 633781deb..52cd3bc0c 100644 --- a/src/lettre/debian/patches/series +++ b/src/lettre/debian/patches/series @@ -1,3 +1,5 @@ downgrade_base64.patch -upgrade_quoted_printable.patch remove_unused_features.patch +downgrade_fastrand.patch +downgrade_idna.patch +downgrade_url.patch diff --git a/src/lettre/debian/patches/upgrade_quoted_printable.patch b/src/lettre/debian/patches/upgrade_quoted_printable.patch deleted file mode 100644 index ba77a50af..000000000 --- a/src/lettre/debian/patches/upgrade_quoted_printable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index c455dec..13c34b6 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -210,7 +210,7 @@ version = "1" - optional = true - - [dependencies.quoted_printable] --version = "0.4.6" -+version = "0.5" - optional = true - - [dependencies.rsa] -- 2.39.2