diff --git a/.gitignore b/.gitignore index 47a27cd..222aecb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /des-0.3.0.crate /des-0.4.0.crate +/des-0.6.0.crate diff --git a/0001-Upgrade-to-opaque-debug-0.3.patch b/0001-Upgrade-to-opaque-debug-0.3.patch deleted file mode 100644 index 238bf18..0000000 --- a/0001-Upgrade-to-opaque-debug-0.3.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 - ---- - des/src/des.rs | 2 +- - des/src/lib.rs | 3 --- - des/src/tdes.rs | 8 ++++---- - 3 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/des/src/des.rs b/des/src/des.rs -index 720c2f71153f..971ad9c22424 100644 ---- a/src/des.rs -+++ b/src/des.rs -@@ -209,4 +209,4 @@ impl BlockCipher for Des { - } - } - --impl_opaque_debug!(Des); -+opaque_debug::implement!(Des); -diff --git a/des/src/lib.rs b/des/src/lib.rs -index 735babee09f7..270e75f97af8 100644 ---- a/src/lib.rs -+++ b/src/lib.rs -@@ -7,9 +7,6 @@ - #![forbid(unsafe_code)] - #![warn(missing_docs, rust_2018_idioms)] - --#[macro_use] --extern crate opaque_debug; -- - pub use block_cipher; - - mod consts; -diff --git a/des/src/tdes.rs b/des/src/tdes.rs -index 5e213a37e03d..ce0d5bc7beb3 100644 ---- a/src/tdes.rs -+++ b/src/tdes.rs -@@ -198,7 +198,7 @@ impl BlockCipher for TdesEee2 { - } - } - --impl_opaque_debug!(TdesEde3); --impl_opaque_debug!(TdesEee3); --impl_opaque_debug!(TdesEde2); --impl_opaque_debug!(TdesEee2); -+opaque_debug::implement!(TdesEde3); -+opaque_debug::implement!(TdesEee3); -+opaque_debug::implement!(TdesEde2); -+opaque_debug::implement!(TdesEee2); --- -2.26.2 - diff --git a/des-fix-metadata.diff b/des-fix-metadata.diff deleted file mode 100644 index 42e339d..0000000 --- a/des-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- des-0.4.0/Cargo.toml 2020-06-08T14:33:24+00:00 -+++ des-0.4.0/Cargo.toml 2020-07-20T21:45:19.898007+00:00 -@@ -30,7 +30,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-des.spec b/rust-des.spec index 2d7102a..573ccb4 100644 --- a/rust-des.spec +++ b/rust-des.spec @@ -1,22 +1,18 @@ -# Generated by rust2rpm 15 +# Generated by rust2rpm 16 %bcond_without check %global debug_package %{nil} %global crate des Name: rust-%{crate} -Version: 0.4.0 -Release: 4%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: DES and Triple DES (3DES, TDES) block ciphers implementation -# Upstream license specification: MIT/Apache-2.0 +# Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/des Source: %{crates_source} -# Initial patched metadata -# * Upgrade to opaque-debug 0.3, https://github.com/RustCrypto/block-ciphers/pull/140 -Patch0: des-fix-metadata.diff -Patch1: 0001-Upgrade-to-opaque-debug-0.3.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -75,6 +71,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sat Nov 14 2020 Fabio Valentini - 0.6.0-1 +- Update to version 0.6.0. + * Sat Aug 01 2020 Fedora Release Engineering - 0.4.0-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f027cc0..7d43cc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (des-0.4.0.crate) = b7fe89219beb084b946fa787110820a5bde8c5304ef6ab16e6e412717e384e3c002551465b877854bd9d4bb38d609dfb87f4e533c4bd01edb52e0c9fb58d7914 +SHA512 (des-0.6.0.crate) = 7e4b60b87ca369645e52376d65c5f287972a5e634c9727bd7f68c886da09693d1b0987b2911ec3664f6ddab3ba41a141be985d23bdefe48a9a441e236aec40dd