diff --git a/base/comps/components.toml b/base/comps/components.toml index 3e422e05cbf..f63b31b3605 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -4444,7 +4444,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.rapidfuzz-cpp] [components.rapidjson] [components.raptor2] -[components.rasdaemon] [components.rb_libtorrent] [components.rccl] [components.rdfind] diff --git a/base/comps/rasdaemon/rasdaemon.comp.toml b/base/comps/rasdaemon/rasdaemon.comp.toml new file mode 100644 index 00000000000..0abcb813238 --- /dev/null +++ b/base/comps/rasdaemon/rasdaemon.comp.toml @@ -0,0 +1,57 @@ +# rasdaemon — RAS (Reliability, Availability and Serviceability) error logging tool. +# +# Azure Linux carries rasdaemon 0.8.1, which is newer than the version Fedora +# dist-git currently ships (0.8.0). Because there is no upstream commit to pin to +# yet, the newer version is applied as an overlay on top of the Fedora 0.8.0 spec +# plus the matching 0.8.1 source tarball. Drop this overlay and the source-files +# entry once Fedora dist-git packages 0.8.1 and the default snapshot picks it up. +[components.rasdaemon] + +[[components.rasdaemon.overlays]] +description = "Bump rasdaemon to 0.8.1 (ahead of Fedora, which still ships 0.8.0)" +type = "spec-update-tag" +tag = "Version" +value = "0.8.1" +[components.rasdaemon.overlays.metadata] +category = "azl-temp-workaround" +upstream-status = "upstreamable" + +[[components.rasdaemon.overlays]] +description = "Point the project URL at the maintainer's current GitHub repository" +type = "spec-update-tag" +tag = "URL" +value = "https://github.com/mchehab/rasdaemon" +[components.rasdaemon.overlays.metadata] +category = "azl-branding-policy" +upstream-status = "inapplicable" + +[[components.rasdaemon.overlays]] +description = "Fetch the release tarball from the maintainer's GitHub releases instead of infradead" +type = "spec-update-tag" +tag = "Source0" +value = "https://github.com/mchehab/rasdaemon/releases/download/v%{version}/%{name}-%{version}.tar.bz2" +[components.rasdaemon.overlays.metadata] +category = "azl-branding-policy" +upstream-status = "inapplicable" + +[[components.rasdaemon.overlays]] +description = "Package the mc_event/mem_fail RAS trigger scripts newly shipped in 0.8.1" +type = "spec-append-lines" +section = "%files" +lines = [ + "%dir %{_sysconfdir}/ras/triggers", + "%{_sysconfdir}/ras/triggers/mc_event_trigger", + "%{_sysconfdir}/ras/triggers/mem_fail_trigger", +] +[components.rasdaemon.overlays.metadata] +category = "azl-temp-workaround" +upstream-status = "upstreamable" + +# Pristine upstream 0.8.1 release tarball from the maintainer's GitHub releases +# (matches the spec's %{name}-%{version} Source0). Replaces the pruned 0.8.0 +# tarball once the Version overlay renders the new filename. +[[components.rasdaemon.source-files]] +filename = "rasdaemon-0.8.1.tar.bz2" +hash = "7c227b6ec0b73bd0cf727910f2adc49fc3f5167c41cd4b41d3d7d17b84a4a25681def89c82a275efe5f445049d6b0db8bd35f863384aca9a848b228402917d4d" +hash-type = "SHA512" +origin = { type = "download", uri = "https://github.com/mchehab/rasdaemon/releases/download/v0.8.1/rasdaemon-0.8.1.tar.bz2" } diff --git a/locks/rasdaemon.lock b/locks/rasdaemon.lock index 5aa232d5452..2d8c727fa6f 100644 --- a/locks/rasdaemon.lock +++ b/locks/rasdaemon.lock @@ -2,5 +2,5 @@ version = 1 import-commit = '3713a6c8a54bf81ebe7081a71092e749f5e471fd' upstream-commit = '3713a6c8a54bf81ebe7081a71092e749f5e471fd' -input-fingerprint = 'sha256:e3c733a2090681f263bfe0e3f6a7d3d3d038eb005157d511c5b144a0525542e6' +input-fingerprint = 'sha256:6dccbdbc8f9a4a57caa7de311c8c251efdb377156aef9284b99e504e42ed589c' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/r/rasdaemon/rasdaemon.spec b/specs/r/rasdaemon/rasdaemon.spec index d3197cc0b02..f5ac5499e3e 100644 --- a/specs/r/rasdaemon/rasdaemon.spec +++ b/specs/r/rasdaemon/rasdaemon.spec @@ -2,14 +2,14 @@ # Do not edit manually; changes may be overwritten. Name: rasdaemon -Version: 0.8.0 -Release: 9%{?dist} +Version: 0.8.1 +Release: 10%{?dist} Summary: Utility to receive RAS error tracings Group: Applications/System # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only -URL: http://git.infradead.org/users/mchehab/rasdaemon.git -Source0: http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2 +URL: https://github.com/mchehab/rasdaemon +Source0: https://github.com/mchehab/rasdaemon/releases/download/v%{version}/%{name}-%{version}.tar.bz2 ExcludeArch: s390 s390x BuildRequires: make @@ -77,6 +77,9 @@ rm INSTALL %{buildroot}/usr/include/*.h %{_sysconfdir}/ras/dimm_labels.d %config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%dir %{_sysconfdir}/ras/triggers +%{_sysconfdir}/ras/triggers/mc_event_trigger +%{_sysconfdir}/ras/triggers/mem_fail_trigger %changelog * Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/specs/r/rasdaemon/sources b/specs/r/rasdaemon/sources index f50a04579e5..f19e360b791 100644 --- a/specs/r/rasdaemon/sources +++ b/specs/r/rasdaemon/sources @@ -1 +1,2 @@ SHA512 (rasdaemon-0.8.0.tar.bz2) = 3f69bf41ae1efe11c153ffdf736116a78eee7d34dac1148f938e183e5523bc7c2da60af6376a1fc29c113dfad2c4b9798ba3b700f0eca7454f213d86df31c7a9 +SHA512 (rasdaemon-0.8.1.tar.bz2) = 7c227b6ec0b73bd0cf727910f2adc49fc3f5167c41cd4b41d3d7d17b84a4a25681def89c82a275efe5f445049d6b0db8bd35f863384aca9a848b228402917d4d