diff -Nru dpkg-1.22.6ubuntu4/debian/changelog dpkg-1.22.6ubuntu5/debian/changelog
--- dpkg-1.22.6ubuntu4/debian/changelog	2024-03-18 20:18:27.000000000 +0000
+++ dpkg-1.22.6ubuntu5/debian/changelog	2024-03-26 16:31:13.000000000 +0000
@@ -1,3 +1,9 @@
+dpkg (1.22.6ubuntu5) noble; urgency=medium
+
+  * Use -fcf-protection=none instead of -fno-cf-protection.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 26 Mar 2024 17:31:13 +0100
+
 dpkg (1.22.6ubuntu4) noble; urgency=medium
 
   * Also revert the test case.
diff -Nru dpkg-1.22.6ubuntu4/scripts/Dpkg/Vendor/Ubuntu.pm dpkg-1.22.6ubuntu5/scripts/Dpkg/Vendor/Ubuntu.pm
--- dpkg-1.22.6ubuntu4/scripts/Dpkg/Vendor/Ubuntu.pm	2024-02-27 16:07:32.000000000 +0000
+++ dpkg-1.22.6ubuntu5/scripts/Dpkg/Vendor/Ubuntu.pm	2024-03-26 16:31:09.000000000 +0000
@@ -246,7 +246,7 @@
         if ($cpu eq 'arm64') {
             $flag = '-mbranch-protection=none';
         } elsif ($cpu eq 'amd64') {
-            $flag = '-fno-cf-protection';
+            $flag = '-fcf-protection=none';
         }
         if (defined $flag) {
             $flags->append($_, $flag) foreach @compile_flags;