.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,7 +1 @@
-/yggdrasil-ffb580f55ae91beff78156fdb6a41be8bc049117.tar.gz
-/yggdrasil-0.3.1.tar.gz
-/yggdrasil-0.3.2.tar.gz
-/yggdrasil-0.3.2.tar.xz
 /yggdrasil-0.4.1.tar.xz
-/yggdrasil-0.4.2.tar.xz
-/yggdrasil-0.4.4.tar.xz

README.md

@@ -1,3 +0,0 @@
-# yggdrasil
-
-The yggdrasil package

changelog

@@ -1,16 +0,0 @@
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.98^1.ffb580f-0.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.98^1.ffb580f-0.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 0.2.98^1.ffb580f-0.3
-- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in
-  golang
-
-* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 0.2.98^1.ffb580f-0.2
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Tue Aug 10 2021 Link Dupont <linkdupont@fedoraproject.org> - 0.2.98^1.ffb580f-0.1.20210728gitffb580f
-- Initial package

config.toml

@@ -1,5 +0,0 @@
-protocol = "mqtt"
-server = ["wss://connect.cloud.redhat.com:443"]
-cert-file = "/etc/pki/consumer/cert.pem"
-key-file = "/etc/pki/consumer/key.pem"
-facts-file = "/var/lib/yggdrasil/canonical-facts.json"

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule { test_case_name: osci.brew-build.tier0.functional }
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/main.fmf

@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875
+SHA512 (yggdrasil-0.4.1.tar.xz) = 0329b969b7441363cf376cd8b9adf163e0d7f9ecf89db54128a3d8062c887676ac9903e911397bb6eef84238423705352138e0ff1d1ceec0d088c0514222a2f0

tests/smoke/main.fmf

@@ -1,3 +0,0 @@
-summary: Run yggd --help
-test: /usr/bin/yggd --help
-duration: 5m

yggdrasil.spec

@@ -2,8 +2,8 @@
 
 # https://github.com/redhatinsights/yggdrasil
 %global goipath         github.com/redhatinsights/yggdrasil
-Version:                0.4.4
-%global tag             v%{version}
+Version:                0.4.1
+%global tag             %{version}
 
 %gometa -f
 
@@ -16,32 +16,21 @@ exchanging data with its worker processes through a D-Bus message broker.}
 %global godocs          CONTRIBUTING.md README.md
 
 Name:           yggdrasil
-Release:        %autorelease
+Release:        2%{?dist}
 Summary:        Remote data transmission and processing client
 
 License:        GPL-3.0-only
 URL:            %{gourl}
-Source:         %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz
-Source1:        config.toml
-Source2:        yggdrasil.sysuser
+Source:         %{url}/releases/download/%{version}/yggdrasil-%{version}.tar.xz
 
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  meson
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(bash-completion)
-%{?sysusers_requires_compat}
 
 %description %{common_description}
 
-%package devel
-Summary:        %{name} development files
-
-%description devel
-%{common_description}
-
-Contains files needed for yggdrasil worker development.
-
 %gopkg
 
 %prep
@@ -57,35 +46,19 @@ Contains files needed for yggdrasil worker development.
 %undefine _auto_set_build_flags
 export %gomodulesmode
 %{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"}
-%meson -Dvendor=True -Ddefault_data_host=cert.cloud.redhat.com -Ddefault_path_prefix=redhat/insights "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"'
+%meson "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"'
 %meson_build
 
 %global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml
 %install
 %meson_install
-%__install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/config.toml
-%__install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
+%gopkginstall
 
 %if %{with check}
 %check
 %gocheck
 %endif
 
-%pre
-%sysusers_create_compat %{SOURCE2}
-
-%post
-%systemd_post %{name}.service
-%systemd_user_post %{name}.service
-
-%preun
-%systemd_preun %{name}.service
-%systemd_user_preun %{name}.service
-
-%postun
-%systemd_postun_with_restart %{name}.service
-%systemd_user_postun_with_restart %{name}.service
-
 %files
 %license LICENSE
 %if %{defined rhel}
@@ -96,14 +69,16 @@ export %gomodulesmode
 %config(noreplace) %{_sysconfdir}/%{name}
 %{_unitdir}/*
 %{_userunitdir}/*
-%{_sysusersdir}/*
 %{_datadir}/bash-completion/completions/*
 %{_datadir}/dbus-1/{interfaces,system-services,system.d}/*
 %{_datadir}/doc/%{name}/*
 %{_mandir}/man1/*
 
-%files devel
-%{_libdir}/pkgconfig/*.pc
+%gopkgfiles
 
 %changelog
-%autochangelog
+* Thu Sep  5 2024 Link Dupont <link@redhat.com> - 0.4.1-2
+- Rebuild for RHEL-47192
+
+* Mon Apr 15 2024 Link Dupont <link@redhat.com> - 0.4.1-1
+- Initial package (RHEL-29800)

yggdrasil.sysuser

@@ -1,5 +0,0 @@
-#Type Name               ID   GECOS                   Home directory    Shell
-u     yggdrasil          -    "yggdrasil system user" /var/lib/yggdrasil -
-u     yggdrasil-worker   -    "yggdrasil worker user" -                  -
-m     yggdrasil          yggdrasil-worker
-m     yggdrasil          rhsm