diff --git a/src/native-tls/debian/RFS b/src/native-tls/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/native-tls/debian/changelog b/src/native-tls/debian/changelog index fa615d2..803a4be 100644 --- a/src/native-tls/debian/changelog +++ b/src/native-tls/debian/changelog @@ -1,3 +1,10 @@ +rust-native-tls (0.2.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package native-tls 0.2.4 from crates.io using debcargo 2.4.2 + + -- Fabian Grünbichler Sun, 26 Apr 2020 21:27:45 +0200 + rust-native-tls (0.2.3-1) unstable; urgency=medium * Package native-tls 0.2.3 from crates.io using debcargo 2.4.0 diff --git a/src/native-tls/debian/copyright.debcargo.hint b/src/native-tls/debian/copyright.debcargo.hint index 9b68e9c..1b97ecf 100644 --- a/src/native-tls/debian/copyright.debcargo.hint +++ b/src/native-tls/debian/copyright.debcargo.hint @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2019 Debian Rust Maintainers - 2019 kpcyrd + 2019-2020 Debian Rust Maintainers + 2019-2020 kpcyrd License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/native-tls/debian/patches/disable-tests-that-access-network.patch b/src/native-tls/debian/patches/disable-tests-that-access-network.patch new file mode 100644 index 0000000..50165b6 --- /dev/null +++ b/src/native-tls/debian/patches/disable-tests-that-access-network.patch @@ -0,0 +1,27 @@ +Index: native-tls/src/test.rs +=================================================================== +--- native-tls.orig/src/test.rs ++++ native-tls/src/test.rs +@@ -19,7 +19,6 @@ macro_rules! p { + mod tests { + use super::*; + +- #[test] + fn connect_google() { + let builder = p!(TlsConnector::new()); + let s = p!(TcpStream::connect("google.com:443")); +@@ -34,14 +33,12 @@ mod tests { + assert!(result.ends_with(b"\r\n") || result.ends_with(b"")); + } + +- #[test] + fn connect_bad_hostname() { + let builder = p!(TlsConnector::new()); + let s = p!(TcpStream::connect("google.com:443")); + builder.connect("goggle.com", s).unwrap_err(); + } + +- #[test] + fn connect_bad_hostname_ignored() { + let builder = p!(TlsConnector::builder() + .danger_accept_invalid_hostnames(true) diff --git a/src/native-tls/debian/patches/series b/src/native-tls/debian/patches/series index 6737516..7bfeb49 100644 --- a/src/native-tls/debian/patches/series +++ b/src/native-tls/debian/patches/series @@ -1 +1,4 @@ strip-security-framework.patch +update-hex.patch + +disable-tests-that-access-network.patch diff --git a/src/native-tls/debian/patches/strip-security-framework.patch b/src/native-tls/debian/patches/strip-security-framework.patch index 10f39b2..79bd68d 100644 --- a/src/native-tls/debian/patches/strip-security-framework.patch +++ b/src/native-tls/debian/patches/strip-security-framework.patch @@ -5,8 +5,8 @@ version = "0.2" -[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.security-framework] --version = "0.3.1" +-version = "0.4.1" - [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.security-framework-sys] - version = "0.3.1" + version = "0.4.1" diff --git a/src/native-tls/debian/patches/update-hex.patch b/src/native-tls/debian/patches/update-hex.patch new file mode 100644 index 0000000..8c0ef21 --- /dev/null +++ b/src/native-tls/debian/patches/update-hex.patch @@ -0,0 +1,13 @@ +Index: native-tls/Cargo.toml +=================================================================== +--- native-tls.orig/Cargo.toml ++++ native-tls/Cargo.toml +@@ -19,7 +19,7 @@ readme = "README.md" + license = "MIT/Apache-2.0" + repository = "https://github.com/sfackler/rust-native-tls" + [dev-dependencies.hex] +-version = "0.3" ++version = "0.4" + + [features] + vendored = ["openssl/vendored"]