From 8f16169e110695052d05cc46a857b23bf7e3932b Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Thu, 12 Sep 2024 12:45:38 -0400 Subject: [PATCH 01/22] Update packit downstream jobs [skip changelog] --- .packit.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 26f41e0..098a0ea 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -1,16 +1,19 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -upstream_project_url: https://github.com/RedhatInsights/yggdrasil +upstream_project_url: https://github.com/RedHatInsights/yggdrasil +issue_repository: https://github.com/RedHatInsights/yggdrasil +upstream_tag_template: v{version} + jobs: - job: pull_from_upstream trigger: release dist_git_branches: - - fedora-rawhide + - fedora-all - job: koji_build trigger: commit dist_git_branches: - - fedora-rawhide + - fedora-all - job: bodhi_update trigger: commit dist_git_branches: From 107b5baebecf095f4ac50e3ea26d7baa3d6bcdf7 Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 15 Sep 2024 01:41:09 +0000 Subject: [PATCH 02/22] Update to 0.4.4 upstream release - Resolves: rhbz#2312400 Upstream tag: v0.4.4 Upstream commit: 2a15f834 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ sources | 2 +- yggdrasil.spec | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index add07a5..8383844 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /yggdrasil-0.4.1.tar.xz /yggdrasil-0.4.2.tar.xz /yggdrasil-0.4.3.tar.xz +/yggdrasil-0.4.4.tar.xz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..459869a --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.101.0. diff --git a/sources b/sources index 08db74d..38dbd7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yggdrasil-0.4.3.tar.xz) = db7452632dc311dad8a11f5832cfb3138a5f6c8e16097ba9ac415a6b4def8c1b966225b9e8e5d846d57413079cae8fc8e0ac50514c0977780581803d9e2138b7 +SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875 diff --git a/yggdrasil.spec b/yggdrasil.spec index 2284715..89fc035 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -2,7 +2,7 @@ # https://github.com/redhatinsights/yggdrasil %global goipath github.com/redhatinsights/yggdrasil -Version: 0.4.3 +Version: 0.4.4 %global tag v%{version} %gometa -f From afa22c90c35eb3109a78bbc2c3829f683ec14c3b Mon Sep 17 00:00:00 2001 From: Packit Date: Sun, 15 Sep 2024 01:42:40 +0000 Subject: [PATCH 03/22] Update to 0.4.4 upstream release - Resolves: rhbz#2312400 Upstream tag: v0.4.4 Upstream commit: 2a15f834 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 3 +++ sources | 2 +- yggdrasil.spec | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index add07a5..8383844 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /yggdrasil-0.4.1.tar.xz /yggdrasil-0.4.2.tar.xz /yggdrasil-0.4.3.tar.xz +/yggdrasil-0.4.4.tar.xz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..459869a --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.101.0. diff --git a/sources b/sources index 08db74d..38dbd7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yggdrasil-0.4.3.tar.xz) = db7452632dc311dad8a11f5832cfb3138a5f6c8e16097ba9ac415a6b4def8c1b966225b9e8e5d846d57413079cae8fc8e0ac50514c0977780581803d9e2138b7 +SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875 diff --git a/yggdrasil.spec b/yggdrasil.spec index 2284715..89fc035 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -2,7 +2,7 @@ # https://github.com/redhatinsights/yggdrasil %global goipath github.com/redhatinsights/yggdrasil -Version: 0.4.3 +Version: 0.4.4 %global tag v%{version} %gometa -f From 8a0c2f421e8f463f10c378d1aed9e246b9a9ee9d Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Fri, 20 Sep 2024 11:40:07 -0400 Subject: [PATCH 04/22] Run systemd-sysusers before installing package --- yggdrasil.spec | 7 +++++++ yggdrasil.sysusers | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 yggdrasil.sysusers diff --git a/yggdrasil.spec b/yggdrasil.spec index 89fc035..ee4e574 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -22,6 +22,7 @@ Summary: Remote data transmission and processing client License: GPL-3.0-only URL: %{gourl} Source: %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz +Source1: yggdrasil.sysusers BuildRequires: systemd-rpm-macros BuildRequires: meson @@ -29,6 +30,8 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(bash-completion) +%{?systemd_requires} + %description %{common_description} %package devel @@ -60,12 +63,16 @@ export %gomodulesmode %install %meson_install %gopkginstall +%define sysusersfile %(echo %{_buildroot}/%{_sysusersdir}/%{name}.conf) %if %{with check} %check %gocheck %endif +%pre +%sysusers_create_package %{name} %{SOURCE1} + %post %systemd_post %{name}.service %systemd_user_post %{name}.service diff --git a/yggdrasil.sysusers b/yggdrasil.sysusers new file mode 100644 index 0000000..8e6679a --- /dev/null +++ b/yggdrasil.sysusers @@ -0,0 +1,4 @@ +#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 From c2de9ea57ab65dcebde6377510095fd086320a49 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Fri, 20 Sep 2024 11:40:07 -0400 Subject: [PATCH 05/22] Run systemd-sysusers before installing package --- yggdrasil.spec | 7 +++++++ yggdrasil.sysusers | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 yggdrasil.sysusers diff --git a/yggdrasil.spec b/yggdrasil.spec index 89fc035..ee4e574 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -22,6 +22,7 @@ Summary: Remote data transmission and processing client License: GPL-3.0-only URL: %{gourl} Source: %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz +Source1: yggdrasil.sysusers BuildRequires: systemd-rpm-macros BuildRequires: meson @@ -29,6 +30,8 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(bash-completion) +%{?systemd_requires} + %description %{common_description} %package devel @@ -60,12 +63,16 @@ export %gomodulesmode %install %meson_install %gopkginstall +%define sysusersfile %(echo %{_buildroot}/%{_sysusersdir}/%{name}.conf) %if %{with check} %check %gocheck %endif +%pre +%sysusers_create_package %{name} %{SOURCE1} + %post %systemd_post %{name}.service %systemd_user_post %{name}.service diff --git a/yggdrasil.sysusers b/yggdrasil.sysusers new file mode 100644 index 0000000..8e6679a --- /dev/null +++ b/yggdrasil.sysusers @@ -0,0 +1,4 @@ +#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 From 3bf04c918b46d34a01a6c9c0e55b57fc670138cf Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Fri, 20 Sep 2024 21:24:58 -0400 Subject: [PATCH 06/22] Drop automatic golang package --- yggdrasil.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/yggdrasil.spec b/yggdrasil.spec index ee4e574..333cd71 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -104,7 +104,5 @@ export %gomodulesmode %files devel %{_libdir}/pkgconfig/*.pc -%gopkgfiles - %changelog %autochangelog From 991fd9980f0e356c326218da51b05ef2ea788055 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Fri, 20 Sep 2024 21:29:37 -0400 Subject: [PATCH 07/22] Include the golang-devel subpackage (required by workers) --- yggdrasil.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yggdrasil.spec b/yggdrasil.spec index 333cd71..ee4e574 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -104,5 +104,7 @@ export %gomodulesmode %files devel %{_libdir}/pkgconfig/*.pc +%gopkgfiles + %changelog %autochangelog From f9963768bf8da934d8d2bf0e0a32aa29f7a836fe Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 23 Sep 2024 08:38:38 -0400 Subject: [PATCH 08/22] Use systemd_sysusers_compat --- yggdrasil.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yggdrasil.spec b/yggdrasil.spec index ee4e574..b5796ac 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -29,6 +29,7 @@ BuildRequires: meson BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(bash-completion) +%{?sysusers_requires_compat} %{?systemd_requires} @@ -63,7 +64,6 @@ export %gomodulesmode %install %meson_install %gopkginstall -%define sysusersfile %(echo %{_buildroot}/%{_sysusersdir}/%{name}.conf) %if %{with check} %check @@ -71,7 +71,7 @@ export %gomodulesmode %endif %pre -%sysusers_create_package %{name} %{SOURCE1} +%sysusers_create_compat %{SOURCE1} %post %systemd_post %{name}.service From ff84a26fcdd34abc8bdbf60dff5fed19f61697a7 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 23 Sep 2024 08:38:38 -0400 Subject: [PATCH 09/22] Use systemd_sysusers_compat --- yggdrasil.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yggdrasil.spec b/yggdrasil.spec index ee4e574..b5796ac 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -29,6 +29,7 @@ BuildRequires: meson BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(bash-completion) +%{?sysusers_requires_compat} %{?systemd_requires} @@ -63,7 +64,6 @@ export %gomodulesmode %install %meson_install %gopkginstall -%define sysusersfile %(echo %{_buildroot}/%{_sysusersdir}/%{name}.conf) %if %{with check} %check @@ -71,7 +71,7 @@ export %gomodulesmode %endif %pre -%sysusers_create_package %{name} %{SOURCE1} +%sysusers_create_compat %{SOURCE1} %post %systemd_post %{name}.service From 4b8b087453678bc9ceef9c8a50b9cb35e55f387b Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Thu, 7 Nov 2024 11:50:25 -0500 Subject: [PATCH 10/22] Include local state dir --- yggdrasil.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yggdrasil.spec b/yggdrasil.spec index b5796ac..dcfbdb2 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -63,6 +63,7 @@ export %gomodulesmode %global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml %install %meson_install +%__install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil %gopkginstall %if %{with check} @@ -100,6 +101,7 @@ export %gomodulesmode %{_datadir}/dbus-1/{interfaces,system-services,system.d}/* %{_datadir}/doc/%{name}/* %{_mandir}/man1/* +%attr(0755, yggdrasil, yggdrasil) %{_localstatedir}/lib/yggdrasil %files devel %{_libdir}/pkgconfig/*.pc From db1e8edaeaeee48cee0e857ca52f93760e711e14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:33:46 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fa6b56a36a808c43e41bad33cab2277cd59db46b Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 3 Feb 2025 11:13:44 -0500 Subject: [PATCH 12/22] Include example workers in subpackage --- yggdrasil.spec | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/yggdrasil.spec b/yggdrasil.spec index dcfbdb2..558d0ab 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -43,6 +43,16 @@ Summary: %{name} development files Contains files needed for yggdrasil worker development. +%package examples +Summary: %{name} example workers + +Requires: %{name}-%{version} + +%description examples +%{common_description} + +Contains example workers for yggdrasil. + %gopkg %prep @@ -57,7 +67,7 @@ Contains files needed for yggdrasil worker development. %undefine _auto_set_build_flags export %gomodulesmode %{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} -%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 -Dexamples=True "-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 @@ -92,19 +102,34 @@ export %gomodulesmode %license vendor/modules.txt %endif %doc CONTRIBUTING.md README.md -%{_bindir}/* +%{_bindir}/yggd +%{_bindir}/yggctl %config(noreplace) %{_sysconfdir}/%{name} -%{_unitdir}/* -%{_userunitdir}/* -%{_sysusersdir}/* -%{_datadir}/bash-completion/completions/* -%{_datadir}/dbus-1/{interfaces,system-services,system.d}/* -%{_datadir}/doc/%{name}/* -%{_mandir}/man1/* -%attr(0755, yggdrasil, yggdrasil) %{_localstatedir}/lib/yggdrasil +%{_unitdir}/yggdrasil-bus@.service +%{_unitdir}/yggdrasil-bus@.socket +%{_unitdir}/yggdrasil@.service +%{_unitdir}/yggdrasil.service +%{_userunitdir}/yggdrasil.service +%{_sysusersdir}/yggdrasil.conf +%{_datadir}/bash-completion/completions/yggd +%{_datadir}/bash-completion/completions/yggctl +%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.xml +%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.Worker1.xml +%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.Dispatcher1.xml +%{_datadir}/dbus-1/system.d/yggd.conf +%{_datadir}/dbus-1/system-services/com.redhat.Yggdrasil1.service +%{_datadir}/doc/%{name}/tags.toml +%{_mandir}/man1/yggctl.1.gz +%{_mandir}/man1/yggd.1.gz %files devel -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/yggdrasil.pc + +%files examples +%{_libexecdir}/yggdrasil/echo +%{_datadir}/dbus-1/system.d/com.redhat.Yggdrasil1.Worker1.echo.conf +%{_datadir}/dbus-1/system-services/com.redhat.Yggdrasil1.Worker1.echo.service +%{_unitdir}/com.redhat.Yggdrasil1.Worker1.echo.service %gopkgfiles From c4d7377679f33c359dde6c0cda7fad9f77c1d4c8 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 3 Feb 2025 11:36:43 -0500 Subject: [PATCH 13/22] Correct subpackage requirement [skip changelog] --- yggdrasil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yggdrasil.spec b/yggdrasil.spec index 558d0ab..496d919 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -46,7 +46,7 @@ Contains files needed for yggdrasil worker development. %package examples Summary: %{name} example workers -Requires: %{name}-%{version} +Requires: %{name} = %{version}-%{release} %description examples %{common_description} From c723cac00ccaa081814a8691288aed27bb4493e7 Mon Sep 17 00:00:00 2001 From: Link Dupont Date: Mon, 3 Feb 2025 11:43:55 -0500 Subject: [PATCH 14/22] Include localstate dir [skip changelog] --- yggdrasil.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/yggdrasil.spec b/yggdrasil.spec index 496d919..75bf613 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -121,6 +121,7 @@ export %gomodulesmode %{_datadir}/doc/%{name}/tags.toml %{_mandir}/man1/yggctl.1.gz %{_mandir}/man1/yggd.1.gz +%attr(0755, yggdrasil, yggdrasil) %{_localstatedir}/lib/yggdrasil %files devel %{_libdir}/pkgconfig/yggdrasil.pc From c323252c44f5144bbc44f37ab42f50038c256fa7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:12:13 +0000 Subject: [PATCH 15/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 647f989db899f6b1598222f6cf489f6ec788aa46 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 18:47:36 -0500 Subject: [PATCH 16/22] Rebuild for golang-1.25.0 From 42d7bf65d7fb5323fba94370324adeefb13d55ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 16:40:01 +0200 Subject: [PATCH 17/22] rebuild From 9937614c874bdce81cbeb20757b6d213f9c0347b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:02:03 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 4c14170d3e206154013486b54bf25bddccf0137f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 2 Feb 2026 20:04:13 -0600 Subject: [PATCH 19/22] Rebuild for https://fedoraproject.org/wiki/Changes/golang1.26 From d2086f36e850fae0ad2ed3a8b4b72ea5e36fa480 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 2 Feb 2026 12:56:43 -0500 Subject: [PATCH 20/22] Update to 0.4.9 with go-vendor-tools https://fedoraproject.org/wiki/Changes/GolangPackagesVendoredByDefault --- .gitignore | 2 ++ go-vendor-tools.toml | 8 ++++++ sources | 3 +- yggdrasil.spec | 66 +++++++++++++++++++------------------------- 4 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 go-vendor-tools.toml diff --git a/.gitignore b/.gitignore index 8383844..2e9385b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /yggdrasil-0.4.2.tar.xz /yggdrasil-0.4.3.tar.xz /yggdrasil-0.4.4.tar.xz +/yggdrasil-0.4.9.tar.gz +/yggdrasil-0.4.9-vendor.tar.bz2 diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml new file mode 100644 index 0000000..2c22c5e --- /dev/null +++ b/go-vendor-tools.toml @@ -0,0 +1,8 @@ +[archive] + +[licensing] +detector = "askalono" +[[licensing.licenses]] +path = "vendor/gopkg.in/yaml.v3/LICENSE" +sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b" +expression = "MIT AND (MIT AND Apache-2.0)" diff --git a/sources b/sources index 38dbd7b..8828306 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875 +SHA512 (yggdrasil-0.4.9.tar.gz) = 85977ed598a04e5b9501ae54fb21e624ab8865c6244d5aff4c5c5360e3261eca0d26d89c47cd09eafb9f351852e51af26910c0fdc65e115ed1974300ffc0698f +SHA512 (yggdrasil-0.4.9-vendor.tar.bz2) = d0e1982be752dc27c66e582acc29a7be4686c52ef4bbbbc409fe8bb6552ced212e3c9f059bc9b40c77f76c194aa991d639b12343e332dd40f13ea2c539e56d07 diff --git a/yggdrasil.spec b/yggdrasil.spec index 75bf613..285218a 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -1,39 +1,41 @@ -%bcond_without check +# Generated by go2rpm 1.18.0 +%bcond check 1 + +%global go_vendor_license_check_disable %{defined rhel} # https://github.com/redhatinsights/yggdrasil %global goipath github.com/redhatinsights/yggdrasil -Version: 0.4.4 -%global tag v%{version} +Version: 0.4.9 -%gometa -f +%gometa -L -f -%global common_description %{expand: -yggdrasil is a system daemon that subscribes to topics on an MQTT broker and -routes any data received on the topics to an appropriate child "worker" process, -exchanging data with its worker processes through a D-Bus message broker.} - -%global golicenses LICENSE -%global godocs CONTRIBUTING.md README.md Name: yggdrasil Release: %autorelease Summary: Remote data transmission and processing client -License: GPL-3.0-only +# Generated by go-vendor-tools +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND EPL-2.0 AND GPL-3.0-only AND MIT AND MPL-2.0 URL: %{gourl} -Source: %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz -Source1: yggdrasil.sysusers +Source0: %{gosource} +# Generated by go-vendor-tools +Source1: %{archivename}-vendor.tar.bz2 +Source2: go-vendor-tools.toml +Source3: yggdrasil.sysusers +BuildRequires: go-vendor-tools BuildRequires: systemd-rpm-macros BuildRequires: meson BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(bash-completion) -%{?sysusers_requires_compat} %{?systemd_requires} -%description %{common_description} +%description +yggdrasil is a system daemon that subscribes to topics on an MQTT broker and +routes any data received on the topics to an appropriate child "worker" process, +exchanging data with its worker processes through a D-Bus message broker. %package devel Summary: %{name} development files @@ -56,34 +58,30 @@ Contains example workers for yggdrasil. %gopkg %prep -%goprep %{?rhel:-k} +%goprep -p1 +tar -xf %{SOURCE1} -%if %{undefined rhel} %generate_buildrequires -%go_generate_buildrequires -%endif +%go_vendor_license_buildrequires -c %{S:2} %build -%undefine _auto_set_build_flags -export %gomodulesmode -%{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} +%global gomodulesmode GO111MODULE=on %meson -Dexamples=True "-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 -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil -%gopkginstall +install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil +install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/yggdrasil.conf +%go_vendor_license_install -c %{SOURCE2} -%if %{with check} %check -%gocheck +%go_vendor_license_check -c %{S:2} +%if %{with check} +%gocheck2 %endif -%pre -%sysusers_create_compat %{SOURCE1} - %post %systemd_post %{name}.service %systemd_user_post %{name}.service @@ -96,11 +94,7 @@ export %gomodulesmode %systemd_postun_with_restart %{name}.service %systemd_user_postun_with_restart %{name}.service -%files -%license LICENSE -%if %{defined rhel} -%license vendor/modules.txt -%endif +%files -f %{go_vendor_license_filelist} %doc CONTRIBUTING.md README.md %{_bindir}/yggd %{_bindir}/yggctl @@ -132,7 +126,5 @@ export %gomodulesmode %{_datadir}/dbus-1/system-services/com.redhat.Yggdrasil1.Worker1.echo.service %{_unitdir}/com.redhat.Yggdrasil1.Worker1.echo.service -%gopkgfiles - %changelog %autochangelog From 9f1090284418a919bfc04222e138068d369f0cb3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 24 Jun 2026 18:45:09 -0400 Subject: [PATCH 21/22] Update to 0.4.10 Resolves: rhbz#2481490 --- .gitignore | 2 ++ sources | 4 ++-- yggdrasil.spec | 12 +++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2e9385b..938a1e7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /yggdrasil-0.4.4.tar.xz /yggdrasil-0.4.9.tar.gz /yggdrasil-0.4.9-vendor.tar.bz2 +/yggdrasil-0.4.10.tar.gz +/yggdrasil-0.4.10-vendor.tar.bz2 diff --git a/sources b/sources index 8828306..5e46bb7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yggdrasil-0.4.9.tar.gz) = 85977ed598a04e5b9501ae54fb21e624ab8865c6244d5aff4c5c5360e3261eca0d26d89c47cd09eafb9f351852e51af26910c0fdc65e115ed1974300ffc0698f -SHA512 (yggdrasil-0.4.9-vendor.tar.bz2) = d0e1982be752dc27c66e582acc29a7be4686c52ef4bbbbc409fe8bb6552ced212e3c9f059bc9b40c77f76c194aa991d639b12343e332dd40f13ea2c539e56d07 +SHA512 (yggdrasil-0.4.10.tar.gz) = 7b9ee3ec204feeb635d7ff4c736d8b5f6ff468863ab456eea45481593a523d4711602b1ba0aef7a77d4a5886819e9791b7f54e7f0f9b30e89a34d0a7becb2bc5 +SHA512 (yggdrasil-0.4.10-vendor.tar.bz2) = 9752e2c5fefd2eee93848627f3f1a21a9a7a11b60971203532ecb936f2be53e51a0d7c7f254b35badec2e27e3005f2dd5a9cb1eb281cf65fb7dd7f0ed36ca983 diff --git a/yggdrasil.spec b/yggdrasil.spec index 285218a..af9dee9 100644 --- a/yggdrasil.spec +++ b/yggdrasil.spec @@ -1,11 +1,11 @@ -# Generated by go2rpm 1.18.0 +# Generated by go2rpm 1.19.0 %bcond check 1 %global go_vendor_license_check_disable %{defined rhel} # https://github.com/redhatinsights/yggdrasil %global goipath github.com/redhatinsights/yggdrasil -Version: 0.4.9 +Version: 0.4.10 %gometa -L -f @@ -15,7 +15,7 @@ Release: %autorelease Summary: Remote data transmission and processing client # Generated by go-vendor-tools -License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND EPL-2.0 AND GPL-3.0-only AND MIT AND MPL-2.0 +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND EPL-2.0 AND GPL-3.0-only AND MIT URL: %{gourl} Source0: %{gosource} # Generated by go-vendor-tools @@ -55,11 +55,9 @@ Requires: %{name} = %{version}-%{release} Contains example workers for yggdrasil. -%gopkg - %prep %goprep -p1 -tar -xf %{SOURCE1} +tar -xf %{S:1} %generate_buildrequires %go_vendor_license_buildrequires -c %{S:2} @@ -71,10 +69,10 @@ tar -xf %{SOURCE1} %global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml %install +%go_vendor_license_install -c %{S:2} %meson_install install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/yggdrasil.conf -%go_vendor_license_install -c %{SOURCE2} %check %go_vendor_license_check -c %{S:2} From 57c24d5f2015d513b7a85f3c6ae02b4e2a82ed97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:34:28 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild