From 21d46f4397692d883ac45d307b28f6159e6bc363 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 16 Apr 2026 10:43:01 +1000 Subject: [PATCH] rasdaemon: add patch for ras-mc-ctl --- pkgs/by-name/ra/rasdaemon/package.nix | 5 +++++ ..._fix_invalid_column_in_signal_events_query.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix index 7daa019e2466..c8756368c802 100644 --- a/pkgs/by-name/ra/rasdaemon/package.nix +++ b/pkgs/by-name/ra/rasdaemon/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ="; }; + patches = [ + # https://github.com/mchehab/rasdaemon/pull/246 + ./ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch + ]; + strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch new file mode 100644 index 000000000000..88facf5c6001 --- /dev/null +++ b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch @@ -0,0 +1,13 @@ +diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in +index b00c9c1..e56402b 100755 +--- a/util/ras-mc-ctl.in ++++ b/util/ras-mc-ctl.in +@@ -2497,7 +2497,7 @@ sub errors + + # SIGNAL event + if ($has_signal == 1) { +- $query = "select id, timestamp, signal, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id"; ++ $query = "select id, timestamp, sig, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id"; + $query_handle = $dbh->prepare($query); + $query_handle->execute(); + $query_handle->bind_columns(\($id, $timestamp, $signal, $errorno, $code, $comm, $pid, $grp, $res));