Skip to content

Commit

Permalink
Merge pull request #537 from nullr0ute/prepare-0.4.12
Browse files Browse the repository at this point in the history
Prepare 0.4.12
  • Loading branch information
mergify[bot] authored Jul 27, 2023
2 parents c630de4 + 84e3e6d commit 9768cb3
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 72 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions admin-tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-admin-tool"
version = "0.4.11"
version = "0.4.12"
authors = ["Antonio Murdaca <[email protected]>"]
edition = "2018"

Expand All @@ -21,10 +21,10 @@ pretty_env_logger = "0.4"
nix = "0.26"
tokio = { version = "1", features = ["full"] }

fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.11", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server", "client"] }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }

[dev-dependencies]
rand = "0.8"
8 changes: 4 additions & 4 deletions client-linuxapp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-client-linuxapp"
version = "0.4.11"
version = "0.4.12"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -22,6 +22,6 @@ secrecy = "0.8"
devicemapper = "0.33"
openssl = "0.10.55"

fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.12" }
2 changes: 1 addition & 1 deletion data-formats/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-data-formats"
version = "0.4.11"
version = "0.4.12"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand Down
49 changes: 45 additions & 4 deletions fido-device-onboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
Version: 0.4.12
Release: 1%{?dist}
Summary: A rust implementation of the FIDO Device Onboard Specification
License: BSD-3-Clause
Expand Down Expand Up @@ -64,7 +64,21 @@ install -D -m 0644 -t %{buildroot}%{_docdir}/fdo examples/config/*
# duplicates as needed by AIO command so link them
ln -s %{_bindir}/fdo-owner-tool %{buildroot}%{_libexecdir}/fdo/fdo-owner-tool
ln -s %{_bindir}/fdo-admin-tool %{buildroot}%{_libexecdir}/fdo/fdo-admin-tool
# Create directories needed by the various services so we own them
mkdir -p %{buildroot}%{_sysconfdir}/fdo
mkdir -p %{buildroot}%{_sysconfdir}/fdo/keys
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturer_keys
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/manufacturing_sessions
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_onboarding_sessions
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/owner_vouchers
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_registered
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/rendezvous_sessions
mkdir -p %{buildroot}%{_sysconfdir}/fdo/stores/serviceinfo_api_devices
mkdir -p %{buildroot}%{_sysconfdir}/fdo/manufacturing-server.conf.d
mkdir -p %{buildroot}%{_sysconfdir}/fdo/owner-onboarding-server.conf.d
mkdir -p %{buildroot}%{_sysconfdir}/fdo/rendezvous-server.conf.d
mkdir -p %{buildroot}%{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
# Dracut manufacturing service
install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/module-setup.sh
install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/52fdo dracut/52fdo/manufacturing-client-generator
Expand Down Expand Up @@ -93,6 +107,14 @@ Requires: openssl-libs >= 3.0.1-12

%files -n fdo-owner-onboarding-server
%license LICENSE LICENSE.dependencies
%dir %{_sysconfdir}/fdo
%dir %{_sysconfdir}/fdo/keys
%dir %{_sysconfdir}/fdo/owner-onboarding-server.conf.d
%dir %{_sysconfdir}/fdo/serviceinfo-api-server.conf.d
%dir %{_sysconfdir}/fdo/stores
%dir %{_sysconfdir}/fdo/stores/owner_onboarding_sessions
%dir %{_sysconfdir}/fdo/stores/owner_vouchers
%dir %{_sysconfdir}/fdo/stores/serviceinfo_api_devices
%{_libexecdir}/fdo/fdo-owner-onboarding-server
%{_libexecdir}/fdo/fdo-serviceinfo-api-server
%dir %{_docdir}/fdo
Expand Down Expand Up @@ -122,6 +144,12 @@ License: %combined_license

%files -n fdo-rendezvous-server
%license LICENSE LICENSE.dependencies
%dir %{_sysconfdir}/fdo
%dir %{_sysconfdir}/fdo/keys
%dir %{_sysconfdir}/fdo/rendezvous-server.conf.d
%dir %{_sysconfdir}/fdo/stores
%dir %{_sysconfdir}/fdo/stores/rendezvous_registered
%dir %{_sysconfdir}/fdo/stores/rendezvous_sessions
%{_libexecdir}/fdo/fdo-rendezvous-server
%dir %{_docdir}/fdo
%{_docdir}/fdo/rendezvous-*.yml
Expand All @@ -145,6 +173,14 @@ Requires: openssl-libs >= 3.0.1-12

%files -n fdo-manufacturing-server
%license LICENSE LICENSE.dependencies
%dir %{_sysconfdir}/fdo
%dir %{_sysconfdir}/fdo/keys
%dir %{_sysconfdir}/fdo/manufacturing-server.conf.d
%dir %{_sysconfdir}/fdo/keys
%dir %{_sysconfdir}/fdo/stores
%dir %{_sysconfdir}/fdo/stores/manufacturer_keys
%dir %{_sysconfdir}/fdo/stores/manufacturing_sessions
%dir %{_sysconfdir}/fdo/stores/owner_vouchers
%{_libexecdir}/fdo/fdo-manufacturing-server
%dir %{_docdir}/fdo
%{_docdir}/fdo/manufacturing-server.yml
Expand Down Expand Up @@ -199,8 +235,6 @@ License: %combined_license
Summary: FDO admin tools implementation
License: %combined_license
Requires: fdo-manufacturing-server = %{version}-%{release}
Requires: fdo-init = %{version}-%{release}
Requires: fdo-client = %{version}-%{release}
Requires: fdo-rendezvous-server = %{version}-%{release}
Requires: fdo-owner-onboarding-server = %{version}-%{release}
Requires: fdo-owner-cli = %{version}-%{release}
Expand All @@ -209,10 +243,11 @@ Requires: fdo-owner-cli = %{version}-%{release}

%files -n fdo-admin-cli
%license LICENSE LICENSE.dependencies
%dir %{_sysconfdir}/fdo
%dir %{_sysconfdir}/fdo/keys
%{_bindir}/fdo-admin-tool
%{_libexecdir}/fdo/fdo-admin-tool
%{_unitdir}/fdo-aio.service
%dir %{_sysconfdir}/fdo

%post -n fdo-admin-cli
%systemd_post fdo-aio.service
Expand All @@ -224,9 +259,15 @@ Requires: fdo-owner-cli = %{version}-%{release}
%systemd_postun_with_restart fdo-aio.service

%changelog
* Wed Jul 26 2023 Peter Robinson <[email protected]> - 0.4.12-1
- Update to 0.4.12

* Mon Jul 03 2023 Peter Robinson <[email protected]> - 0.4.11-1
- Update to 0.4.11

* Mon Jul 03 2023 Peter Robinson <[email protected]> - 0.4.10-2
- Updates for eln/c9s building

* Fri Jun 23 2023 Peter Robinson <[email protected]> - 0.4.10-1
- Update to 0.4.10

Expand Down
6 changes: 3 additions & 3 deletions http-wrapper/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-http-wrapper"
version = "0.4.11"
version = "0.4.12"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -18,8 +18,8 @@ hex = "0.4"

openssl = "0.10.55"

fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-store = { path = "../store", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-store = { path = "../store", version = "0.4.12" }
aws-nitro-enclaves-cose = "0.4.0"

# Server-side
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "integration-tests"
version = "0.4.11"
version = "0.4.12"
edition = "2018"
publish = false

Expand Down
4 changes: 2 additions & 2 deletions libfdo-data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-data"
version = "0.4.11"
version = "0.4.12"
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -9,7 +9,7 @@ edition = "2018"
crate-type = ["cdylib"]

[dependencies]
fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
libc = "0.2"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion libfdo-data/fdo_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#define FDO_DATA_MAJOR 0
#define FDO_DATA_MINOR 4
#define FDO_DATA_PATCH 11
#define FDO_DATA_PATCH 12

typedef struct FdoOwnershipVoucher FdoOwnershipVoucher;

Expand Down
4 changes: 2 additions & 2 deletions make-vendored-tarfile.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#/bin/bash
set -x
vendor_tarball=$1
ver=$1
cargo vendor
# Various vendor cleanups
pushd vendor
Expand All @@ -11,4 +11,4 @@ rm -rf winapi-x86_64-pc-windows-gnu/lib/*
rm -rf winapi-i686-pc-windows-gnu/lib/*
rm -rf vcpkg/test-data
popd #vendor
tar cjf $vendor_tarball vendor/
tar cjf fido-device-onboard-rs-$ver-vendor-patched.tar.xz vendor/
8 changes: 4 additions & 4 deletions manufacturing-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-manufacturing-client"
version = "0.4.11"
version = "0.4.12"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -17,6 +17,6 @@ rand = "0.8.4"
tss-esapi = { version = "7.2", features = ["generate-bindings"] }
regex = "1.3.7"

fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["client"] }
fdo-util = { path = "../util", version = "0.4.12" }
10 changes: 5 additions & 5 deletions manufacturing-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fdo-manufacturing-server"
version = "0.4.11"
version = "0.4.12"
authors = ["Patrick Uiterwijk <[email protected]>"]
edition = "2018"

Expand All @@ -18,7 +18,7 @@ log = "0.4"
hex = "0.4"
serde_yaml = "0.9"

fdo-data-formats = { path = "../data-formats", version = "0.4.11" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.11", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.11", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.11" }
fdo-data-formats = { path = "../data-formats", version = "0.4.12" }
fdo-http-wrapper = { path = "../http-wrapper", version = "0.4.12", features = ["server"] }
fdo-store = { path = "../store", version = "0.4.12", features = ["directory"] }
fdo-util = { path = "../util", version = "0.4.12" }
Loading

0 comments on commit 9768cb3

Please sign in to comment.