From 3b71b74764b5e813b8bc8a8c71a8852a5b58df91 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sun, 26 Mar 2023 20:01:45 +0200
Subject: [PATCH] Update to version 1.14.0; Fixes RHBZ#2181301

---
 .gitignore                             |  1 +
 rust-sequoia-openpgp.spec              |  7 ++-----
 rust2rpm.conf                          |  2 ++
 sequoia-openpgp-fix-metadata-auto.diff | 10 +++++-----
 sequoia-openpgp-fix-metadata.diff      | 27 ++++++++------------------
 sources                                |  2 +-
 6 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 80fa0f6..ded2367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /sequoia-openpgp-1.11.0.crate
 /sequoia-openpgp-1.12.0.crate
 /sequoia-openpgp-1.13.0.crate
+/sequoia-openpgp-1.14.0.crate
diff --git a/rust-sequoia-openpgp.spec b/rust-sequoia-openpgp.spec
index 000c0fd..032a0db 100644
--- a/rust-sequoia-openpgp.spec
+++ b/rust-sequoia-openpgp.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 23
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate sequoia-openpgp
 
 Name:           rust-sequoia-openpgp
-Version:        1.13.0
+Version:        1.14.0
 Release:        %autorelease
 Summary:        OpenPGP data types and associated machinery
 
@@ -19,9 +19,6 @@ Patch:          sequoia-openpgp-fix-metadata-auto.diff
 # * drop unused, benchmark-only criterion dev-dependency to speed up builds
 # * drop example-only rpassword dev-dependency (currently too old in Fedora)
 Patch:          sequoia-openpgp-fix-metadata.diff
-# * upstream patch to improve detection of supported ECC algorithms in OpenSSL
-#   https://gitlab.com/sequoia-pgp/sequoia/-/commit/aacdf9b
-Patch:          aacdf9b.patch
 
 BuildRequires:  rust-packaging >= 21
 
diff --git a/rust2rpm.conf b/rust2rpm.conf
index 0c6b6bb..e9be34f 100644
--- a/rust2rpm.conf
+++ b/rust2rpm.conf
@@ -4,6 +4,7 @@ unwanted-features =
   block-modes
   block-padding
   blowfish
+  botan
   cast5
   cipher
   des
@@ -25,4 +26,5 @@ unwanted-features =
   twofish
   typenum
   x25519-dalek
+  crypto-botan
   crypto-rust
diff --git a/sequoia-openpgp-fix-metadata-auto.diff b/sequoia-openpgp-fix-metadata-auto.diff
index 16cb950..c9e9b3c 100644
--- a/sequoia-openpgp-fix-metadata-auto.diff
+++ b/sequoia-openpgp-fix-metadata-auto.diff
@@ -1,7 +1,7 @@
---- sequoia-openpgp-1.13.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-openpgp-1.13.0/Cargo.toml	1970-01-01T00:00:01+00:00
-@@ -278,8 +278,6 @@
- ]
+--- sequoia-openpgp-1.14.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-openpgp-1.14.0/Cargo.toml	2023-03-25T21:39:42.452829+00:00
+@@ -286,8 +286,6 @@
+ crypto-botan = ["botan"]
  crypto-cng = [
      "eax",
 -    "winapi",
@@ -9,7 +9,7 @@
      "ed25519-dalek",
      "num-bigint-dig",
  ]
-@@ -322,37 +320,6 @@
+@@ -330,37 +328,6 @@
      "crypto-nettle",
  ]
  
diff --git a/sequoia-openpgp-fix-metadata.diff b/sequoia-openpgp-fix-metadata.diff
index 658c3aa..823a221 100644
--- a/sequoia-openpgp-fix-metadata.diff
+++ b/sequoia-openpgp-fix-metadata.diff
@@ -1,17 +1,6 @@
---- sequoia-openpgp-1.13.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sequoia-openpgp-1.13.0/Cargo.toml	2023-01-18T16:50:41.260880+00:00
-@@ -51,10 +51,6 @@
- name = "pad"
- required-features = ["compression-deflate"]
- 
--[[bench]]
--name = "run_benchmarks"
--harness = false
--
- [dependencies.aes]
- version = "0.6.0"
- optional = true
-@@ -242,19 +238,12 @@
+--- sequoia-openpgp-1.14.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ sequoia-openpgp-1.14.0/Cargo.toml	2023-03-25T21:41:01.746107+00:00
+@@ -249,19 +249,12 @@
  version = "0.8"
  features = ["xxh3"]
  
@@ -31,15 +20,15 @@
  
  [build-dependencies.lalrpop]
  version = ">=0.17"
-@@ -275,11 +264,6 @@
- compression-deflate = [
-     "flate2",
+@@ -284,11 +277,6 @@
      "buffered-reader/compression-deflate",
--]
+ ]
+ crypto-botan = ["botan"]
 -crypto-cng = [
 -    "eax",
 -    "ed25519-dalek",
 -    "num-bigint-dig",
- ]
+-]
  crypto-nettle = ["nettle"]
  crypto-openssl = [
+     "openssl",
diff --git a/sources b/sources
index 0ceecea..b0e0776 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sequoia-openpgp-1.13.0.crate) = 45ff000500e9919216a543981cc3b0eb6a2e354ff8bf76bf5829b0a98344766b88b7d25bc174649d85d92a14b6cbf12ce56f54f6fedd4ff9c79ba662a9e79ef1
+SHA512 (sequoia-openpgp-1.14.0.crate) = aad9d82eb8e589c241eeb7155549294116f35d4790a15740273247a8f1366db4fbdf123dccdc2a4b6bb5b5658ad5925698b30538a8668330d9970b89701a7765