diff -Nru rasdaemon-0.6.5/debian/changelog rasdaemon-0.6.5/debian/changelog
--- rasdaemon-0.6.5/debian/changelog	2020-07-23 07:51:43.000000000 +1200
+++ rasdaemon-0.6.5/debian/changelog	2023-09-22 12:20:35.000000000 +1200
@@ -1,3 +1,12 @@
+rasdaemon (0.6.5-1ubuntu1.2) focal; urgency=medium
+
+  * Fix an issue where ras-mc-ctl was querying non-existant SQL tables
+    due to the package being built without devlink support, among
+    others. (LP: #1931847)
+    - d/p/lp1931847-Fix-ras-mc-ctl-script.patch
+
+ -- Matthew Ruffell <matthew.ruffell@canonical.com>  Fri, 22 Sep 2023 12:20:35 +1200
+
 rasdaemon (0.6.5-1ubuntu1.1) focal; urgency=medium
 
   * d/p/ras-mc-ctl-PCIe-AER-display-PCIe-dev-name.patch:
diff -Nru rasdaemon-0.6.5/debian/patches/lp1931847-Fix-ras-mc-ctl-script.patch rasdaemon-0.6.5/debian/patches/lp1931847-Fix-ras-mc-ctl-script.patch
--- rasdaemon-0.6.5/debian/patches/lp1931847-Fix-ras-mc-ctl-script.patch	1970-01-01 12:00:00.000000000 +1200
+++ rasdaemon-0.6.5/debian/patches/lp1931847-Fix-ras-mc-ctl-script.patch	2023-09-22 12:16:06.000000000 +1200
@@ -0,0 +1,451 @@
+commit 546cf713f667437fb6e283cc3dc090679eb47d08
+Author: Subhendu Saha <subhends@akamai.com>
+Date: Tue, 12 Jan 2021 03:29:55 -0500
+Subject: Fix ras-mc-ctl script.
+ When rasdaemon is compiled without enabling aer, mce, devlink,
+ etc., those tables are not created in the database file. Then
+ ras-mc-ctl script breaks trying to query data from non-existent
+ tables.
+ 
+ Signed-off-by: Subhendu Saha subhends@akamai.com
+ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+ [mruffell: remove has_arm hunk due to support not landing in this version]
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1931847
+Bug: https://github.com/mchehab/rasdaemon/issues/30
+Origin: backport, https://github.com/mchehab/rasdaemon/commit/546cf713f667437fb6e283cc3dc090679eb47d08
+Last-Update: 2023-09-22
+
+Index: rasdaemon-0.6.5/util/ras-mc-ctl.in
+===================================================================
+--- rasdaemon-0.6.5.orig/util/ras-mc-ctl.in	2023-09-22 12:11:28.816609350 +1200
++++ rasdaemon-0.6.5/util/ras-mc-ctl.in	2023-09-22 12:11:28.812609345 +1200
+@@ -41,6 +41,18 @@
+ my $dmidecode   = find_prog ("dmidecode");
+ my $modprobe    = find_prog ("modprobe")  or exit (1);
+ 
++my $has_aer = 0;
++my $has_devlink = 0;
++my $has_disk_errors = 0;
++my $has_extlog = 0;
++my $has_mce = 0;
++
++@WITH_AER_TRUE@$has_aer = 1;
++@WITH_DEVLINK_TRUE@$has_devlink = 1;
++@WITH_DISKERROR_TRUE@$has_disk_errors = 1;
++@WITH_EXTLOG_TRUE@$has_extlog = 1;
++@WITH_MCE_TRUE@$has_mce = 1;
++
+ my %conf        = ();
+ my %bus         = ();
+ my %dimm_size   = ();
+@@ -1143,86 +1155,96 @@
+     $query_handle->finish;
+ 
+     # PCIe AER aer_event errors
+-    $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($err_type, $msg, $count));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "\t$count $err_type errors: $msg\n";
+-    }
+-    if ($out ne "") {
+-        print "PCIe AER events summary:\n$out\n";
+-    } else {
+-        print "No PCIe AER errors.\n\n";
++    if ($has_aer == 1) {
++        $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($err_type, $msg, $count));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "\t$count $err_type errors: $msg\n";
++        }
++        if ($out ne "") {
++            print "PCIe AER events summary:\n$out\n";
++        } else {
++            print "No PCIe AER errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # extlog errors
+-    $query = "select etype, severity, count(*) from extlog_event group by etype, severity";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($etype, $severity, $count));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $etype_string = get_extlog_type($etype);
+-        $severity_string = get_extlog_severity($severity);
+-        $out .= "\t$count $etype_string $severity_string errors\n";
+-    }
+-    if ($out ne "") {
+-        print "Extlog records summary:\n$out";
+-    } else {
+-        print "No Extlog errors.\n\n";
++    if ($has_extlog == 1) {
++        $query = "select etype, severity, count(*) from extlog_event group by etype, severity";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($etype, $severity, $count));
++        $out = "";
++        while($query_handle->fetch()) {
++            $etype_string = get_extlog_type($etype);
++            $severity_string = get_extlog_severity($severity);
++            $out .= "\t$count $etype_string $severity_string errors\n";
++        }
++        if ($out ne "") {
++            print "Extlog records summary:\n$out";
++        } else {
++            print "No Extlog errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # devlink errors
+-    $query = "select dev_name, count(*) from devlink_event group by dev_name";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($dev_name, $count));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "\t$dev_name has $count errors\n";
+-    }
+-    if ($out ne "") {
+-        print "Devlink records summary:\n$out";
+-    } else {
+-        print "No devlink errors.\n";
++    if ($has_devlink == 1) {
++        $query = "select dev_name, count(*) from devlink_event group by dev_name";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($dev_name, $count));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "\t$dev_name has $count errors\n";
++        }
++        if ($out ne "") {
++            print "Devlink records summary:\n$out";
++        } else {
++            print "No devlink errors.\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # Disk errors
+-    $query = "select dev, count(*) from disk_errors group by dev";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($dev, $count));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "\t$dev has $count errors\n";
+-    }
+-    if ($out ne "") {
+-        print "Disk errors summary:\n$out";
+-    } else {
+-        print "No disk errors.\n";
++    if ($has_disk_errors == 1) {
++        $query = "select dev, count(*) from disk_errors group by dev";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($dev, $count));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "\t$dev has $count errors\n";
++        }
++        if ($out ne "") {
++            print "Disk errors summary:\n$out";
++        } else {
++            print "No disk errors.\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # MCE mce_record errors
+-    $query = "select error_msg, count(*) from mce_record group by error_msg";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($msg, $count));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "\t$count $msg errors\n";
+-    }
+-    if ($out ne "") {
+-        print "MCE records summary:\n$out";
+-    } else {
+-        print "No MCE errors.\n";
++    if ($has_mce == 1) {
++        $query = "select error_msg, count(*) from mce_record group by error_msg";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($msg, $count));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "\t$count $msg errors\n";
++        }
++        if ($out ne "") {
++            print "MCE records summary:\n$out";
++        } else {
++            print "No MCE errors.\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     undef($dbh);
+ }
+@@ -1259,128 +1281,138 @@
+     $query_handle->finish;
+ 
+     # PCIe AER aer_event errors
+-    $query = "select id, timestamp, dev_name, err_type, err_msg from aer_event order by id";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($id, $time, $devname, $type, $msg));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "$id $time $devname $type error: $msg\n";
+-    }
+-    if ($out ne "") {
+-        print "PCIe AER events:\n$out\n";
+-    } else {
+-        print "No PCIe AER errors.\n\n";
++    if ($has_aer == 1) {
++        $query = "select id, timestamp, dev_name, err_type, err_msg from aer_event order by id";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($id, $time, $devname, $type, $msg));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "$id $time $devname $type error: $msg\n";
++        }
++        if ($out ne "") {
++            print "PCIe AER events:\n$out\n";
++        } else {
++            print "No PCIe AER errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # Extlog errors
+-    $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event order by id";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($id, $timestamp, $etype, $severity, $addr, $fru_id, $fru_text, $cper_data));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $etype_string = get_extlog_type($etype);
+-        $severity_string = get_extlog_severity($severity);
+-        $out .= "$id $timestamp error: ";
+-        $out .= "type=$etype_string, ";
+-        $out .= "severity=$severity_string, ";
+-        $out .= sprintf "address=0x%08x, ", $addr;
+-        $out .= sprintf "fru_id=%s, ", get_uuid_le($fru_id);
+-        $out .= "fru_text='$fru_text', ";
+-        $out .= get_cper_data_text($cper_data) if ($cper_data);
+-        $out .= "\n";
+-    }
+-    if ($out ne "") {
+-        print "Extlog events:\n$out\n";
+-    } else {
+-        print "No Extlog errors.\n\n";
++    if ($has_extlog == 1) {
++        $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event order by id";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($id, $timestamp, $etype, $severity, $addr, $fru_id, $fru_text, $cper_data));
++        $out = "";
++        while($query_handle->fetch()) {
++            $etype_string = get_extlog_type($etype);
++            $severity_string = get_extlog_severity($severity);
++            $out .= "$id $timestamp error: ";
++            $out .= "type=$etype_string, ";
++            $out .= "severity=$severity_string, ";
++            $out .= sprintf "address=0x%08x, ", $addr;
++            $out .= sprintf "fru_id=%s, ", get_uuid_le($fru_id);
++            $out .= "fru_text='$fru_text', ";
++            $out .= get_cper_data_text($cper_data) if ($cper_data);
++            $out .= "\n";
++        }
++        if ($out ne "") {
++            print "Extlog events:\n$out\n";
++        } else {
++            print "No Extlog errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # devlink errors
+-    $query = "select id, timestamp, bus_name, dev_name, driver_name, reporter_name, msg from devlink_event order by id";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($id, $timestamp, $bus_name, $dev_name, $driver_name, $reporter_name, $msg));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "$id $timestamp error: ";
+-        $out .= "bus_name=$bus_name, ";
+-        $out .= "dev_name=$dev_name, ";
+-        $out .= "driver_name=$driver_name, ";
+-        $out .= "reporter_name=$reporter_name, ";
+-        $out .= "message='$msg', ";
+-        $out .= "\n";
+-    }
+-    if ($out ne "") {
+-        print "Devlink events:\n$out\n";
+-    } else {
+-        print "No devlink errors.\n\n";
++    if ($has_devlink == 1) {
++        $query = "select id, timestamp, bus_name, dev_name, driver_name, reporter_name, msg from devlink_event order by id";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($id, $timestamp, $bus_name, $dev_name, $driver_name, $reporter_name, $msg));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "$id $timestamp error: ";
++            $out .= "bus_name=$bus_name, ";
++            $out .= "dev_name=$dev_name, ";
++            $out .= "driver_name=$driver_name, ";
++            $out .= "reporter_name=$reporter_name, ";
++            $out .= "message='$msg', ";
++            $out .= "\n";
++        }
++        if ($out ne "") {
++            print "Devlink events:\n$out\n";
++        } else {
++            print "No devlink errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # Disk errors
+-    $query = "select id, timestamp, dev, sector, nr_sector, error, rwbs, cmd from disk_errors order by id";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($id, $timestamp, $dev, $sector, $nr_sector, $error, $rwbs, $cmd));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "$id $timestamp error: ";
+-        $out .= "dev=$dev, ";
+-        $out .= "sector=$sector, ";
+-        $out .= "nr_sector=$nr_sector, ";
+-        $out .= "error='$error', ";
+-        $out .= "rwbs='$rwbs', ";
+-        $out .= "cmd='$cmd', ";
+-        $out .= "\n";
+-    }
+-    if ($out ne "") {
+-        print "Disk errors\n$out\n";
+-    } else {
+-        print "No disk errors.\n\n";
++    if ($has_disk_errors == 1) {
++        $query = "select id, timestamp, dev, sector, nr_sector, error, rwbs, cmd from disk_errors order by id";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($id, $timestamp, $dev, $sector, $nr_sector, $error, $rwbs, $cmd));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "$id $timestamp error: ";
++            $out .= "dev=$dev, ";
++            $out .= "sector=$sector, ";
++            $out .= "nr_sector=$nr_sector, ";
++            $out .= "error='$error', ";
++            $out .= "rwbs='$rwbs', ";
++            $out .= "cmd='$cmd', ";
++            $out .= "\n";
++        }
++        if ($out ne "") {
++            print "Disk errors\n$out\n";
++        } else {
++            print "No disk errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     # MCE mce_record errors
+-    $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record order by id";
+-    $query_handle = $dbh->prepare($query);
+-    $query_handle->execute();
+-    $query_handle->bind_columns(\($id, $time, $mcgcap,$mcgstatus, $status, $addr, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $msg, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location));
+-    $out = "";
+-    while($query_handle->fetch()) {
+-        $out .= "$id $time error: $msg";
+-	$out .= ", CPU $cpuvendor" if ($cpuvendor);
+-	$out .= ", bank $bank_name" if ($bank_name);
+-	$out .= ", mcg $mcgstatus_msg" if ($mcgstatus_msg);
+-	$out .= ", mci $mcistatus_msg" if ($mcistatus_msg);
+-	$out .= ", $mc_location" if ($mc_location);
+-	$out .= ", $user_action" if ($user_action);
+-	$out .= sprintf ", mcgcap=0x%08x", $mcgcap if ($mcgcap);
+-	$out .= sprintf ", mcgstatus=0x%08x", $mcgstatus if ($mcgstatus);
+-	$out .= sprintf ", status=0x%08x", $status if ($status);
+-	$out .= sprintf ", addr=0x%08x", $addr if ($addr);
+-	$out .= sprintf ", misc=0x%08x", $misc if ($misc);
+-	$out .= sprintf ", ip=0x%08x", $ip if ($ip);
+-	$out .= sprintf ", tsc=0x%08x", $tsc if ($tsc);
+-	$out .= sprintf ", walltime=0x%08x", $walltime if ($walltime);
+-	$out .= sprintf ", cpu=0x%08x", $cpu if ($cpu);
+-	$out .= sprintf ", cpuid=0x%08x", $cpuid if ($cpuid);
+-	$out .= sprintf ", apicid=0x%08x", $apicid if ($apicid);
+-	$out .= sprintf ", socketid=0x%08x", $socketid if ($socketid);
+-	$out .= sprintf ", cs=0x%08x", $cs if ($cs);
+-	$out .= sprintf ", bank=0x%08x", $bank if ($bank);
++    if ($has_mce == 1) {
++        $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record order by id";
++        $query_handle = $dbh->prepare($query);
++        $query_handle->execute();
++        $query_handle->bind_columns(\($id, $time, $mcgcap,$mcgstatus, $status, $addr, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $msg, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location));
++        $out = "";
++        while($query_handle->fetch()) {
++            $out .= "$id $time error: $msg";
++	    $out .= ", CPU $cpuvendor" if ($cpuvendor);
++	    $out .= ", bank $bank_name" if ($bank_name);
++	    $out .= ", mcg $mcgstatus_msg" if ($mcgstatus_msg);
++	    $out .= ", mci $mcistatus_msg" if ($mcistatus_msg);
++	    $out .= ", $mc_location" if ($mc_location);
++	    $out .= ", $user_action" if ($user_action);
++	    $out .= sprintf ", mcgcap=0x%08x", $mcgcap if ($mcgcap);
++	    $out .= sprintf ", mcgstatus=0x%08x", $mcgstatus if ($mcgstatus);
++	    $out .= sprintf ", status=0x%08x", $status if ($status);
++	    $out .= sprintf ", addr=0x%08x", $addr if ($addr);
++	    $out .= sprintf ", misc=0x%08x", $misc if ($misc);
++	    $out .= sprintf ", ip=0x%08x", $ip if ($ip);
++	    $out .= sprintf ", tsc=0x%08x", $tsc if ($tsc);
++	    $out .= sprintf ", walltime=0x%08x", $walltime if ($walltime);
++	    $out .= sprintf ", cpu=0x%08x", $cpu if ($cpu);
++	    $out .= sprintf ", cpuid=0x%08x", $cpuid if ($cpuid);
++	    $out .= sprintf ", apicid=0x%08x", $apicid if ($apicid);
++	    $out .= sprintf ", socketid=0x%08x", $socketid if ($socketid);
++	    $out .= sprintf ", cs=0x%08x", $cs if ($cs);
++	    $out .= sprintf ", bank=0x%08x", $bank if ($bank);
+ 
+-	$out .= "\n";
+-    }
+-    if ($out ne "") {
+-        print "MCE events:\n$out\n";
+-    } else {
+-        print "No MCE errors.\n\n";
++	    $out .= "\n";
++        }
++        if ($out ne "") {
++            print "MCE events:\n$out\n";
++        } else {
++            print "No MCE errors.\n\n";
++        }
++        $query_handle->finish;
+     }
+-    $query_handle->finish;
+ 
+     undef($dbh);
+ }
diff -Nru rasdaemon-0.6.5/debian/patches/series rasdaemon-0.6.5/debian/patches/series
--- rasdaemon-0.6.5/debian/patches/series	2020-07-23 07:50:14.000000000 +1200
+++ rasdaemon-0.6.5/debian/patches/series	2023-09-22 12:11:26.000000000 +1200
@@ -5,3 +5,4 @@
 rasdaemon-rename-CPU_NAPLES-cputype.patch
 rasdaemon-add-support-for-new-AMD-SMCA-bank-types.patch
 ras-mc-ctl-PCIe-AER-display-PCIe-dev-name.patch
+lp1931847-Fix-ras-mc-ctl-script.patch