From 9d9cd96777b077995acf21fe976558f5de080f26 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 12 May 2022 15:46:49 +0200 Subject: [PATCH] Update to version 0.6.2; Fixes RHBZ#2078975 --- .gitignore | 1 + memsec-fix-metadata.diff | 40 ++++++++++++++++++----------- rust-memsec.spec | 55 +++++++++++++++++++--------------------- sources | 2 +- 4 files changed, 53 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 4accabb..8d4ffd3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /memsec-0.6.0.crate +/memsec-0.6.2.crate diff --git a/memsec-fix-metadata.diff b/memsec-fix-metadata.diff index 5e45c47..17af731 100644 --- a/memsec-fix-metadata.diff +++ b/memsec-fix-metadata.diff @@ -1,25 +1,35 @@ ---- memsec-0.6.0/Cargo.toml 2020-07-29T17:25:03+00:00 -+++ memsec-0.6.0/Cargo.toml 2021-04-12T09:26:20.491322+00:00 -@@ -21,6 +21,7 @@ - categories = ["no-std", "memory-management"] +--- memsec-0.6.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ memsec-0.6.2/Cargo.toml 2022-05-12T13:45:21.043716+00:00 +@@ -28,6 +28,7 @@ + ] license = "MIT" repository = "https://github.com/quininer/memsec" +exclude = ["appveyor.yml"] + [dependencies.getrandom] - version = "0.1" - optional = true -@@ -29,13 +30,9 @@ - alloc = ["getrandom", "use_os"] - default = ["use_os", "alloc"] + version = "0.2" +@@ -45,24 +46,12 @@ nightly = [] --use_os = ["libc", "winapi"] -+use_os = ["libc"] + use_os = [ + "libc", +- "windows-sys", + ] + [target."cfg(unix)".dependencies.libc] version = "0.2" --optional = true --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["memoryapi", "sysinfoapi"] optional = true + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.36" +-features = [ +- "Win32_System_SystemInformation", +- "Win32_System_Memory", +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +-] +-optional = true +-default-features = false +- [badges.appveyor] repository = "quininer/memsec" + diff --git a/rust-memsec.spec b/rust-memsec.spec index 03df643..638b33c 100644 --- a/rust-memsec.spec +++ b/rust-memsec.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate memsec Name: rust-%{crate} -Version: 0.6.0 +Version: 0.6.2 Release: %autorelease Summary: Rust implementation of libsodium/utils @@ -19,11 +19,8 @@ Source: %{crates_source} Patch0: memsec-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Rust implementation `libsodium/utils`.} @@ -36,13 +33,13 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,11 +47,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+alloc-devel Summary: %{summary} @@ -62,11 +59,11 @@ BuildArch: noarch %description -n %{name}+alloc-devel %{_description} -This package contains library source intended for building other packages -which use "alloc" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+getrandom-devel Summary: %{summary} @@ -74,11 +71,11 @@ BuildArch: noarch %description -n %{name}+getrandom-devel %{_description} -This package contains library source intended for building other packages -which use "getrandom" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "getrandom" feature of the "%{crate}" crate. %files -n %{name}+getrandom-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+libc-devel Summary: %{summary} @@ -86,11 +83,11 @@ BuildArch: noarch %description -n %{name}+libc-devel %{_description} -This package contains library source intended for building other packages -which use "libc" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "libc" feature of the "%{crate}" crate. %files -n %{name}+libc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+nightly-devel Summary: %{summary} @@ -98,11 +95,11 @@ BuildArch: noarch %description -n %{name}+nightly-devel %{_description} -This package contains library source intended for building other packages -which use "nightly" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "nightly" feature of the "%{crate}" crate. %files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+use_os-devel Summary: %{summary} @@ -110,11 +107,11 @@ BuildArch: noarch %description -n %{name}+use_os-devel %{_description} -This package contains library source intended for building other packages -which use "use_os" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "use_os" feature of the "%{crate}" crate. %files -n %{name}+use_os-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index a98376c..20c8851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (memsec-0.6.0.crate) = 326bd28be5fe98720f0d57a96154e7746bd9fc5b4e8bd827361f6dcbf15f83321b5f0519ddad38f0bcbf4a043a7ef3cdec24ef6539915b007a0e85b01c584bad +SHA512 (memsec-0.6.2.crate) = 07588f961d1b8cdff8accfcf03a2dcc28246c8dbd902929a6f0a4def387a39d50d4b276e523e7fd669bd22296252a379d12fb63b22f5014e8ee69811fd355112