From 95f1bb0bd413f2b068dc1357a3384acf04f78c96 Mon Sep 17 00:00:00 2001
From: Kevin Fox <Kevin.Fox@pnnl.gov>
Date: Sat, 25 Jan 2025 16:11:06 -0800
Subject: [PATCH] Update the spire-ha-agent rpms

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
---
 examples/rpms/spire-ha-agent.spec | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/examples/rpms/spire-ha-agent.spec b/examples/rpms/spire-ha-agent.spec
index cdff364..9bc936e 100644
--- a/examples/rpms/spire-ha-agent.spec
+++ b/examples/rpms/spire-ha-agent.spec
@@ -21,30 +21,53 @@
 
 Summary:    SPIRE HA Agent
 Name:       spire-ha-agent
-Version:    0.0.9
+Version:    0.0.11
 Release:    1
 Group:      Applications/Internet
 License:    Apache-2.0
 URL:        https://spiffe.io
 Source0:    https://github.com/spiffe/spire-ha-agent/releases/download/v%{version}/spire-ha-agent_Linux_%{ARCH}.tar.gz
+Source1:    https://github.com/spiffe/spire-ha-agent/releases/download/v%{version}/spire-trust-sync-helper_Linux_%{ARCH}.tar.gz
 
 %description
 SPIRE HA Agent
 
+%package -n spire-trust-sync
+Summary: SPIRE Trust Sync
+#FIXME This still needs upstream changes to package
+#Requires: spiffe-helper
+%description -n spire-trust-sync
+SPIRE Trust Sync
+
+%package -n spire-socat
+Summary: SPIRE socat
+Requires: socat
+%description -n spire-socat
+SPIRE socat
+
 %global _missing_build_ids_terminate_build 0
 %global debug_package %{nil}
 
 %prep
 
 %setup -c
+%setup -T -D -a 1
 
 %build
 
 %install
 mkdir -p %{buildroot}/usr/bin
 mkdir -p %{buildroot}/usr/lib/systemd/system
+mkdir -p %{buildroot}/etc/spire/socat
 mv spire-ha-agent %{buildroot}/usr/bin
 cp -a systemd/spire-ha-agent@.service %{buildroot}/usr/lib/systemd/system
+cp -a systemd/spire-socat@.service %{buildroot}/usr/lib/systemd/system
+cp -a config/socat/* %{buildroot}/etc/spire/socat/
+mkdir -p %{buildroot}/usr/libexec/spire/trust-sync/
+mkdir -p %{buildroot}/etc/spire/trust-sync
+cp -a spire-trust-sync-helper %{buildroot}/usr/libexec/spire/trust-sync
+cp -a systemd/spire-trust-sync@.service %{buildroot}/usr/lib/systemd/system
+cp -a config/trust-sync/default.conf %{buildroot}/etc/spire/trust-sync
 
 %clean
 rm -rf %{buildroot}
@@ -52,3 +75,12 @@ rm -rf %{buildroot}
 %files
 /usr/bin/spire-ha-agent
 /usr/lib/systemd/system/spire-ha-agent@.service
+
+%files -n spire-socat
+/usr/lib/systemd/system/spire-socat@.service
+%config(noreplace) /etc/spire/socat/*
+
+%files -n spire-trust-sync
+/usr/libexec/spire/trust-sync
+/usr/lib/systemd/system/spire-trust-sync@.service
+%config(noreplace) /etc/spire/trust-sync/default.conf