diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..3232c69 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,107 @@ +--- +# https://packit.dev/docs/configuration/ + +specfile_path: fido-device-onboard.spec + +files_to_sync: + - src: + - ".packit.yaml" + - "fido-device-onboard.spec" + - "fido-device-onboard-rs-*-vendor-patched.tar.xz" + - "patches/0001-Revert-chore-use-git-fork-for-aws-nitro-enclaves-cos.patch" + dest: . + +upstream_package_name: fido-device-onboard +downstream_package_name: fido-device-onboard + +upstream_tag_template: v{version} +copy_upstream_release_description: true + +srpm_build_deps: + - cargo + - openssl-devel + +packages: + fido-device-onboard-fedora: + downstream_package_name: fido-device-onboard + upstream_package_name: fido-device-onboard + fido-device-onboard-centos: + downstream_package_name: fido-device-onboard + upstream_package_name: fido-device-onboard + pkg_tool: centpkg + +actions: + pre-sync: + - bash -c "make vendor VERSION=${PACKIT_PROJECT_VERSION}" + - bash -c "git restore Cargo.lock" + create-archive: + - bash -c "make packit-create-archive VERSION=${PACKIT_PROJECT_VERSION}" + +jobs: + + # Fedora jobs + + - &fdo_copr_build_fedora + job: copr_build + packages: [fido-device-onboard-fedora] + trigger: pull_request + targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"] + + - <<: *fdo_copr_build_fedora + trigger: commit + branch: main + owner: "@fedora-iot" + project: fedora-iot + + - job: tests + trigger: pull_request + identifier: onboarding-fedora + fmf_path: test/fmf + tmt_plan: plans/onboarding + packages: [fido-device-onboard-fedora] + targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"] + + - job: sync_from_downstream + trigger: commit + + - job: propose_downstream + trigger: release + packages: [fido-device-onboard-fedora] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] + + - job: koji_build + trigger: commit + allowed_pr_authors: [all_committers] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] + + - job: bodhi_update + trigger: commit + allowed_builders: [all_committers] + dist_git_branches: ["fedora-development", "fedora-latest-stable"] + + # CentOS jobs + + - &fdo_copr_build_centos + job: copr_build + packages: [fido-device-onboard-centos] + trigger: pull_request + targets: ["centos-stream-9", "centos-stream-10"] + + - <<: *fdo_copr_build_centos + trigger: commit + branch: main + owner: "@fedora-iot" + project: fedora-iot + + - job: tests + trigger: pull_request + identifier: onboarding-centos + fmf_path: test/fmf + tmt_plan: plans/onboarding + packages: [fido-device-onboard-centos] + targets: ["centos-stream-9", "centos-stream-10"] + + - job: propose_downstream + trigger: release + packages: [fido-device-onboard-centos] + dist_git_branches: ["c10s", "c9s"] 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 index 5b2ea36..ae4ccf6 100644 --- 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 @@ -1,40 +1,26 @@ -From f1b53d4bdac4ab889eb084111f395d418945ed07 Mon Sep 17 00:00:00 2001 -From: Antonio Murdaca -Date: Mon, 25 Nov 2024 12:30:52 +0100 -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 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - diff --git a/data-formats/Cargo.toml b/data-formats/Cargo.toml -index 83979e1..c8ae80f 100644 +index 9dafc344..4a398aa6 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_repr = "0.1.19" 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" + num-derive = "0.4" diff --git a/http-wrapper/Cargo.toml b/http-wrapper/Cargo.toml -index 0decb0c..70fcf41 100644 +index ee02419b..1af8f35f 100644 --- a/http-wrapper/Cargo.toml +++ b/http-wrapper/Cargo.toml @@ -20,7 +20,7 @@ openssl = "0.10.66" - - fdo-data-formats = { path = "../data-formats", version = "0.5.1" } - fdo-store = { path = "../store", version = "0.5.1" } + + fdo-data-formats = { path = "../data-formats", version = "0.5.3" } + fdo-store = { path = "../store", version = "0.5.3" } -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.47.0 - diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..7a1a9b0 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.0.1.post1.dev15+gb038051a. diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec index 0f2ee2c..c469810 100644 --- a/fido-device-onboard.spec +++ b/fido-device-onboard.spec @@ -3,14 +3,13 @@ %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.5.1 +Version: 0.5.3 Release: 1%{?dist} Summary: A rust implementation of the FIDO Device Onboard Specification License: BSD-3-Clause 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 @@ -313,6 +312,19 @@ Requires: fdo-init = %{version}-%{release} %systemd_postun_with_restart fdo-aio.service %changelog +* Fri Feb 07 2025 Miguel Martín - 0.5.3-1 +## What's Changed + * chore: update CONTRIBUTING with additional deps by @miabbott in https://github.com/fdo-rs/fido-device-onboard-rs/pull/721 + * Fix the aws-nitro-enclaves patches and serveral problems reported by clippy by @mmartinv in https://github.com/fdo-rs/fido-device-onboard-rs/pull/722 + * New makefile targets by @mmartinv in https://github.com/fdo-rs/fido-device-onboard-rs/pull/725 + * Packit changes by @mmartinv in https://github.com/fdo-rs/fido-device-onboard-rs/pull/726 + * chore: bump openssl from 0.10.66 to 0.10.70 by @dependabot in https://github.com/fdo-rs/fido-device-onboard-rs/pull/733 + * chore: bump for 0.5.3 release by @mmartinv in https://github.com/fdo-rs/fido-device-onboard-rs/pull/738 + + + **Full Changelog**: https://github.com/fdo-rs/fido-device-onboard-rs/compare/v0.5.2...v0.5.3 +- Resolves: RHEL-77724 + * Thu Nov 21 2024 Antonio Murdaca - 0.5.1-1 - Update to 0.5.1 diff --git a/sources b/sources index 5027767..988cb84 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fido-device-onboard-rs-0.5.1-vendor-patched.tar.xz) = 5618890ff6839d2c3dcdcebfedcc3d76055a131b46eaf89d7d7ea6212c198c5a508687538c30b1cbb59a964053cf2df48f336b7ed45f370d2c158a47f54a4f6c -SHA512 (fido-device-onboard-rs-0.5.1.tar.gz) = 6c8be6355cb8a4fc002ce3fcedda5b9337d384b70d966c85e7f6a111bf51445b2563190f747595c12ca1f46de3f56206fa4217ff6d1998b5540a35c3ddf374ea +SHA512 (fido-device-onboard-rs-0.5.3.tar.gz) = a6e2ead8dfe792f807ac150f1a843699f9af7a4ad6e6c50de9c871b584357102eedb1c46516676414b03b851d8cffd01d0596f62f5c51fa17e7fe78dcf516525 +SHA512 (fido-device-onboard-rs-0.5.3-vendor-patched.tar.xz) = 438a75910396e738c759f4d78623ce08a79befd33834e116e10fd123d90ef0cf66d8346d743c0d48e6dbcb4c3ca05e7db14a73e529ca754ac3106cb11e04aeed