From cccc7ef32436afdd20736704147427df1a8f9810 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 14 Dec 2023 13:17:04 +0100
Subject: [PATCH] Update to version 0.28.0; Fixes RHBZ#2251385

---
 .gitignore                                 |  1 +
 0001-Port-to-trust-dns-resolver-0.23.patch | 25 ----------------------
 rust-sequoia-net.spec                      | 10 +++------
 sequoia-net-fix-metadata-auto.diff         |  6 +++---
 sequoia-net-fix-metadata.diff              | 23 --------------------
 sources                                    |  2 +-
 6 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 0001-Port-to-trust-dns-resolver-0.23.patch
 delete mode 100644 sequoia-net-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index afe99b7..2ba3af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /sequoia-net-0.23.0.crate
 /sequoia-net-0.24.0.crate
 /sequoia-net-0.27.0.crate
+/sequoia-net-0.28.0.crate
diff --git a/0001-Port-to-trust-dns-resolver-0.23.patch b/0001-Port-to-trust-dns-resolver-0.23.patch
deleted file mode 100644
index e06b3e1..0000000
--- a/0001-Port-to-trust-dns-resolver-0.23.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 67cbaf0..0f385e7 100644
--- a/rust-sequoia-net.spec
+++ b/rust-sequoia-net.spec
@@ -5,7 +5,7 @@
 %global crate sequoia-net
 
 Name:           rust-sequoia-net
-Version:        0.27.0
+Version:        0.28.0
 Release:        %autorelease
 Summary:        Network services for OpenPGP
 
@@ -14,11 +14,6 @@ URL:            https://crates.io/crates/sequoia-net
 Source:         %{crates_source}
 # 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:  cargo-rpm-macros >= 24
 
@@ -61,6 +56,7 @@ use the "default" feature of the "%{crate}" crate.
 %cargo_generate_buildrequires
 
 %build
+# build with the default crypto backend (Nettle)
 %cargo_build -f sequoia-openpgp/crypto-nettle
 
 %install
@@ -68,7 +64,7 @@ use the "default" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-%cargo_test -f sequoia-openpgp/crypto-nettle
+%cargo_test
 %endif
 
 %changelog
diff --git a/sequoia-net-fix-metadata-auto.diff b/sequoia-net-fix-metadata-auto.diff
index a08e3c8..90fe248 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-10-20T12:55:39.476266+00:00
-@@ -120,16 +120,9 @@
+--- sequoia-net-0.28.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-net-0.28.0/Cargo.toml	2023-12-14T09:53:15.482809+00:00
+@@ -123,16 +123,9 @@
  ]
  default-features = false
  
diff --git a/sequoia-net-fix-metadata.diff b/sequoia-net-fix-metadata.diff
deleted file mode 100644
index 27519fd..0000000
--- a/sequoia-net-fix-metadata.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- sequoia-net-0.27.0/Cargo.toml	1970-01-01T00:00:01+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"
- features = ["getrandom"]
--default-features = false
- 
- [target."cfg(not(windows))".dev-dependencies.sequoia-openpgp]
- version = "1"
diff --git a/sources b/sources
index 1483969..023eb9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-net-0.27.0.crate) = 71682e405262b0298a4d97aa6c2cecea4bc6b44927265f0ac252fe367cb51c11943d95bc84152b1d749c69e345bdff8129dd88e7960b4919886a8e3f4c043cff
+SHA512 (sequoia-net-0.28.0.crate) = 1a87d9b078c2b44220882611e8d49c6117906d8cbd81e50301a6b31d7428cef5622223ed234e28558fa83e31c47df84dfed087f1b1962bd42a7d1bc2f0fe9fff