From 9011f227794535d9de654fb81b9428ac0a39c423 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Jul 20 2020 22:13:58 +0000 Subject: Upgrade to opaque-debug 0.3 --- diff --git a/0001-Upgrade-to-opaque-debug-0.3.patch b/0001-Upgrade-to-opaque-debug-0.3.patch new file mode 100644 index 0000000..f566193 --- /dev/null +++ b/0001-Upgrade-to-opaque-debug-0.3.patch @@ -0,0 +1,40 @@ +From cb46043221156413192aab8b01b885deb72ff133 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Mon, 20 Jul 2020 14:42:53 -0700 +Subject: [PATCH] Upgrade to opaque-debug 0.3 + +--- + aes/aes-soft/src/impls.rs | 2 +- + aes/aes-soft/src/lib.rs | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/aes/aes-soft/src/impls.rs b/aes/aes-soft/src/impls.rs +index 94733cc09709..161a6ccba13b 100644 +--- a/src/impls.rs ++++ b/src/impls.rs +@@ -107,7 +107,7 @@ macro_rules! define_aes_impl { + } + } + +- impl_opaque_debug!($name); ++ opaque_debug::implement!($name); + } + } + +diff --git a/aes/aes-soft/src/lib.rs b/aes/aes-soft/src/lib.rs +index c3badeaa122b..89f84f57997e 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -40,9 +40,6 @@ + + pub use block_cipher; + +-#[macro_use] +-extern crate opaque_debug; +- + mod bitslice; + mod consts; + mod expand; +-- +2.26.2 + diff --git a/aes-soft-fix-metadata.diff b/aes-soft-fix-metadata.diff new file mode 100644 index 0000000..0d27404 --- /dev/null +++ b/aes-soft-fix-metadata.diff @@ -0,0 +1,11 @@ +--- aes-soft-0.4.0/Cargo.toml 2020-06-05T16:53:42+00:00 ++++ aes-soft-0.4.0/Cargo.toml 2020-07-20T22:09:50.742657+00:00 +@@ -29,7 +29,7 @@ + default-features = false + + [dependencies.opaque-debug] +-version = "0.2" ++version = "0.3" + [dev-dependencies.block-cipher] + version = "0.7" + features = ["dev"] diff --git a/rust-aes-soft.spec b/rust-aes-soft.spec index 5bd3cb1..cf0d9ec 100644 --- a/rust-aes-soft.spec +++ b/rust-aes-soft.spec @@ -6,13 +6,17 @@ Name: rust-%{crate} Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: AES (Rijndael) block ciphers bit-sliced implementation # Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/aes-soft Source: %{crates_source} +# Initial patched metadata +# * Upgrade to opaque-debug 0.3, https://github.com/RustCrypto/block-ciphers/pull/140 +Patch0: aes-soft-fix-metadata.diff +Patch1: 0001-Upgrade-to-opaque-debug-0.3.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -71,6 +75,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Mon Jul 20 2020 Josh Stone - 0.4.0-2 +- Upgrade to opaque-debug 0.3 + * Mon Jun 22 12:42:10 CEST 2020 Igor Raits - 0.4.0-1 - Update to 0.4.0