trust-dns-resolver: new upstream version

refresh patches

diff --git a/src/trust-dns-resolver/debian/changelog b/src/trust-dns-resolver/debian/changelog
index d93ceca769d1a50ef6fe8068ae178040384aa15e..bd53ea6a0da4cb331de2117dd2ecd201a3bcc5f5 100644 (file)
--- a/src/trust-dns-resolver/debian/changelog
+++ b/src/trust-dns-resolver/debian/changelog
@@ -1,3 +1,9 @@
+rust-trust-dns-resolver (0.22.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package trust-dns-resolver 0.22.0 from crates.io using debcargo 2.6.0
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 14 Dec 2022 08:22:00 -0500
+
 rust-trust-dns-resolver (0.21.2-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/trust-dns-resolver/debian/copyright.debcargo.hint b/src/trust-dns-resolver/debian/copyright.debcargo.hint
index b14b1518785aa3be9280ed66be6515588cc7bcbd..8043e9dd430695e41634dbc3e77e0f4983bdf345 100644 (file)
--- a/src/trust-dns-resolver/debian/copyright.debcargo.hint
+++ b/src/trust-dns-resolver/debian/copyright.debcargo.hint
@@ -63,6 +63,13 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
+Files: src/https.rs
+Copyright: 2015-2022 Benjamin Fry <benjaminfry@me.com>
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
 Files: src/lib.rs
 Copyright: 2015-2017 Benjamin Fry <benjaminfry@me.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -126,6 +133,13 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
+Files: src/quic.rs
+Copyright: 2015-2022 Benjamin Fry <benjaminfry@me.com>
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
 Files: src/resolver.rs
 Copyright: 2015-2017 Benjamin Fry <benjaminfry@me.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)

diff --git a/src/trust-dns-resolver/debian/patches/avoid-disabled-features.patch b/src/trust-dns-resolver/debian/patches/avoid-disabled-features.patch
index 2377050c0d42330df0d6507b733dd4de61d09004..43801d0eff1ca33aacf7f06faae8cea649895431 100644 (file)
--- a/src/trust-dns-resolver/debian/patches/avoid-disabled-features.patch
+++ b/src/trust-dns-resolver/debian/patches/avoid-disabled-features.patch
@@ -1,6 +1,8 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -74,21 +73,14 @@
+Index: trust-dns-resolver/Cargo.toml
+===================================================================
+--- trust-dns-resolver.orig/Cargo.toml
++++ trust-dns-resolver/Cargo.toml
+@@ -92,10 +92,6 @@ optional = true
  version = "0.3"
  optional = true
  
@@ -11,32 +13,14 @@
  [dependencies.tokio-rustls]
  version = "0.23.0"
  optional = true
- 
- [dependencies.trust-dns-proto]
- version = "0.21.1"
+@@ -107,10 +103,6 @@ version = "0.1.30"
+ version = "0.22.0"
  default-features = false
  
 -[dependencies.webpki-roots]
 -version = "0.22.1"
 -optional = true
- [dev-dependencies.env_logger]
- version = "0.9"
- 
-@@ -100,13 +91,10 @@
- [features]
- backtrace = ["trust-dns-proto/backtrace"]
- default = ["tokio-runtime"]
--dns-over-https = ["trust-dns-proto/dns-over-https"]
--dns-over-https-rustls = ["trust-dns-proto/dns-over-https-rustls", "dns-over-rustls", "dns-over-https"]
--dns-over-native-tls = ["dns-over-tls", "tokio-native-tls", "trust-dns-proto/dns-over-native-tls"]
--dns-over-openssl = ["dns-over-tls", "trust-dns-proto/dns-over-openssl", "tokio-openssl"]
--dns-over-rustls = ["dns-over-tls", "rustls", "tokio-rustls", "trust-dns-proto/dns-over-rustls", "webpki-roots"]
--dns-over-tls = []
--dnssec = []
-+dns-over-https = ["trust-dns-proto/dns-over-https", "tokio-rustls", "rustls"]
-+dns-over-native-tls = ["dns-over-tls", "tokio-native-tls", "trust-dns-proto/dns-over-native-tls", "trust-dns-proto/tokio-runtime"]
-+dns-over-tls = ["tokio-runtime"]
-+dnssec = ["trust-dns-proto/dnssec"]
- dnssec-openssl = ["dnssec", "trust-dns-proto/dnssec-openssl"]
- dnssec-ring = ["dnssec", "trust-dns-proto/dnssec-ring"]
- serde-config = ["serde", "trust-dns-proto/serde-config"]
+-
+ [dev-dependencies.futures-executor]
+ version = "0.3.5"
+ features = ["std"]

diff --git a/src/trust-dns-resolver/debian/patches/avoid-ipconfig.patch b/src/trust-dns-resolver/debian/patches/avoid-ipconfig.patch
index ceab4072f10d1ebc990139bdb91339865951da68..93ff9a28febf6bc571aca76df4a2382c880b65fe 100644 (file)
--- a/src/trust-dns-resolver/debian/patches/avoid-ipconfig.patch
+++ b/src/trust-dns-resolver/debian/patches/avoid-ipconfig.patch
@@ -1,13 +1,15 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -112,9 +112,7 @@
- serde-config = ["serde", "trust-dns-proto/serde-config"]
- testing = []
- tokio-runtime = ["tokio/rt", "trust-dns-proto/tokio-runtime"]
+Index: trust-dns-resolver/Cargo.toml
+===================================================================
+--- trust-dns-resolver.orig/Cargo.toml
++++ trust-dns-resolver/Cargo.toml
+@@ -181,10 +181,6 @@ tokio-runtime = [
+     "trust-dns-proto/tokio-runtime",
+ ]
+ 
 -[target."cfg(windows)".dependencies.ipconfig]
 -version = "0.3.0"
 -optional = true
-+
+-
  [badges.codecov]
  branch = "main"
  repository = "bluejekyll/trust-dns"

diff --git a/src/trust-dns-resolver/debian/patches/relax-tests.patch b/src/trust-dns-resolver/debian/patches/relax-tests.patch
index 85ee9445c62d9f0a0752544f87b3efdf56a9c6df..c6b276ae30a95c03ab22c71572fa9db041555f52 100644 (file)
--- a/src/trust-dns-resolver/debian/patches/relax-tests.patch
+++ b/src/trust-dns-resolver/debian/patches/relax-tests.patch
@@ -1,7 +1,9 @@
---- a/src/hosts.rs
-+++ b/src/hosts.rs
-@@ -182,79 +182,3 @@
-     ))
+Index: trust-dns-resolver/src/hosts.rs
+===================================================================
+--- trust-dns-resolver.orig/src/hosts.rs
++++ trust-dns-resolver/src/hosts.rs
+@@ -180,79 +180,3 @@ pub(crate) fn read_hosts_conf<P: AsRef<P
+     Hosts::default().read_hosts_conf(file)
  }
  
 -#[cfg(any(unix, windows))]

diff --git a/src/trust-dns-resolver/debian/patches/series b/src/trust-dns-resolver/debian/patches/series
index f4d0e8ab0fe2fd7aab9294df3b20b47e8f5a2ea5..97a83528b0ba842ba9bf94596fb4405bee1e8921 100644 (file)
--- a/src/trust-dns-resolver/debian/patches/series
+++ b/src/trust-dns-resolver/debian/patches/series
@@ -1,4 +1,4 @@
-avoid-resolv-conf.patch
+#avoid-resolv-conf.patch
 avoid-ipconfig.patch
 avoid-disabled-features.patch
 relax-tests.patch