.gitignore

@@ -1,2 +1,2 @@
-afterburn-5.5.1-vendor.tar.gz
+SOURCES/afterburn-5.6.0-vendor.tar.gz
-afterburn-5.5.1.crate
+SOURCES/afterburn-5.6.0.crate

.rust-afterburn.metadata

@@ -0,0 +1,2 @@
+5676e290f3d19e25a2007ae2825251cb027ea0c1 SOURCES/afterburn-5.6.0-vendor.tar.gz
+ad9a72bd56faac2fa98ba40224463aec110246d8 SOURCES/afterburn-5.6.0.crate

SOURCES/legacy-providers.patch

@@ -0,0 +1,32 @@
+From c3fda955572ae6f6e9101fb15f62dee8d323e508 Mon Sep 17 00:00:00 2001
+From: Steven Presti <spresti@redhat.com>
+Date: Tue, 25 Jun 2024 10:16:14 -0400
+Subject: [PATCH] metadata: add legacy-providers
+
+---
+ src/metadata.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/metadata.rs b/src/metadata.rs
+index b89bf5b..e5021f7 100644
+--- a/src/metadata.rs
++++ b/src/metadata.rs
+@@ -53,6 +53,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
+         "akamai" => box_result!(AkamaiProvider::try_new()?),
+         "aliyun" => box_result!(AliyunProvider::try_new()?),
+         "aws" => box_result!(AwsProvider::try_new()?),
++        "ec2" => box_result!(AwsProvider::try_new()?),
+         "azure" => box_result!(Azure::try_new()?),
+         "azurestack" => box_result!(AzureStack::try_new()?),
+         "cloudstack-metadata" => box_result!(CloudstackNetwork::try_new()?),
+@@ -60,6 +61,7 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
+         "digitalocean" => box_result!(DigitalOceanProvider::try_new()?),
+         "exoscale" => box_result!(ExoscaleProvider::try_new()?),
+         "gcp" => box_result!(GcpProvider::try_new()?),
++        "gce" => box_result!(GcpProvider::try_new()?),
+         "hetzner" => box_result!(HetznerProvider::try_new()?),
+         // IBM Cloud - VPC Generation 2.
+         "ibmcloud" => box_result!(IBMGen2Provider::try_new()?),
+-- 
+2.43.2
+

SPECS/rust-afterburn.spec

@@ -1,22 +1,27 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 15
 %bcond_without check
+%global __cargo_skip_build 0
 
 %global dracutmodulesdir %(pkg-config --variable=dracutmodulesdir dracut || echo '/usr/lib/dracut/modules.d')
 
 %global crate afterburn
 
-Name:           rust-afterburn
+Name:           rust-%{crate}
-Version:        5.5.1
+Version:        5.6.0
-Release:        4%{?dist}
+Release:        1%{?dist}
-Summary:        Simple cloud provider agent
+Summary:        Simple cloud provider agent (RHEL CoreOS only)
 
-License:        Apache-2.0
+# Upstream license specification: Apache-2.0
+License:        ASL 2.0
 URL:            https://crates.io/crates/afterburn
 Source0:        %{crates_source}
-# not used on Fedora
 Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
+# Re-add support for "ec2" and "gce" providers, since RHCOS nodes installed
+# from OCP 4.1 and 4.2 bootimages still call them by those names
+Patch0:         legacy-providers.patch
 
-%if 0%{?rhel}
+ExclusiveArch:  %{rust_arches}
+%if 0%{?rhel} && !0%{?eln}
 BuildRequires:  rust-toolset
 BuildRequires:  openssl-devel
 # This is needed because the cc crate, which is
@@ -24,49 +29,38 @@ BuildRequires:  openssl-devel
 # does not work without it.
 BuildRequires:  glibc-devel 
 %else
-BuildRequires:  rust-packaging >= 23
+BuildRequires:  rust-packaging
 %endif
 BuildRequires:  systemd
 
 %global _description %{expand:
-A simple cloud provider agent.}
+This software is currently only supported on RHEL CoreOS.
+
+Afterburn is a one-shot agent for cloud-like platforms which interacts with
+provider-specific metadata endpoints. It is typically used in conjunction
+with Ignition.
+}
 
 %description %{_description}
 
 %package     -n %{crate}
 Summary:        %{summary}
-
+# ASL 2.0
-# (Apache-2.0 OR MIT) AND BSD-3-Clause
+# ASL 2.0 or Boost
-# 0BSD
+# BSD
-# Apache-2.0
-# Apache-2.0 OR BSL-1.0
-# Apache-2.0 OR MIT
-# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
-# BSD-3-Clause
 # MIT
-# MIT OR Apache-2.0
+# MIT or ASL 2.0
-# MIT OR Apache-2.0 OR Zlib
+# MPLv2.0 or MIT or ASL 2.0
-# MPL-2.0 OR MIT OR Apache-2.0
+# Unlicense or MIT
-# Unlicense OR MIT
+# zlib
-# Zlib
+License:        ASL 2.0 and MIT and BSD and zlib
-# Zlib OR Apache-2.0 OR MIT
-License:        Apache-2.0 AND 0BSD AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MPL-2.0 OR MIT OR Apache-2.0) AND (Unlicense OR MIT) AND Zlib
-# LICENSE.dependencies contains a full license breakdown
-
 %{?systemd_requires}
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
-%license COPYRIGHT
 %license LICENSE
-%license NOTICE
-%license LICENSE.dependencies
-%if 0%{?rhel}
-%license cargo-vendor.txt
-%endif
 %doc README.md
-%doc code-of-conduct.md
 %{_bindir}/afterburn
 %{_unitdir}/afterburn.service
 %{_unitdir}/afterburn-checkin.service
@@ -107,8 +101,9 @@ to run in the initramfs on boot.
 %{dracutmodulesdir}/30afterburn/
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1 %{?rhel:-a1}
+%autosetup -n %{crate}-%{version_no_tilde} -p1
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
+tar xvf %{SOURCE1}
 %cargo_prep -v vendor
 %else
 %cargo_prep
@@ -120,21 +115,16 @@ sed -e 's,@DEFAULT_INSTANCE@,core,' < \
   systemd/afterburn-sshkeys@.service.in > \
   systemd/afterburn-sshkeys@.service
 
-%if !0%{?rhel}
+%if !0%{?rhel} || 0%{?eln}
 %generate_buildrequires
 %cargo_generate_buildrequires
 %endif
 
 %build
 %cargo_build
-%{?cargo_license_summary}
-%{?cargo_license} > LICENSE.dependencies
-%if 0%{?rhel}
-%cargo_vendor_manifest
-%endif
 
 %install
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
 %make_install INSTALL="install -p -c"
 %else
 %cargo_install
@@ -150,69 +140,32 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir}
 %endif
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.5.1-4
+* Tue Jun 25 2024 Steven Presti <spresti@redhat.com> - 5.6.0-1
-- Bump release for June 2024 mass rebuild
+- New release
 
-* Fri Feb 02 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 5.5.1-3
+* Thu Feb 1 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-2
-- Update Rust macro usage
+- Add gcp-hostname.patch
 
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-2
+* Tue Jan 23 2024 Michael Nguyen <mnguyen@redhat.com> - 5.5.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- New release
+- Update legacy-providers patch to work with new release source
 
-* Tue Jan 16 2024 Michael Nguyen <mnguyen@redhat.com> 5.5.1-1
+* Thu Jun 08 2023 Steven Presti <spresti@redhat.com> - 5.4.3-1
-- Update to 5.5.1
+- New release
 
-* Tue Jan 09 2024 Michael Nguyen <mnguyen@redhat.com> 5.5.0-1
+* Mon Feb 06 2023 Benjamin Gilbert <bgilbert@redhat.com> - 5.4.1-1
-- Update to 5.5.0
+- New release
+- Re-add support for "ec2" and "gce" providers (removed in 5.0.0)
 
-* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 5.4.3-2
+* Mon Jan 9 2023 Steven Presti <spresti@redhat.com> - 5.3.0-2
-- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)
+- Update description and summary to indicate this package is 
+  only supported on RHEL CoreOS.
 
-* Wed Oct 04 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 5.4.3-1
+* Mon May 2 2022 Sohan Kunkerkar <skunkerk@redhat.com> - 5.3.0-1
-- Update to 5.4.3
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon May 22 2023 Steven Presti <spresti@redhat.com> - 5.4.2-1
-- Update to 5.4.2
-
-* Fri May 19 2023 Fabio Valentini <decathorpe@gmail.com> - 5.4.0-4
-- Refresh for latest Rust package template; update license tag for SPDX
-
-* Wed May 03 2023 Fabio Valentini <decathorpe@gmail.com> - 5.4.0-3
-- Rebuild for tokio, h2, and openssl crate security updates
-
-* Mon Mar 20 2023 Benjamin Gilbert <bgilbert@redhat.com> - 5.4.0-2
-- Update for Mockito 1.0 API
-
-* Fri Feb 03 2023 Benjamin Gilbert <bgilbert@redhat.com> - 5.4.0-1
-- Update to 5.4.0
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Sohan Kunkerkar <skunkerk@redhat.com> - 5.3.0-2
-- Backport patch to expose instance availability-zone-id
-  https://github.com/coreos/afterburn/pull/748
-  
-* Fri Apr 29 2022 Sohan Kunkerkar <skunkerk@redhat.com> - 5.3.0-1
 - Update to 5.3.0
 
-* Tue Feb 15 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.2.0-5
+* Wed Mar 09 2022 Timothée Ravier <tim@siosm.fr> - 5.2.0-2
-- Rebuild with package notes
+- Remove Windows binaries from vendor tarball
-
-* Mon Jan 31 2022 Benjamin Gilbert <bgilbert@redhat.com> - 5.2.0-4
-- Rebuild to fix out-of-order push
-
-* Tue Jan 25 2022 Fabio Valentini <decathorpe@gmail.com> - 5.2.0-3
-- Rebuild with thread_local 1.1.4 for RUSTSEC-2022-0006.
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Fri Jan 14 2022 Benjamin Gilbert <bgilbert@redhat.com> - 5.2.0-1
 - Update to 5.2.0

sources

@@ -1,2 +0,0 @@
-SHA512 (afterburn-5.5.1-vendor.tar.gz) = d58006184740e0f4b9a4321d4fd7dadc9ca683d440526cd3b689a914832f4a60b05a989b59291189d8f14158f807e34a9e3c6329ee7240faf44749a4745c675d
-SHA512 (afterburn-5.5.1.crate) = f937aafccbdfc49486b184fba2d99115407b90bf5ca54cf0d5de228a96f97a4e700f2fb96c7c0dc325d0989e99bd6d771d798ffec13172bde51b0115290bb3cc