From c87576f74dbc260d4784d849f7a6d7c423bc478f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 14 Apr 2023 11:42:42 +0200
Subject: [PATCH] Update to version 0.27.0; Fixes RHBZ#2107108

---
 .gitignore                         |  1 +
 .rust2rpm.conf                     |  3 --
 rust-sequoia-net.spec              | 69 +++++-------------------------
 sequoia-net-fix-metadata-auto.diff | 17 ++++++++
 sequoia-net-fix-metadata.diff      | 12 +++---
 sources                            |  2 +-
 6 files changed, 35 insertions(+), 69 deletions(-)
 delete mode 100644 .rust2rpm.conf
 create mode 100644 sequoia-net-fix-metadata-auto.diff

diff --git a/.gitignore b/.gitignore
index 2be1acc..afe99b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 
 /sequoia-net-0.23.0.crate
 /sequoia-net-0.24.0.crate
+/sequoia-net-0.27.0.crate
diff --git a/.rust2rpm.conf b/.rust2rpm.conf
deleted file mode 100644
index 3bcb373..0000000
--- a/.rust2rpm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  crypto-cng
diff --git a/rust-sequoia-net.spec b/rust-sequoia-net.spec
index 905a269..9f6d14d 100644
--- a/rust-sequoia-net.spec
+++ b/rust-sequoia-net.spec
@@ -1,23 +1,22 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate sequoia-net
 
-Name:           rust-%{crate}
-Version:        0.24.0
+Name:           rust-sequoia-net
+Version:        0.27.0
 Release:        %autorelease
 Summary:        Network services for OpenPGP
 
-# Upstream license specification: LGPL-2.0-or-later
-License:        LGPLv2+
+License:        LGPL-2.0-or-later
 URL:            https://crates.io/crates/sequoia-net
 Source:         %{crates_source}
-# Initial patched metadata
+# Automatically generated patch to strip foreign dependencies
+Patch:          sequoia-net-fix-metadata-auto.diff
+# Manually created patch for downstream crate metadata changes
 # * don't drop default features from rand dev-dependency
-Patch0:         sequoia-net-fix-metadata.diff
-
-ExclusiveArch:  %{rust_arches}
+Patch:          sequoia-net-fix-metadata.diff
 
 BuildRequires:  rust-packaging >= 21
 
@@ -52,54 +51,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+compression-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+compression-bzip2-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-bzip2-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression-bzip2" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-bzip2-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+compression-deflate-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+compression-deflate-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "compression-deflate" feature of the "%{crate}" crate.
-
-%files       -n %{name}+compression-deflate-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+crypto-nettle-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+crypto-nettle-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "crypto-nettle" feature of the "%{crate}" crate.
-
-%files       -n %{name}+crypto-nettle-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
@@ -108,14 +59,14 @@ use the "crypto-nettle" feature of the "%{crate}" crate.
 %cargo_generate_buildrequires
 
 %build
-%cargo_build
+%cargo_build  -f sequoia-openpgp/crypto-nettle
 
 %install
 %cargo_install
 
 %if %{with check}
 %check
-%cargo_test
+%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
new file mode 100644
index 0000000..7118fe6
--- /dev/null
+++ b/sequoia-net-fix-metadata-auto.diff
@@ -0,0 +1,17 @@
+--- 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 @@
+ ]
+ default-features = false
+ 
+-[target."cfg(windows)".dev-dependencies.sequoia-openpgp]
+-version = "1"
+-features = [
+-    "crypto-cng",
+-    "__implicit-crypto-backend-for-tests",
+-]
+-default-features = false
+-
+ [badges.gitlab]
+ repository = "sequoia-pgp/sequoia"
+ 
diff --git a/sequoia-net-fix-metadata.diff b/sequoia-net-fix-metadata.diff
index 7a27a5d..058785b 100644
--- a/sequoia-net-fix-metadata.diff
+++ b/sequoia-net-fix-metadata.diff
@@ -1,10 +1,10 @@
---- sequoia-net-0.24.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-net-0.24.0/Cargo.toml	2022-03-16T10:56:55.150026+00:00
-@@ -79,7 +79,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:41.882504+00:00
+@@ -110,7 +110,6 @@
  [dev-dependencies.rand]
- version = "0.7"
+ version = "0.8"
  features = ["getrandom"]
 -default-features = false
  
- [features]
- compression = ["sequoia-openpgp/compression"]
+ [target."cfg(not(windows))".dev-dependencies.sequoia-openpgp]
+ version = "1"
diff --git a/sources b/sources
index f0a3263..1483969 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-net-0.24.0.crate) = 4171321068894fa7f322d73eb6d0094cffd7bbeff4d810756eacbf4eff7bd43389f50dc1b26fbd697ae78c7c65723b79b5831f0e14a8ce6f67079f12f1c5b5c2
+SHA512 (sequoia-net-0.27.0.crate) = 71682e405262b0298a4d97aa6c2cecea4bc6b44927265f0ac252fe367cb51c11943d95bc84152b1d749c69e345bdff8129dd88e7960b4919886a8e3f4c043cff