From f2183fad75ae6eb8d0687ca982b4618e05650cbe Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 20 Oct 2023 14:57:52 +0200
Subject: [PATCH] Bump trust-dns-resolver and trust-dns-client dependencies
 from 0.22 to 0.23

---
 0001-Port-to-trust-dns-resolver-0.23.patch | 25 ++++++++++++++++++++++
 rust-sequoia-net.spec                      | 14 ++++++------
 sequoia-net-fix-metadata-auto.diff         |  7 ++++--
 sequoia-net-fix-metadata.diff              | 15 ++++++++++++-
 4 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 0001-Port-to-trust-dns-resolver-0.23.patch

diff --git a/0001-Port-to-trust-dns-resolver-0.23.patch b/0001-Port-to-trust-dns-resolver-0.23.patch
new file mode 100644
index 0000000..e06b3e1
--- /dev/null
+++ b/0001-Port-to-trust-dns-resolver-0.23.patch
@@ -0,0 +1,25 @@
+From e0dcd82d81e43e1fe3324585ccd56a7a1335b695 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Fri, 20 Oct 2023 15:25:23 +0200
+Subject: [PATCH] Port to trust-dns-resolver 0.23
+
+---
+ src/dane.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dane.rs b/src/dane.rs
+index 7725a58..9e13f5a 100644
+--- a/src/dane.rs
++++ b/src/dane.rs
+@@ -65,7 +65,7 @@ pub async fn get_raw(email_address: impl AsRef<str>) -> Result<Vec<Vec<u8>>> {
+     let mut opts = ResolverOpts::default();
+     opts.validate = true;
+ 
+-    let resolver = TokioAsyncResolver::tokio(Default::default(), opts)?;
++    let resolver = TokioAsyncResolver::tokio(Default::default(), opts);
+ 
+     let answers = resolver
+         .lookup(fqdn, RecordType::OPENPGPKEY)
+-- 
+2.41.0
+
diff --git a/rust-sequoia-net.spec b/rust-sequoia-net.spec
index 9f6d14d..67cbaf0 100644
--- a/rust-sequoia-net.spec
+++ b/rust-sequoia-net.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
@@ -12,13 +12,15 @@ Summary:        Network services for OpenPGP
 License:        LGPL-2.0-or-later
 URL:            https://crates.io/crates/sequoia-net
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          sequoia-net-fix-metadata-auto.diff
 # Manually created patch for downstream crate metadata changes
 # * don't drop default features from rand dev-dependency
+# * bump trust-dns-resolver and trust-dns-client dependencies from 0.22 to 0.23
 Patch:          sequoia-net-fix-metadata.diff
+Patch:          0001-Port-to-trust-dns-resolver-0.23.patch
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Network services for OpenPGP.}
@@ -52,21 +54,21 @@ use the "default" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
 %cargo_generate_buildrequires
 
 %build
-%cargo_build  -f sequoia-openpgp/crypto-nettle
+%cargo_build -f sequoia-openpgp/crypto-nettle
 
 %install
 %cargo_install
 
 %if %{with check}
 %check
-%cargo_test  -f sequoia-openpgp/crypto-nettle
+%cargo_test -f sequoia-openpgp/crypto-nettle
 %endif
 
 %changelog
diff --git a/sequoia-net-fix-metadata-auto.diff b/sequoia-net-fix-metadata-auto.diff
index 7118fe6..a08e3c8 100644
--- a/sequoia-net-fix-metadata-auto.diff
+++ b/sequoia-net-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
 --- sequoia-net-0.27.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-net-0.27.0/Cargo.toml	2023-04-14T09:33:37.611489+00:00
-@@ -120,14 +120,6 @@
++++ sequoia-net-0.27.0/Cargo.toml	2023-10-20T12:55:39.476266+00:00
+@@ -120,16 +120,9 @@
  ]
  default-features = false
  
@@ -15,3 +15,6 @@
  [badges.gitlab]
  repository = "sequoia-pgp/sequoia"
  
+ [badges.maintenance]
+ status = "actively-developed"
++
diff --git a/sequoia-net-fix-metadata.diff b/sequoia-net-fix-metadata.diff
index 058785b..27519fd 100644
--- a/sequoia-net-fix-metadata.diff
+++ b/sequoia-net-fix-metadata.diff
@@ -1,5 +1,18 @@
 --- sequoia-net-0.27.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-net-0.27.0/Cargo.toml	2023-04-14T09:33:41.882504+00:00
++++ sequoia-net-0.27.0/Cargo.toml	2023-10-20T12:56:16.695421+00:00
+@@ -91,10 +91,10 @@
+ features = ["macros"]
+ 
+ [dependencies.trust-dns-client]
+-version = "0.22"
++version = "0.23"
+ 
+ [dependencies.trust-dns-resolver]
+-version = "0.22"
++version = "0.23"
+ features = ["dnssec-openssl"]
+ 
+ [dependencies.url]
 @@ -110,7 +110,6 @@
  [dev-dependencies.rand]
  version = "0.8"