The package rpms/keylime-agent-rust.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/keylime-agent-rust.git/commit/?id....
Change:
-%ifarch armv7hl
Thanks.
Full change:
============
commit 03bb6ff81e8cf688f61970f45f950f16c0a43c58
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Fri Jun 3 10:53:05 2022 +0900
Update to latest snapshot to bump dependencies
This fixes FTBFS with missing older tss-esapi and actix-web
crate dependencies.
This also contains:
- a fix of the %autorelease fallback
- re-enablement of debuginfo generation on armv7hl
diff --git a/.gitignore b/.gitignore
index d731336..4f86940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/rust-keylime-0.1.0~20211110gitd5a3191-vendor.tar.xz
/rust-keylime-0.1.0~20211110gitd5a3191.tar.gz
+/rust-keylime-0.1.0~20220602gitc98e381-vendor.tar.xz
+/rust-keylime-0.1.0~20220602gitc98e381.tar.gz
diff --git a/keylime-agent-rust-types.patch b/keylime-agent-rust-types.patch
deleted file mode 100644
index 0c1783b..0000000
--- a/keylime-agent-rust-types.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/common.rs b/src/common.rs
-index b44cf39..e38385e 100644
---- a/src/common.rs
-+++ b/src/common.rs
-@@ -252,7 +252,7 @@ pub(crate) fn chownroot(path: String) -> Result<String> {
- }
-
- // change directory owner to root
-- if libc::chown(path.as_bytes().as_ptr() as *const i8, 0, 0) != 0 {
-+ if libc::chown(path.as_bytes().as_ptr() as *const _, 0, 0) != 0 {
- error!("Failed to change file {} owner.", path);
- return Err(Error::Permission);
- }
-diff --git a/src/main.rs b/src/main.rs
-index 4631836..d7598d7 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -18,7 +18,7 @@
- missing_copy_implementations,
- missing_debug_implementations,
- missing_docs,
-- trivial_casts,
-+ //trivial_casts,
- trivial_numeric_casts,
- unused_allocation,
- unused_comparisons,
-diff --git a/src/tpm.rs b/src/tpm.rs
-index f6ae1bb..dbcc848 100644
---- a/src/tpm.rs
-+++ b/src/tpm.rs
-@@ -117,12 +117,12 @@ pub(crate) fn create_ek(
-
- fn unmarshal_tpms_attest(val: &[u8]) -> Result<TPMS_ATTEST> {
- let mut resp = TPMS_ATTEST::default();
-- let mut offset = 0u64;
-+ let mut offset = 0;
-
- unsafe {
- let res = Tss2_MU_TPMS_ATTEST_Unmarshal(
- val[..].as_ptr(),
-- val.len() as u64,
-+ val.len() as _,
- &mut offset,
- &mut resp,
- );
-@@ -140,7 +140,7 @@ fn unmarshal_tpms_attest(val: &[u8]) ->
Result<TPMS_ATTEST> {
- macro_rules! create_marshal_fn {
- ($func:ident, $tpmobj:ty, $marshal:ident) => {
- fn $func(t: $tpmobj) -> Vec<u8> {
-- let mut offset = 0u64;
-+ let mut offset = 0;
- let size = std::mem::size_of::<$tpmobj>();
-
- let mut tpm_vec = Vec::with_capacity(size);
-@@ -148,7 +148,7 @@ macro_rules! create_marshal_fn {
- let res = $marshal(
- &t,
- tpm_vec.as_mut_ptr(),
-- tpm_vec.capacity() as u64,
-+ tpm_vec.capacity() as _,
- &mut offset,
- );
- if res != 0 {
diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec
index 40519f3..bd4c0ac 100644
--- a/keylime-agent-rust.spec
+++ b/keylime-agent-rust.spec
@@ -10,9 +10,9 @@
# As the latest git version uses an unreleased tss-esapi crate, we
# stick to an older version. FIXME: once the new tss-esapi crate is
# available on crates.io, update the revision to the latest
-%global commit d5a31912eb9f69ea1c8fed59811089ff7c4ccebf
+%global commit c98e381363752fd38e4ac45d0e654c76f11b02c5
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20211110
+%global commitdate 20220602
%if 0%{?rhel}
# RHEL: Use bundled deps as it doesn't ship Rust libraries
@@ -22,14 +22,9 @@
%global bundled_rust_deps 0
%endif
-%ifarch armv7hl
-# drop debuginfo generation for armv7hl OOM problems
-%global rustflags_debuginfo 0
-%endif
-
Name: keylime-agent-rust
Version: %{crate_version}~%{commitdate}git%{shortcommit}
-Release: %{?autorelease}%{!?autorelease:1{?dist}}
+Release: %{?autorelease}%{!?autorelease:1%{?dist}}
Summary: Rust agent for Keylime
# Upstream license specification: Apache-2.0
@@ -60,7 +55,6 @@ Source0: %{url}/archive/%{commit}/rust-keylime-%{version}.tar.gz
# cargo vendor
# tar jcf rust-keylime-%%{version}-vendor.tar.xz vendor
Source1: rust-keylime-%{version}-vendor.tar.xz
-Patch1: keylime-agent-rust-types.patch
ExclusiveArch: %{rust_arches}
diff --git a/sources b/sources
index 4bdfea0..0a44cf5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rust-keylime-0.1.0~20211110gitd5a3191-vendor.tar.xz) =
d3f3013c9875707fb109560828ff4fb0553a7170608ef7d7fcb672de2b09ea6c1e6b937dc9a76f7cac6f63c0d339ac30bdf68bcc46d4560e98da2e8c4ef9a551
-SHA512 (rust-keylime-0.1.0~20211110gitd5a3191.tar.gz) =
32759c7ffbc4a6d482c729544384c051b87a481de6edb98381822208c29c8a7bc25e7c8786bce0e984ccf4ceab8b166db33b48e4f94e7ec827308d924acd0548
+SHA512 (rust-keylime-0.1.0~20220602gitc98e381-vendor.tar.xz) =
9860a61b03d9658fc9f7a5eb515761ac581358cd6e85b2f2fd6d41bd55f33779c8c109a8081a953f513c6da6355c3106d9c7e25d35b77742c9954982b3e7dc7b
+SHA512 (rust-keylime-0.1.0~20220602gitc98e381.tar.gz) =
9802a00e6993f5059a5b9720ce6da6516c200a9960864cf5b8e64d42d0c3ef545fc15527f9782011633062867859e020f51ac1e64a97a65ab0fdf370a9bf1bec
commit 986729ed2b013b73c81fe2e80128f6c2ef580fb9
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Fri Jun 3 10:27:28 2022 +0900
Opt into using rpmautospec
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5ca8c93
--- /dev/null
+++ b/changelog
@@ -0,0 +1,2 @@
+* Mon Jan 24 2022 Daiki Ueno <dueno(a)redhat.com> - 0.1.0~20211110gitd5a3191-1
+- Initial package
diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec
index c9b0931..40519f3 100644
--- a/keylime-agent-rust.spec
+++ b/keylime-agent-rust.spec
@@ -29,7 +29,7 @@
Name: keylime-agent-rust
Version: %{crate_version}~%{commitdate}git%{shortcommit}
-Release: 1%{?dist}
+Release: %{?autorelease}%{!?autorelease:1{?dist}}
Summary: Rust agent for Keylime
# Upstream license specification: Apache-2.0
@@ -112,5 +112,4 @@ Rust agent for Keylime
%endif
%changelog
-* Mon Jan 24 2022 Daiki Ueno <dueno(a)redhat.com> - 0.1.0~20211110gitd5a3191-1
-- Initial package
+%autochangelog