rasdaemon: add patch for ras-mc-ctl (#510461)

nixos/modules/services/hardware/rasdaemon.nix

@@ -10,6 +10,10 @@ let
 
 in
 {
+  meta = {
+    inherit (pkgs.rasdaemon.meta) maintainers;
+  };
+
   options.hardware.rasdaemon = {
 
     enable = lib.mkEnableOption "RAS logging daemon";

nixos/tests/rasdaemon.nix

@@ -1,9 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   name = "rasdaemon";
   meta = {
-    maintainers = [ ];
-    broken = true; # test timed out
+    inherit (pkgs.rasdaemon.meta) maintainers;
   };
 
   nodes.machine =

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;
@@ -122,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     changelog = "${finalAttrs.meta.homepage}/releases/tag/v${finalAttrs.version}";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.zowoq ];
   };
 })

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));