From c8a1df2a86920fd88f4019e5682f038db8ccaeaa Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 28 Jun 2023 00:02:48 +0200 Subject: [PATCH] Update to version 1.4.1; Fixes RHBZ#2217961 --- .gitignore | 2 ++ rpm-sequoia-fix-metadata.diff | 7 ++++--- rust-rpm-sequoia.spec | 4 ++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0d5518e..5320b01 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /rpm-sequoia-1.3.0.crate /rpm-sequoia-1.4.0.crate /rpm-sequoia-1.4.0-vendor.tar.xz +/rpm-sequoia-1.4.1.crate +/rpm-sequoia-1.4.1-vendor.tar.xz diff --git a/rpm-sequoia-fix-metadata.diff b/rpm-sequoia-fix-metadata.diff index cf6a8d5..34b6944 100644 --- a/rpm-sequoia-fix-metadata.diff +++ b/rpm-sequoia-fix-metadata.diff @@ -1,10 +1,11 @@ ---- rpm-sequoia-1.4.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rpm-sequoia-1.4.0/Cargo.toml 2023-04-14T08:34:49.569359+00:00 -@@ -74,12 +74,8 @@ +--- rpm-sequoia-1.4.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rpm-sequoia-1.4.1/Cargo.toml 2023-06-27T20:35:54.114306+00:00 +@@ -74,13 +74,8 @@ version = "0.1.4" [features] -crypto-botan = ["sequoia-openpgp/crypto-botan"] +-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"] -crypto-cng = ["sequoia-openpgp/crypto-cng"] -crypto-nettle = ["sequoia-openpgp/crypto-nettle"] crypto-openssl = ["sequoia-openpgp/crypto-openssl"] diff --git a/rust-rpm-sequoia.spec b/rust-rpm-sequoia.spec index 6fd7b58..8f5d01f 100644 --- a/rust-rpm-sequoia.spec +++ b/rust-rpm-sequoia.spec @@ -11,7 +11,7 @@ %global crate rpm-sequoia Name: rust-rpm-sequoia -Version: 1.4.0 +Version: 1.4.1 Release: %autorelease Summary: Implementation of the RPM PGP interface using Sequoia @@ -52,7 +52,7 @@ Summary: %{summary} # MIT OR Apache-2.0 OR Zlib # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016 +License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} diff --git a/sources b/sources index 75978aa..0552c20 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rpm-sequoia-1.4.0.crate) = ecb4afce1ab4697e652ab44eed1f4b778bf43f06f4befef92c2c1dba47b10f78f5bc5f769d838a55edb0e5e9abbe565c2e59c95a93d35df9bd2ef2fec20bd90e -SHA512 (rpm-sequoia-1.4.0-vendor.tar.xz) = ce6f3b6ba06f1e1144d690a4a4a7751911bc770072714c4ef76a18c05945da3c5696b37d416dfd70e6a8a8cfe38083e88f5b83ac9c0c0ad105bebe4a140ffb4f +SHA512 (rpm-sequoia-1.4.1.crate) = 37887fc3d1d6c28a3c080f3c5ae6e73ad85dc4c4376d5711a29e07d54af59ad299a51ac393895ee5388723a9d9b68f03f32111052eaa03e5bd680b8feaef3627 +SHA512 (rpm-sequoia-1.4.1-vendor.tar.xz) = 77f41be1d860bd769fd4d7e694acf421abd4e4ae500bc42cba2e87aea622fe4c92e74dc8bb911d2fde558dc605c7b41e7a36b75936d845976599bf499e0d83a6