.gitignore

@@ -1 +1 @@
-SOURCES/yggdrasil-0.4.4.tar.xz
+SOURCES/yggdrasil-0.4.1.tar.xz

.yggdrasil.metadata

@@ -1 +1 @@
-558066c9941d8554d9ea05ce92db39b7e19fb92b SOURCES/yggdrasil-0.4.4.tar.xz
+e65f32fe1f5b9703f869016812bf5cdc1f09aa3a SOURCES/yggdrasil-0.4.1.tar.xz

SOURCES/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"

SPECS/yggdrasil.spec

@@ -1,19 +1,9 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 2;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 %bcond_without check
 
 # 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
 
@@ -26,13 +16,12 @@ exchanging data with its worker processes through a D-Bus message broker.}
 %global godocs          CONTRIBUTING.md README.md
 
 Name:           yggdrasil
-Release:        %autorelease
+Release:        1%{?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
+Source:         %{url}/releases/download/%{version}/yggdrasil-%{version}.tar.xz
 
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  meson
@@ -42,14 +31,6 @@ BuildRequires:  pkgconfig(bash-completion)
 
 %description %{common_description}
 
-%package devel
-Summary:        %{name} development files
-
-%description devel
-%{common_description}
-
-Contains files needed for yggdrasil worker development.
-
 %gopkg
 
 %prep
@@ -65,31 +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
+%gopkginstall
 
 %if %{with check}
 %check
 %gocheck
 %endif
 
-%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}
@@ -100,74 +69,13 @@ 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
-## START: Generated by rpmautospec
-* Mon Sep 16 2024 Link Dupont <link@sub-pop.net> - 0.4.4-2
-- Bump release to rebuild
-
-* Fri Sep 13 2024 Link Dupont <link@sub-pop.net> - 0.4.4-1
-- Update to version 0.4.4 (RHEL-56788)
-
-* Mon Aug 19 2024 Link Dupont <link@sub-pop.net> - 0.4.1-8
-- Bump release to rebuild package.
-
-* Tue Aug 06 2024 Link Dupont <link@sub-pop.net> - 0.4.1-7
-- Don't build gopkg subpackages
-
-* Tue Aug 06 2024 Link Dupont <link@sub-pop.net> - 0.4.1-6
-- Rebuild to mitigate CVE-2024-24791 risk (RHEL-47186)
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.4.1-5
-- Bump release for June 2024 mass rebuild
-
-* Fri Jun 07 2024 Link Dupont <link@sub-pop.net> - 0.4.1-4
-- add gating.yaml
-
-* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 0.4.1-3
-- Rebuild for golang 1.22.0
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Sep 18 2023 Link Dupont <link@sub-pop.net> - 0.4.1-1
-- Update to version 0.4.1 (RHBZ#2239102)
-
-* Wed Aug 09 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.3.2-2
-- Use vendored dependencies in RHEL builds
-
-* Mon Jul 24 2023 Link Dupont <link@sub-pop.net> - 0.3.2-1
-- Update to version 0.3.2 (RHBZ#2225230)
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Mar 07 2023 Link Dupont <link@sub-pop.net> - 0.3.1-2
-- Include D-Bus interface files in devel package
-
-* 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
-
-## END: Generated by rpmautospec
+* Mon Apr 15 2024 Link Dupont <link@redhat.com> - 0.4.1-1
+- Initial package (RHEL-29800)