diff --git a/.gitignore b/.gitignore index 2eb0fdc..e6e51d4 100644 --- a/.gitignore +++ b/.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 +SOURCES/yggdrasil-0.4.1.tar.xz diff --git a/.yggdrasil.metadata b/.yggdrasil.metadata new file mode 100644 index 0000000..811a409 --- /dev/null +++ b/.yggdrasil.metadata @@ -0,0 +1 @@ +e65f32fe1f5b9703f869016812bf5cdc1f09aa3a SOURCES/yggdrasil-0.4.1.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 3f50b82..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# yggdrasil - -The yggdrasil package diff --git a/yggdrasil.spec b/SPECS/yggdrasil.spec similarity index 57% rename from yggdrasil.spec rename to SPECS/yggdrasil.spec index cf573a0..7140a95 100644 --- a/yggdrasil.spec +++ b/SPECS/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,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 @@ -32,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 @@ -55,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} @@ -90,14 +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 -%autochangelog +* Mon Apr 15 2024 Link Dupont - 0.4.1-1 +- Initial package (RHEL-29800) diff --git a/changelog b/changelog deleted file mode 100644 index 615b3ab..0000000 --- a/changelog +++ /dev/null @@ -1,16 +0,0 @@ -* Sat Jan 21 2023 Fedora Release Engineering - 0.2.98^1.ffb580f-0.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.2.98^1.ffb580f-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 19 2022 Maxwell G - 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 - 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 - 0.2.98^1.ffb580f-0.1.20210728gitffb580f -- Initial package diff --git a/config.toml b/config.toml deleted file mode 100644 index ef438af..0000000 --- a/config.toml +++ /dev/null @@ -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" diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c02e5bc..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-10 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule { test_case_name: osci.brew-build.tier0.functional } diff --git a/sources b/sources deleted file mode 100644 index 38dbd7b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875