trust-dns-client: new upstream version

disable quin

diff --git a/src/trust-dns-client/debian/changelog b/src/trust-dns-client/debian/changelog
index 4955b3ed08f62b75fe7557fbf2560c66ac07036d..102a2e3fb3f22ea173e98a5d8e4a21780f7351e5 100644 (file)
--- a/src/trust-dns-client/debian/changelog
+++ b/src/trust-dns-client/debian/changelog
@@ -1,3 +1,10 @@
+rust-trust-dns-client (0.22.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package trust-dns-client 0.22.0 from crates.io using debcargo 2.6.0
+  * Disable quic support
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 20 Dec 2022 09:20:07 -0500
+
 rust-trust-dns-client (0.21.2-3) unstable; urgency=medium
 
   * Package trust-dns-client 0.21.2 from crates.io using debcargo 2.5.0

diff --git a/src/trust-dns-client/debian/copyright.debcargo.hint b/src/trust-dns-client/debian/copyright.debcargo.hint
index 9f9b8d0215d8f6eba8d4f7db0acd8b971512794c..47eebbb13bc5a238bdba886ab4dd76cc703eed40 100644 (file)
--- a/src/trust-dns-client/debian/copyright.debcargo.hint
+++ b/src/trust-dns-client/debian/copyright.debcargo.hint
@@ -12,7 +12,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE-MIT
+Files: LICENSE-MIT
 Copyright:
  2015 The trust-dns Developers
  2017 Google LLC.
@@ -21,91 +21,84 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./benches/lower_name_benches.rs
-Copyright: 2015-2017 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/client/async_client.rs
+Files: src/client/async_client.rs
 Copyright: 2015-2019 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/client/async_secure_client.rs
+Files: src/client/async_secure_client.rs
 Copyright: 2015-2019 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/client/client.rs
+Files: src/client/client.rs
 Copyright: 2015 - 2016 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/client/client_connection.rs
+Files: src/client/client_connection.rs
 Copyright: 2016 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/client/memoize_client_handle.rs
+Files: src/client/memoize_client_handle.rs
 Copyright: 2015-2016 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/client/mod.rs
+Files: src/client/mod.rs
 Copyright: 2015-2016 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/client/rc_stream.rs
+Files: src/client/rc_stream.rs
 Copyright: 2015-2016 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/error/client_error.rs
+Files: src/error/client_error.rs
 Copyright: 2015-2020 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/error/dnssec_error.rs
+Files: src/error/dnssec_error.rs
 Copyright: 2015-2020 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/error/lexer_error.rs
+Files: src/error/lexer_error.rs
 Copyright: 2015-2020 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/error/mod.rs
+Files: src/error/mod.rs
 Copyright: 2015 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/error/parse_error.rs
+Files: src/error/parse_error.rs
 Copyright:
  2015-2020 Benjamin Fry <benjaminfry@me.com>
  2017 Google LLC.
@@ -114,238 +107,238 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/https_client_connection.rs
+Files: src/https_client_connection.rs
 Copyright: 2015-2018 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
+Files: src/lib.rs
 Copyright: 2015 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/multicast/mdns_client_connection.rs
+Files: src/multicast/mdns_client_connection.rs
 Copyright: 2015-2018 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/multicast/mod.rs
+Files: src/multicast/mod.rs
 Copyright: 2015-2018 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/op/lower_query.rs
+Files: src/op/lower_query.rs
 Copyright: 2015-2017 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/op/mod.rs
+Files: src/op/mod.rs
 Copyright: 2015-2017 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/op/update_message.rs
+Files: src/op/update_message.rs
 Copyright: 2015-2017 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/rr/dnssec/keypair.rs
+Files: src/rr/dnssec/keypair.rs
 Copyright: 2015-2016 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/rr/dnssec/mod.rs
+Files: src/rr/dnssec/mod.rs
 Copyright: 2015 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/rr/dnssec/signer.rs
+Files: src/rr/dnssec/signer.rs
 Copyright: 2015-2019 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/rr/dnssec/tsig.rs
+Files: src/rr/dnssec/tsig.rs
 Copyright: 2015-2019 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/rr/lower_name.rs
+Files: src/rr/lower_name.rs
 Copyright: 2015-2019 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/rr/mod.rs
+Files: src/rr/mod.rs
 Copyright: 2015 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/rr/rr_key.rs
+Files: src/rr/rr_key.rs
 Copyright: 2015-2017 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/serialize/binary/mod.rs
+Files: src/serialize/binary/mod.rs
 Copyright: 2015 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/serialize/mod.rs
+Files: src/serialize/mod.rs
 Copyright: 2015 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/serialize/txt/mod.rs
+Files: src/serialize/txt/mod.rs
 Copyright: 2015 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/serialize/txt/parse_rdata.rs
+Files: src/serialize/txt/parse_rdata.rs
 Copyright: 2015-2019 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/serialize/txt/rdata_parsers/a.rs
+Files: src/serialize/txt/rdata_parsers/a.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/aaaa.rs
+Files: src/serialize/txt/rdata_parsers/aaaa.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/caa.rs
+Files: src/serialize/txt/rdata_parsers/caa.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/csync.rs
+Files: src/serialize/txt/rdata_parsers/csync.rs
 Copyright: 2015-2021 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/serialize/txt/rdata_parsers/hinfo.rs
+Files: src/serialize/txt/rdata_parsers/hinfo.rs
 Copyright: 2015-2021 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/serialize/txt/rdata_parsers/mod.rs
+Files: src/serialize/txt/rdata_parsers/mod.rs
 Copyright: 2015-2019 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/serialize/txt/rdata_parsers/mx.rs
+Files: src/serialize/txt/rdata_parsers/mx.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/name.rs
+Files: src/serialize/txt/rdata_parsers/name.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/naptr.rs
+Files: src/serialize/txt/rdata_parsers/naptr.rs
 Copyright: 2015-2019 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/serialize/txt/rdata_parsers/null.rs
+Files: src/serialize/txt/rdata_parsers/null.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/openpgpkey.rs
+Files: src/serialize/txt/rdata_parsers/openpgpkey.rs
 Copyright: 2019 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/serialize/txt/rdata_parsers/soa.rs
+Files: src/serialize/txt/rdata_parsers/soa.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/srv.rs
+Files: src/serialize/txt/rdata_parsers/srv.rs
 Copyright: 2015 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/serialize/txt/rdata_parsers/sshfp.rs
+Files: src/serialize/txt/rdata_parsers/sshfp.rs
 Copyright: 2019 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/serialize/txt/rdata_parsers/svcb.rs
+Files: src/serialize/txt/rdata_parsers/svcb.rs
 Copyright: 2015-2021 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/serialize/txt/rdata_parsers/tlsa.rs
+Files: src/serialize/txt/rdata_parsers/tlsa.rs
 Copyright:
  2015-2017 Benjamin Fry <benjaminfry@me.com>
  2017 Google LLC.
@@ -354,56 +347,56 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/serialize/txt/rdata_parsers/txt.rs
+Files: src/serialize/txt/rdata_parsers/txt.rs
 Copyright: 2015 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/serialize/txt/zone.rs
+Files: src/serialize/txt/zone.rs
 Copyright: 2015 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/serialize/txt/zone_lex.rs
+Files: src/serialize/txt/zone_lex.rs
 Copyright: 2015-2016 Benjamin Fry
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/tcp/mod.rs
+Files: src/tcp/mod.rs
 Copyright: 2015 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/tcp/tcp_client_connection.rs
+Files: src/tcp/tcp_client_connection.rs
 Copyright: 2015-2018 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/tests.rs
+Files: src/tests.rs
 Copyright: 2015-2016 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/udp/mod.rs
+Files: src/udp/mod.rs
 Copyright: 2015 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/udp/udp_client_connection.rs
+Files: src/udp/udp_client_connection.rs
 Copyright: 2015-2018 Benjamin Fry <benjaminfry@me.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:

diff --git a/src/trust-dns-client/debian/debcargo.toml b/src/trust-dns-client/debian/debcargo.toml
index f0c1668ef58909b2c71b74f8f555f8cffe4fbbae..f9cd5192af75162e0891d846e45bc886a8b8588b 100644 (file)
--- a/src/trust-dns-client/debian/debcargo.toml
+++ b/src/trust-dns-client/debian/debcargo.toml
@@ -1,6 +1,7 @@
 overlay = "."
 uploaders = ["Reinhard Tartler <siretart@tauware.de>"]
 collapse_features = true
+excludes = ["benches/**"]
 
 # these tests require unavailable features
 [packages."lib+dns-over-https"]

diff --git a/src/trust-dns-client/debian/patches/disable-quic.patch b/src/trust-dns-client/debian/patches/disable-quic.patch
new file mode 100644 (file)
index 0000000..6b54e78
--- /dev/null
+++ b/src/trust-dns-client/debian/patches/disable-quic.patch
@@ -0,0 +1,15 @@
+Index: trust-dns-client/Cargo.toml
+===================================================================
+--- trust-dns-client.orig/Cargo.toml
++++ trust-dns-client/Cargo.toml
+@@ -171,10 +171,6 @@ dns-over-openssl = [
+     "dnssec-openssl",
+     "openssl",
+ ]
+-dns-over-quic = [
+-    "dns-over-rustls",
+-    "trust-dns-proto/dns-over-quic",
+-]
+ dns-over-rustls = [
+     "dns-over-tls",
+     "dnssec-ring",

diff --git a/src/trust-dns-client/debian/patches/series b/src/trust-dns-client/debian/patches/series
index 79cf9663bb7e0378b547183d9684d7cd5d3abd78..4a50ac6f7e16b84a20715a1fd3dd28fb646163ff 100644 (file)
--- a/src/trust-dns-client/debian/patches/series
+++ b/src/trust-dns-client/debian/patches/series
@@ -1 +1 @@
-update-depends.patch
+disable-quic.patch

diff --git a/src/trust-dns-client/debian/patches/update-depends.patch b/src/trust-dns-client/debian/patches/update-depends.patch
deleted file mode 100644 (file)
index 2977c2c..0000000
--- a/src/trust-dns-client/debian/patches/update-depends.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -112,7 +112,6 @@
- backtrace = ["trust-dns-proto/backtrace"]
- dns-over-https = ["trust-dns-proto/dns-over-https"]
- dns-over-https-openssl = ["dns-over-https", "dns-over-openssl"]
--dns-over-https-rustls = ["dns-over-https", "dns-over-rustls", "trust-dns-proto/dns-over-https-rustls"]
- dns-over-native-tls = ["dns-over-tls", "trust-dns-proto/dns-over-native-tls"]
- dns-over-openssl = ["dns-over-tls", "dnssec-openssl", "openssl"]
- dns-over-rustls = ["dns-over-tls", "dnssec-ring", "rustls", "webpki", "trust-dns-proto/dns-over-rustls"]