diff --git a/_servicedata b/_servicedata index 80fdf37..bfff4d6 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/keylime/rust-keylime.git - a009476300e6eebd49a00b04890318f3b2d24858 \ No newline at end of file + 890e8c9e226ffb9fe3b34571ed11901661437fc0 \ No newline at end of file diff --git a/generate-cargo-lock-file.patch b/generate-cargo-lock-file.patch index 7e8cf27..8fef28c 100644 --- a/generate-cargo-lock-file.patch +++ b/generate-cargo-lock-file.patch @@ -1,4 +1,4 @@ -From 1cd439303750de102ff77324aef0248dece2201f Mon Sep 17 00:00:00 2001 +From 9184e46fd900de8ececd86302fb4f8a4f8becc86 Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Wed, 28 Jul 2021 10:46:01 +0200 Subject: [PATCH] Generate Cargo.lock file @@ -16,8 +16,8 @@ Cargo.lock file using the Rust 1.53.0 release. Signed-off-by: Alberto Planas --- .gitignore | 1 - - Cargo.lock | 2968 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2968 insertions(+), 1 deletion(-) + Cargo.lock | 2958 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 2958 insertions(+), 1 deletion(-) create mode 100644 Cargo.lock diff --git a/.gitignore b/.gitignore @@ -31,10 +31,10 @@ index 9e703d4..0054d58 100644 -/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..629c457 +index 0000000..422d782 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2968 @@ +@@ -0,0 +1,2958 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 @@ -76,9 +76,9 @@ index 0000000..629c457 + +[[package]] +name = "actix-http" -+version = "2.2.0" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" ++checksum = "5cb8958da437716f3f31b0e76f8daf36554128517d7df37ceba7df00f09622ee" +dependencies = [ + "actix-codec", + "actix-connect", @@ -326,9 +326,9 @@ index 0000000..629c457 + +[[package]] +name = "anyhow" -+version = "1.0.42" ++version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" ++checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" + +[[package]] +name = "arrayvec" @@ -349,9 +349,9 @@ index 0000000..629c457 + +[[package]] +name = "async-trait" -+version = "0.1.50" ++version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" ++checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +dependencies = [ + "proc-macro2", + "quote", @@ -425,9 +425,9 @@ index 0000000..629c457 + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" @@ -654,12 +654,6 @@ index 0000000..629c457 +] + +[[package]] -+name = "data-encoding" -+version = "2.3.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" -+ -+[[package]] +name = "deadpool" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -670,7 +664,7 @@ index 0000000..629c457 + "crossbeam-queue", + "num_cpus", + "serde", -+ "tokio 1.9.0", ++ "tokio 1.10.0", +] + +[[package]] @@ -1037,7 +1031,7 @@ index 0000000..629c457 + "http", + "indexmap", + "slab", -+ "tokio 1.9.0", ++ "tokio 1.10.0", + "tokio-util 0.6.7", + "tracing", +] @@ -1112,9 +1106,9 @@ index 0000000..629c457 + +[[package]] +name = "http-body" -+version = "0.4.2" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" ++checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +dependencies = [ + "bytes 1.0.1", + "http", @@ -1123,9 +1117,9 @@ index 0000000..629c457 + +[[package]] +name = "http-types" -+version = "2.11.1" ++version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad077d89137cd3debdce53c66714dc536525ef43fe075d41ddc0a8ac11f85957" ++checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", @@ -1205,13 +1199,13 @@ index 0000000..629c457 + "futures-util", + "h2 0.3.3", + "http", -+ "http-body 0.4.2", ++ "http-body 0.4.3", + "httparse", + "httpdate 1.0.1", + "itoa", + "pin-project-lite 0.2.7", -+ "socket2 0.4.0", -+ "tokio 1.9.0", ++ "socket2 0.4.1", ++ "tokio 1.10.0", + "tower-service", + "tracing", + "want", @@ -1301,9 +1295,9 @@ index 0000000..629c457 + +[[package]] +name = "js-sys" -+version = "0.3.51" ++version = "0.3.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" ++checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" +dependencies = [ + "wasm-bindgen", +] @@ -1382,9 +1376,9 @@ index 0000000..629c457 + +[[package]] +name = "libc" -+version = "0.2.98" ++version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" ++checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" + +[[package]] +name = "linked-hash-map" @@ -1427,9 +1421,9 @@ index 0000000..629c457 + +[[package]] +name = "matches" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "mbox" @@ -1563,9 +1557,9 @@ index 0000000..629c457 + +[[package]] +name = "native-tls" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" ++checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", @@ -1942,9 +1936,9 @@ index 0000000..629c457 + +[[package]] +name = "redox_syscall" -+version = "0.2.9" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] @@ -2131,18 +2125,18 @@ index 0000000..629c457 + +[[package]] +name = "serde" -+version = "1.0.126" ++version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.126" ++version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +dependencies = [ + "proc-macro2", + "quote", @@ -2151,9 +2145,9 @@ index 0000000..629c457 + +[[package]] +name = "serde_json" -+version = "1.0.64" ++version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +dependencies = [ + "itoa", + "ryu", @@ -2162,11 +2156,10 @@ index 0000000..629c457 + +[[package]] +name = "serde_qs" -+version = "0.7.2" ++version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5af82de3c6549b001bec34961ff2d6a54339a87bab37ce901b693401f27de6cb" ++checksum = "d8a72808528a89fa9eca23bbb6a1eb92cb639b881357269b6510f11e50c0f8a9" +dependencies = [ -+ "data-encoding", + "percent-encoding", + "serde", + "thiserror", @@ -2214,9 +2207,9 @@ index 0000000..629c457 + +[[package]] +name = "slab" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" ++checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" + +[[package]] +name = "smallvec" @@ -2237,9 +2230,9 @@ index 0000000..629c457 + +[[package]] +name = "socket2" -+version = "0.4.0" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" ++checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +dependencies = [ + "libc", + "winapi 0.3.9", @@ -2485,9 +2478,9 @@ index 0000000..629c457 + +[[package]] +name = "tokio" -+version = "1.9.0" ++version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" ++checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" +dependencies = [ + "autocfg", + "bytes 1.0.1", @@ -2555,7 +2548,7 @@ index 0000000..629c457 + "futures-sink", + "log", + "pin-project-lite 0.2.7", -+ "tokio 1.9.0", ++ "tokio 1.10.0", +] + +[[package]] @@ -2696,12 +2689,9 @@ index 0000000..629c457 + +[[package]] +name = "unicode-bidi" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -+dependencies = [ -+ "matches", -+] ++checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" + +[[package]] +name = "unicode-normalization" @@ -2788,9 +2778,9 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.74" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" ++checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" +dependencies = [ + "cfg-if 1.0.0", + "serde", @@ -2800,9 +2790,9 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.74" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" ++checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" +dependencies = [ + "bumpalo", + "lazy_static", @@ -2815,9 +2805,9 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.24" ++version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" ++checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", @@ -2827,9 +2817,9 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.74" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" ++checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -2837,9 +2827,9 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.74" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" ++checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" +dependencies = [ + "proc-macro2", + "quote", @@ -2850,15 +2840,15 @@ index 0000000..629c457 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.74" ++version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" ++checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" + +[[package]] +name = "web-sys" -+version = "0.3.51" ++version = "0.3.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" ++checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2948,7 +2938,7 @@ index 0000000..629c457 + "regex", + "serde", + "serde_json", -+ "tokio 1.9.0", ++ "tokio 1.10.0", +] + +[[package]] diff --git a/rust-keylime-0.1.0+git.1626706730.a009476.tar.xz b/rust-keylime-0.1.0+git.1626706730.a009476.tar.xz deleted file mode 100644 index 244bfe7..0000000 --- a/rust-keylime-0.1.0+git.1626706730.a009476.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a91310d4a9f1eb2fa427095b87d0237584386a0aa5b3e91fd8067ef1593622a -size 39692 diff --git a/rust-keylime-0.1.0+git.1629114992.890e8c9.tar.xz b/rust-keylime-0.1.0+git.1629114992.890e8c9.tar.xz new file mode 100644 index 0000000..92b7a7a --- /dev/null +++ b/rust-keylime-0.1.0+git.1629114992.890e8c9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:924fff46b0ae17ec2d8b164d1d2b878524dc50fd1fc0f49153b86dc14c7b9dec +size 39740 diff --git a/rust-keylime.changes b/rust-keylime.changes index cd33316..d49e9a4 100644 --- a/rust-keylime.changes +++ b/rust-keylime.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 16 14:23:13 UTC 2021 - aplanas@suse.com + +- Update to version 0.1.0+git.1629114992.890e8c9: + * Add "v1.0" prefix to agent APIs +- Update generate-cargo-lock-file.patch + ------------------------------------------------------------------- Wed Jul 28 08:56:33 UTC 2021 - Alberto Planas Dominguez diff --git a/rust-keylime.spec b/rust-keylime.spec index d153821..3fc6456 100644 --- a/rust-keylime.spec +++ b/rust-keylime.spec @@ -18,7 +18,7 @@ %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' Name: rust-keylime -Version: 0.1.0+git.1626706730.a009476 +Version: 0.1.0+git.1629114992.890e8c9 Release: 0 Summary: Rust implementation of the keylime agent License: Apache-2.0 AND MIT diff --git a/vendor.tar.xz b/vendor.tar.xz index ba86fe0..1423e1f 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a91a7293c73eaafcf7d1e8ffa6bcdb0e475a5ceb791544cbaeca2685b5b45a3 -size 15756232 +oid sha256:b23bdccc1fadfd5e6f066c9abb4b2938f087d5431d56a13026773dfe9aff89cc +size 15782704