diff --git a/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch b/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch new file mode 100644 index 000000000..c07eeb3bc --- /dev/null +++ b/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch @@ -0,0 +1,40 @@ +From d9554495b54d1f150a85f4e329412ff62728d9c7 Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Thu, 15 Feb 2024 12:06:44 +0000 +Subject: [PATCH] Revert "chore: use git fork for aws-nitro-enclaves-cose" + +This reverts commit 1ea09e88baee3c47cdc76902f0034d553207d515. +--- + data-formats/Cargo.toml | 2 +- + http-wrapper/Cargo.toml | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +Sdiff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml +index 714fc55..6d00eb4 100644 +--- a/data-formats/Cargo.toml ++++ b/data-formats/Cargo.toml +@@ -17,7 +17,7 @@ serde_cbor = "0.11" + serde_repr = "0.1.6" + serde_tuple = "0.5" + thiserror = "1" +-aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" } ++aws-nitro-enclaves-cose = "0.4.0" + uuid = "1.3" + num-traits = "0.2" + num-derive = "0.3" +diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml +index 5d4999c..7b98097 100644 +--- a/http-wrapper/Cargo.toml ++++ b/http-wrapper/Cargo.toml +@@ -20,7 +20,7 @@ openssl = "0.10.60" + + fdo-data-formats = { path = "../data-formats", version = "0.4.13" } + fdo-store = { path = "../store", version = "0.4.13" } +-aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" } ++aws-nitro-enclaves-cose = "0.4.0" + + # Server-side + uuid = { version = "1.3", features = ["v4"], optional = true } +-- +2.43.1 + diff --git a/Cargo.lock b/Cargo.lock index 988f5dab2..13767ad0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ dependencies = [ [[package]] name = "fdo-admin-tool" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "clap 4.3.0", @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "fdo-client-linuxapp" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "devicemapper", @@ -872,7 +872,7 @@ dependencies = [ [[package]] name = "fdo-data" -version = "0.4.13" +version = "0.5.0" dependencies = [ "assert-str", "cbindgen", @@ -884,7 +884,7 @@ dependencies = [ [[package]] name = "fdo-data-formats" -version = "0.4.13" +version = "0.5.0" dependencies = [ "aws-nitro-enclaves-cose", "byteorder", @@ -911,7 +911,7 @@ dependencies = [ [[package]] name = "fdo-db" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "diesel", @@ -922,7 +922,7 @@ dependencies = [ [[package]] name = "fdo-http-wrapper" -version = "0.4.13" +version = "0.5.0" dependencies = [ "async-trait", "aws-nitro-enclaves-cose", @@ -945,7 +945,7 @@ dependencies = [ [[package]] name = "fdo-manufacturing-client" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "clap 4.3.0", @@ -963,7 +963,7 @@ dependencies = [ [[package]] name = "fdo-manufacturing-server" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "config", @@ -983,7 +983,7 @@ dependencies = [ [[package]] name = "fdo-owner-onboarding-server" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "config", @@ -1006,7 +1006,7 @@ dependencies = [ [[package]] name = "fdo-owner-tool" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "clap 4.3.0", @@ -1025,7 +1025,7 @@ dependencies = [ [[package]] name = "fdo-rendezvous-server" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "config", @@ -1044,7 +1044,7 @@ dependencies = [ [[package]] name = "fdo-serviceinfo-api-server" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "config", @@ -1063,7 +1063,7 @@ dependencies = [ [[package]] name = "fdo-store" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "async-trait", @@ -1080,7 +1080,7 @@ dependencies = [ [[package]] name = "fdo-util" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "config", @@ -1549,7 +1549,7 @@ dependencies = [ [[package]] name = "integration-tests" -version = "0.4.13" +version = "0.5.0" dependencies = [ "anyhow", "fdo-data-formats", diff --git a/admin-tool/Cargo.toml b/admin-tool/Cargo.toml index 0aaf8f790..cfe370bc9 100644 --- a/admin-tool/Cargo.toml +++ b/admin-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-admin-tool" -version = "0.4.13" +version = "0.5.0" authors = ["Antonio Murdaca "] edition = "2018" @@ -21,10 +21,10 @@ pretty_env_logger = "0.5" nix = "0.26" tokio = { version = "1", features = ["full"] } -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] } -fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } +fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.0" } [dev-dependencies] rand = "0.8" diff --git a/client-linuxapp/Cargo.toml b/client-linuxapp/Cargo.toml index 88869bad8..1dd755700 100644 --- a/client-linuxapp/Cargo.toml +++ b/client-linuxapp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-client-linuxapp" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -21,6 +21,6 @@ secrecy = "0.8" devicemapper = "0.34" openssl = "0.10.60" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml index 9cc2638d6..f11e0c918 100644 --- a/data-formats/Cargo.toml +++ b/data-formats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-data-formats" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" diff --git a/db/Cargo.toml b/db/Cargo.toml index cfc3319ab..6fc33e716 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-db" -version = "0.4.13" +version = "0.5.0" edition = "2021" @@ -8,10 +8,10 @@ edition = "2021" anyhow = "1.0" diesel = { version = "2.1.0", features = ["sqlite", "postgres", "r2d2"] } -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } [dev-dependencies] -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } openssl = "0.10.55" [features] diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 0d6d25c90..cc5e139d3 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -3,7 +3,7 @@ %global combined_license Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache 2.0) AND ISC AND MIT AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (Apache-2.0 OR MIT OR Zlib) AND MPL-2.0 AND (Unlicense OR MIT) Name: fido-device-onboard -Version: 0.4.13 +Version: 0.5.0 Release: 1%{?dist} Summary: A rust implementation of the FIDO Device Onboard Specification License: BSD-3-Clause @@ -12,6 +12,7 @@ URL: https://github.com/fdo-rs/fido-device-onboard-rs Source0: %{url}/archive/v%{version}/%{name}-rs-%{version}.tar.gz # See make-vendored-tarfile.sh in upstream repo Source1: %{name}-rs-%{version}-vendor-patched.tar.xz +Patch1: 0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch # Because nobody cares ExcludeArch: %{ix86} @@ -24,6 +25,7 @@ BuildRequires: rust-packaging BuildRequires: clang-devel BuildRequires: cryptsetup-devel BuildRequires: device-mapper-devel +BuildRequires: libpq-devel BuildRequires: golang BuildRequires: openssl-devel >= 3.0.1-12 BuildRequires: systemd-rpm-macros @@ -33,11 +35,17 @@ BuildRequires: tpm2-tss-devel %{summary}. %prep -%autosetup -p1 -n %{name}-rs-%{version} +%setup -q -n %{name}-rs-%{version} %if 0%{?rhel} +tar xf %{SOURCE1} +%if 0%{?rhel} >= 10 +%cargo_prep -v vendor +%else %cargo_prep -V 1 +%endif %else +%patch -P1 -p1 %cargo_prep %generate_buildrequires %cargo_generate_buildrequires -a @@ -49,6 +57,9 @@ BuildRequires: tpm2-tss-devel %{?cargo_license_summary} %{?cargo_license} > LICENSE.dependencies +%if 0%{?rhel} >= 10 +%cargo_vendor_manifest +%endif %install install -D -m 0755 -t %{buildroot}%{_libexecdir}/fdo target/release/fdo-client-linuxapp @@ -103,6 +114,9 @@ Requires: dracut %files -n fdo-init %license LICENSE LICENSE.dependencies +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %{dracutlibdir}/modules.d/52fdo/ %{_libexecdir}/fdo/fdo-manufacturing-client @@ -115,6 +129,9 @@ Requires: openssl-libs >= 3.0.1-12 %files -n fdo-owner-onboarding-server %license LICENSE LICENSE.dependencies +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %dir %{_sysconfdir}/fdo %dir %{_sysconfdir}/fdo/keys %dir %{_sysconfdir}/fdo/owner-onboarding-server.conf.d @@ -155,6 +172,9 @@ License: %combined_license %files -n fdo-rendezvous-server %license LICENSE LICENSE.dependencies +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %dir %{_sysconfdir}/fdo %dir %{_sysconfdir}/fdo/keys %dir %{_sysconfdir}/fdo/rendezvous-server.conf.d @@ -187,6 +207,9 @@ Requires: openssl-libs >= 3.0.1-12 %files -n fdo-manufacturing-server %license LICENSE LICENSE.dependencies +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %dir %{_sysconfdir}/fdo %dir %{_sysconfdir}/fdo/keys %dir %{_sysconfdir}/fdo/manufacturing-server.conf.d @@ -224,6 +247,9 @@ Requires: cryptsetup %{summary} %files -n fdo-client +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %license LICENSE LICENSE.dependencies %{_libexecdir}/fdo/fdo-client-linuxapp %{_unitdir}/fdo-client-linuxapp.service @@ -244,6 +270,9 @@ License: %combined_license %{summary} %files -n fdo-owner-cli +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %license LICENSE LICENSE.dependencies %{_bindir}/fdo-owner-tool %{_libexecdir}/fdo/fdo-owner-tool @@ -261,6 +290,9 @@ Requires: fdo-init = %{version}-%{release} %{summary} %files -n fdo-admin-cli +%if 0%{?rhel} >= 10 +%license cargo-vendor.txt +%endif %license LICENSE LICENSE.dependencies %dir %{_sysconfdir}/fdo %dir %{_sysconfdir}/fdo/keys @@ -278,6 +310,9 @@ Requires: fdo-init = %{version}-%{release} %systemd_postun_with_restart fdo-aio.service %changelog +* Tue Feb 20 2024 Peter Robinson - 0.5.0-1 +- Update to 0.5.0 + * Thu Jan 25 2024 Peter Robinson - 0.4.13-1 - Update to 0.4.13 diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml index 1b3355dac..69af2ec66 100644 --- a/http-wrapper/Cargo.toml +++ b/http-wrapper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-http-wrapper" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -18,8 +18,8 @@ hex = "0.4" openssl = "0.10.60" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-store = { path = "../store", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-store = { path = "../store", version = "0.5.0" } aws-nitro-enclaves-cose = { git = "https://github.com/nullr0ute/aws-nitro-enclaves-cose/", rev = "e3938e60d9051690569d1e4fcbe1c0c99d2fafa8" } # Server-side diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index cb02138fc..b23c5ffaa 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration-tests" -version = "0.4.13" +version = "0.5.0" edition = "2018" publish = false diff --git a/libfdo-data/Cargo.toml b/libfdo-data/Cargo.toml index 8e0e09f3b..4e8c5f37b 100644 --- a/libfdo-data/Cargo.toml +++ b/libfdo-data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-data" -version = "0.4.13" +version = "0.5.0" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,7 +9,7 @@ edition = "2018" crate-type = ["cdylib"] [dependencies] -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } libc = "0.2" [build-dependencies] diff --git a/libfdo-data/fdo_data.h b/libfdo-data/fdo_data.h index 4a4c9b333..299e24299 100644 --- a/libfdo-data/fdo_data.h +++ b/libfdo-data/fdo_data.h @@ -11,8 +11,8 @@ #include #define FDO_DATA_MAJOR 0 -#define FDO_DATA_MINOR 4 -#define FDO_DATA_PATCH 13 +#define FDO_DATA_MINOR 5 +#define FDO_DATA_PATCH 0 typedef struct FdoOwnershipVoucher FdoOwnershipVoucher; diff --git a/manufacturing-client/Cargo.toml b/manufacturing-client/Cargo.toml index 1e57eb352..895e74853 100644 --- a/manufacturing-client/Cargo.toml +++ b/manufacturing-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-client" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,6 +17,6 @@ rand = "0.8.4" tss-esapi = { version = "7.4", features = ["generate-bindings"] } regex = "1.3.7" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/manufacturing-client/src/main.rs b/manufacturing-client/src/main.rs index f9277754d..94de99aa9 100644 --- a/manufacturing-client/src/main.rs +++ b/manufacturing-client/src/main.rs @@ -710,7 +710,7 @@ impl KeyReference { allowed_storage_types: Option<&[KeyStorageType]>, ) -> Result { let allowed_storage_types = match allowed_storage_types { - Some(storage_types) if storage_types.is_empty() => { + Some([]) => { bail!("No key storage types allowed") } Some(storage_types) => storage_types, diff --git a/manufacturing-server/Cargo.toml b/manufacturing-server/Cargo.toml index 32faee453..af069d318 100644 --- a/manufacturing-server/Cargo.toml +++ b/manufacturing-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-manufacturing-server" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -18,7 +18,7 @@ log = "0.4" hex = "0.4" serde_yaml = "0.9" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] } -fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } +fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/owner-onboarding-server/Cargo.toml b/owner-onboarding-server/Cargo.toml index 62f681dda..e334f1f10 100644 --- a/owner-onboarding-server/Cargo.toml +++ b/owner-onboarding-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-owner-onboarding-server" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -21,7 +21,7 @@ serde_yaml = "0.9" time = "0.3" hex = "0.4" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] } -fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } +fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/owner-tool/Cargo.toml b/owner-tool/Cargo.toml index 9654b062c..060dd34da 100644 --- a/owner-tool/Cargo.toml +++ b/owner-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-owner-tool" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -16,9 +16,9 @@ serde_yaml = "0.9" tokio = { version = "1", features = ["full"] } tss-esapi = { version = "7.4", features = ["generate-bindings"] } -fdo-util = { path = "../util", version = "0.4.13" } -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["client"] } -fdo-db = { path = "../db", version = "0.4.13"} +fdo-util = { path = "../util", version = "0.5.0" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["client"] } +fdo-db = { path = "../db", version = "0.5.0"} hex = "0.4" diff --git a/rendezvous-server/Cargo.toml b/rendezvous-server/Cargo.toml index 718deed5b..cd3ba92b9 100644 --- a/rendezvous-server/Cargo.toml +++ b/rendezvous-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-rendezvous-server" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -17,7 +17,7 @@ warp = "0.3.6" log = "0.4" time = "0.3" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] } -fdo-store = { path = "../store", version = "0.4.13" } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } +fdo-store = { path = "../store", version = "0.5.0" } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/serviceinfo-api-server/Cargo.toml b/serviceinfo-api-server/Cargo.toml index f047ddd37..91472e941 100644 --- a/serviceinfo-api-server/Cargo.toml +++ b/serviceinfo-api-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-serviceinfo-api-server" -version = "0.4.13" +version = "0.5.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +16,7 @@ serde = "1" serde_bytes = "0.11" serde_json = "1" -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server"] } -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-store = { path = "../store", version = "0.4.13", features = ["directory"] } -fdo-util = { path = "../util", version = "0.4.13" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server"] } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-store = { path = "../store", version = "0.5.0", features = ["directory"] } +fdo-util = { path = "../util", version = "0.5.0" } diff --git a/store/Cargo.toml b/store/Cargo.toml index 1d0fce1de..235331b64 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-store" -version = "0.4.13" +version = "0.5.0" authors = ["Patrick Uiterwijk "] edition = "2018" @@ -9,7 +9,7 @@ edition = "2018" [dependencies] anyhow = { version = "1", optional = true} -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } thiserror = "1" async-trait = "0.1" @@ -23,7 +23,7 @@ xattr = { version = "1.0", default-features = false, optional = true } # We *ne serde_cbor = { version = "0.11", optional = true } # database -fdo-db = { path = "../db", version = "0.4.13"} +fdo-db = { path = "../db", version = "0.5.0"} diesel = { version = "2.1.0", features = ["sqlite", "postgres", "r2d2"], optional = true } diff --git a/util/Cargo.toml b/util/Cargo.toml index e91c7cc35..0356f06ff 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fdo-util" -version = "0.4.13" +version = "0.5.0" authors = ["Antonio Murdaca "] edition = "2018" @@ -13,9 +13,9 @@ glob = "0.3.1" log = "0.4" serde = "1" -fdo-data-formats = { path = "../data-formats", version = "0.4.13" } -fdo-store = { path = "../store", version = "0.4.13" } -fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.13", features = ["server", "client"] } +fdo-data-formats = { path = "../data-formats", version = "0.5.0" } +fdo-store = { path = "../store", version = "0.5.0" } +fdo-http-wrapper = { path = "../http-wrapper", version = "0.5.0", features = ["server", "client"] } serde_yaml = "0.9" serde_cbor = "0.11" serde_json = "1"