From df580b08fb3fc96fded998cff8b1f12588a549d8 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 1 May 2024 17:11:47 +0200
Subject: [PATCH] Update to version 2.2.3; Fixes RHBZ#2231741

---
 .gitignore                |  1 +
 ed25519-fix-metadata.diff | 23 ---------------
 rust-ed25519.spec         | 61 ++++++++++++++++++++++++++-------------
 sources                   |  2 +-
 4 files changed, 43 insertions(+), 44 deletions(-)
 delete mode 100644 ed25519-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 6f3847f..f41d9a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ed25519-1.5.3.crate
+/ed25519-2.2.3.crate
diff --git a/ed25519-fix-metadata.diff b/ed25519-fix-metadata.diff
deleted file mode 100644
index f275acf..0000000
--- a/ed25519-fix-metadata.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- ed25519-1.5.3/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ ed25519-1.5.3/Cargo.toml	2023-05-05T14:33:50.408890+00:00
-@@ -43,10 +43,6 @@
-     "docsrs",
- ]
- 
--[dependencies.pkcs8]
--version = "0.9"
--optional = true
--
- [dependencies.serde]
- version = "1"
- optional = true
-@@ -80,9 +76,7 @@
- features = ["std"]
- 
- [features]
--alloc = ["pkcs8/alloc"]
- default = ["std"]
--pem = ["pkcs8/pem"]
- serde_bytes = [
-     "serde",
-     "serde_bytes_crate",
diff --git a/rust-ed25519.spec b/rust-ed25519.spec
index 0340b33..48c2ea6 100644
--- a/rust-ed25519.spec
+++ b/rust-ed25519.spec
@@ -1,23 +1,20 @@
-# Generated by rust2rpm 24
-# * resolve dependency loop with ed25519-dalek
+# Generated by rust2rpm 26
+# * missing / outdated dev-dependencies: curve25519-dalek, ring-compat
 %bcond_with check
 %global debug_package %{nil}
 
 %global crate ed25519
 
 Name:           rust-ed25519
-Version:        1.5.3
+Version:        2.2.3
 Release:        %autorelease
 Summary:        Edwards Digital Signature Algorithm
 
 License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/ed25519
 Source:         %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * disable unused PEM support (pkcs8 crate in Fedora is too old)
-Patch:          ed25519-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Edwards Digital Signature Algorithm (EdDSA) over Curve25519 (as
@@ -54,40 +51,64 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+serde-devel
+%package     -n %{name}+alloc-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+serde-devel %{_description}
+%description -n %{name}+alloc-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "serde" feature of the "%{crate}" crate.
+use the "alloc" feature of the "%{crate}" crate.
 
-%files       -n %{name}+serde-devel
+%files       -n %{name}+alloc-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+serde_bytes-devel
+%package     -n %{name}+pem-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+serde_bytes-devel %{_description}
+%description -n %{name}+pem-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "serde_bytes" feature of the "%{crate}" crate.
+use the "pem" feature of the "%{crate}" crate.
 
-%files       -n %{name}+serde_bytes-devel
+%files       -n %{name}+pem-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+pkcs8-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+pkcs8-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "pkcs8" feature of the "%{crate}" crate.
+
+%files       -n %{name}+pkcs8-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+serde_bytes_crate-devel
+%package     -n %{name}+serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
+
+%files       -n %{name}+serde-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+serde_bytes-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+serde_bytes_crate-devel %{_description}
+%description -n %{name}+serde_bytes-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "serde_bytes_crate" feature of the "%{crate}" crate.
+use the "serde_bytes" feature of the "%{crate}" crate.
 
-%files       -n %{name}+serde_bytes_crate-devel
+%files       -n %{name}+serde_bytes-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-devel
@@ -115,7 +136,7 @@ use the "zeroize" 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
diff --git a/sources b/sources
index 0f41b13..1058ab8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ed25519-1.5.3.crate) = 91d65fd72015807085501fddda784fd6d9461f17eb1269d7a9be2d9434370f88211bf31feb931bf8c587ee602c4fb361f4b5fc47805b14aa276a7b1537d12cb0
+SHA512 (ed25519-2.2.3.crate) = 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2