Signed-off-by: Lukas Wagner <l.wag...@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 <supp...@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.wag...@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 <pa...@paolo565.org> +Source: https://github.com/lettre/email-encoding + +Files: * +Copyright: 2021-2022 Paolo Barbolini <pa...@paolo565.org> +License: MIT or Apache-2.0 + +Files: debian/* +Copyright: + 2023 Debian Rust Maintainers <pkg-rust-maintain...@alioth-lists.debian.net> + 2023 Lukas Wagner <l.wag...@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 <pa...@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-maintain...@alioth-lists.debian.net> + 2023 Lukas Wagner <l.wag...@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.wag...@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
