Merge ~paelzer/ubuntu/+source/needrestart:update-jammy-to-git-1965090 into ubuntu/+source/needrestart:ubuntu/jammy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4804
FFE: https://bugs.launchpad.net/ubuntu/+source/needrestart/+bug/1965090
Extra-Bug: https://bugs.launchpad.net/ubuntu/+source/needrestart/+bug/1964445

FFE bug has all kind of extra rational and testing.

[Christian Ehrhardt  (paelzer)]

Got FFe and Foundations Team ack (on MM) - uploading now

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading needrestart_3.5-5ubuntu2.dsc: done.
  Uploading needrestart_3.5-5ubuntu2.debian.tar.xz: done.
  Uploading needrestart_3.5-5ubuntu2_source.buildinfo: done.
  Uploading needrestart_3.5-5ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 916fb2c..b9d6cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+needrestart (3.5-5ubuntu2) jammy; urgency=medium
+
+  * d/p/Jammy-update-to-git*: Update needrestart from git (LP: #1965090)
+    - fixes handling with cgroupv2 for docker and lxd (LP: #1964445)
+    - adds detection of qemu VMs using outdated libs
+    - various minor fixes
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 16 Mar 2022 08:53:23 +0100
+
 needrestart (3.5-5ubuntu1) jammy; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0003-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0003-Update-ChangeLog.patch
new file mode 100644
index 0000000..99b146f
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0003-Update-ChangeLog.patch
@@ -0,0 +1,294 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 0d6728c60799060e04d9bc082910caaf1ccb8ac5
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 0d6728c60799060e04d9bc082910caaf1ccb8ac5 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sun, 5 Jul 2020 10:16:54 +0200
+Subject: [PATCH 03/43] Update ChangeLog.
+
+---
+ ChangeLog | 68 +++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 38 insertions(+), 30 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index b3e7f65..d420a2e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,4 +1,12 @@
+-needrestart (3.5) unstable; urgency=high
++needrestart 3.6
++
++  * Fixes:
++    - [Core] Fix comment for default value of `skip_mapfiles`.
++      (github pull request #179 by @iasdeoupxe)
++
++ -- Thomas Liske <[e-mail]>  
++
++needrestart 3.5
+ 
+   * Features:
+     - [uCode] Check for pending AMD microcode updates (experimental).
+@@ -46,7 +54,7 @@ needrestart (3.5) unstable; urgency=high
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 22 Mar 2020 17:36:57 +0100
+ 
+-needrestart (3.4) unstable; urgency=high
++needrestart 3.4
+ 
+   * Features:
+     - [L10n] Add Czech localization.
+@@ -81,7 +89,7 @@ needrestart (3.4) unstable; urgency=high
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 05 Feb 2019 22:43:12 +0100
+ 
+-needrestart (3.3) unstable; urgency=high
++needrestart 3.3
+ 
+   * Fixes:
+     - [Core] Configuration file is ignored.
+@@ -94,7 +102,7 @@ needrestart (3.3) unstable; urgency=high
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 24 Jun 2018 13:32:47 +0200
+ 
+-needrestart (3.2) unstable; urgency=medium
++needrestart 3.2
+ 
+   * Changes:
+     - [Kernel] Include /boot/kernel* while looking for linux
+@@ -122,7 +130,7 @@ needrestart (3.2) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sat, 16 Jun 2018 17:42:51 +0200
+ 
+-needrestart (3.1) unstable; urgency=high
++needrestart 3.1
+ 
+   * Changes:
+     - [uCode] Handle microcode upgrades in early boot initrd images,
+@@ -139,7 +147,7 @@ needrestart (3.1) unstable; urgency=high
+ 
+  -- Thomas Liske <[e-mail]>  Thu, 29 Mar 2018 23:22:55 +0200
+ 
+-needrestart (3.0) unstable; urgency=medium
++needrestart 3.0
+ 
+   * Features:
+     - [Core] Possible to suspend needrestart in apt-get hook using
+@@ -228,7 +236,7 @@ needrestart (3.0) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Fri, 23 Feb 2018 13:38:46 +0100
+ 
+-needrestart (2.11) unstable; urgency=medium
++needrestart 2.11
+ 
+   * Features:
+     - [Core] Allow special treatment to restart services (i.e. dbus).
+@@ -256,7 +264,7 @@ needrestart (2.11) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 17 Jan 2017 15:59:36 +0100
+ 
+-needrestart (2.10) unstable; urgency=medium
++needrestart 2.10
+ 
+   * Features:
+     - [Interp] Allow ignoring of interpreted files.
+@@ -280,7 +288,7 @@ needrestart (2.10) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Thu, 03 Nov 2016 23:37:05 +0100
+ 
+-needrestart (2.9) unstable; urgency=medium
++needrestart 2.9
+ 
+   * Changes:
+     - [l10n] Add RU translation for notify.d stuff.
+@@ -316,7 +324,7 @@ needrestart (2.9) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sat, 03 Sep 2016 14:52:41 +0200
+ 
+-needrestart (2.8) unstable; urgency=medium
++needrestart 2.8
+ 
+   * Changes:
+     - [Core] Restart SysV init services on systemd using systemctl.
+@@ -354,7 +362,7 @@ needrestart (2.8) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Mon, 16 May 2016 18:45:51 +0200
+ 
+-needrestart (2.7) unstable; urgency=medium
++needrestart 2.7
+ 
+   * [Bug] Ignore init rc being symlinks to upstart-job.
+     (github issue #16 by Jonas Genannt @hggh)
+@@ -376,7 +384,7 @@ needrestart (2.7) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 06 Mar 2016 14:46:45 +0100
+ 
+-needrestart (2.6) unstable; urgency=high
++needrestart 2.6
+ 
+   * [Bug] Do not notify system users via email.
+     (Debian Bug#812399 by Marc Haber <[e-mail]>)
+@@ -389,14 +397,14 @@ needrestart (2.6) unstable; urgency=high
+ 
+  -- Thomas Liske <[e-mail]>  Wed, 17 Feb 2016 22:14:32 +0100
+ 
+-needrestart (2.5) unstable; urgency=medium
++needrestart 2.5
+ 
+   * [Bug] Fix broken kernel detection due to syntax error.
+     (Debian Bug#810031 by Martin Steigerwald <[e-mail]>)
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 05 Jan 2016 23:17:53 +0100
+ 
+-needrestart (2.4) unstable; urgency=medium
++needrestart 2.4
+ 
+   * [Bug] Drop unused dependency on File::Slurp.
+     (Debian Bug#799733 by Christoph Anton Mitterer <[e-mail]>)
+@@ -413,7 +421,7 @@ needrestart (2.4) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Fri, 01 Jan 2016 21:54:47 +0100
+ 
+-needrestart (2.3) unstable; urgency=medium
++needrestart 2.3
+ 
+   * [Bug] Add lightdm to override.
+     (Debian Bug#791649 by Martin Steigerwald <[e-mail]>)
+@@ -434,7 +442,7 @@ needrestart (2.3) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sat, 19 Sep 2015 20:38:19 +0200
+ 
+-needrestart (2.2) unstable; urgency=medium
++needrestart 2.2
+ 
+   * [regression] Processes using chroot were always detected as obsolete
+     since missing binaries in /proc/PID/root/.
+@@ -442,7 +450,7 @@ needrestart (2.2) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 26 May 2015 23:56:11 +0200
+ 
+-needrestart (2.1) unstable; urgency=medium
++needrestart 2.1
+ 
+   * [Bug] Ignore /usr/bin/apt-get.
+     (Debian Bug#784237 by Thijs Kinkhorst <[e-mail]>)
+@@ -476,7 +484,7 @@ needrestart (2.1) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Fri, 22 May 2015 01:45:17 +0200
+ 
+-needrestart (2.0) unstable; urgency=medium
++needrestart 2.0
+ 
+   * [regression] List commands in list mode.
+     (Debian Bug#764042 by Paul Wise <[e-mail]>)
+@@ -502,7 +510,7 @@ needrestart (2.0) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Fri, 23 Jan 2015 00:46:13 +0100
+ 
+-needrestart (1.2) unstable; urgency=medium
++needrestart 1.2
+ 
+   * Prepare po-debconf usage and add German translation.
+     (Debian Bug#761068 by David Prévot <[e-mail]>)
+@@ -522,7 +530,7 @@ needrestart (1.2) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 28 Sep 2014 23:48:42 +0200
+ 
+-needrestart (1.1) unstable; urgency=medium
++needrestart 1.1
+ 
+   * Ignore DHCP clients.
+     (Debian Bug#752111 by Axel Beckert <[e-mail]>)
+@@ -531,7 +539,7 @@ needrestart (1.1) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sat, 16 Aug 2014 09:57:29 +0200
+ 
+-needrestart (1.0) unstable; urgency=medium
++needrestart 1.0
+ 
+   * Fix grammar errors and use a additional debconf template.
+     (Debian Bug#748652 by Justin B Rye <[e-mail]>)
+@@ -554,7 +562,7 @@ needrestart (1.0) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 17 Jun 2014 15:21:15 +0200
+ 
+-needrestart (0.9) unstable; urgency=medium
++needrestart 0.9
+ 
+   * Drop external dependency on strings command from binutils.
+   * Fix "uninitialized value" by apparent kernel threads.
+@@ -573,7 +581,7 @@ needrestart (0.9) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 11 May 2014 22:48:42 +0200
+ 
+-needrestart (0.8) unstable; urgency=low
++needrestart 0.8
+ 
+   * Fix non-numeric argument on progress_prep call.
+     (Debian Bug#744961 by Cristian Ionescu-Idbohrn
+@@ -591,7 +599,7 @@ needrestart (0.8) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Sun, 27 Apr 2014 10:15:35 +0200
+ 
+-needrestart (0.7) unstable; urgency=medium
++needrestart 0.7
+ 
+   * Improved rc script detection, e.g.: previous releases failed to
+     detect apache2's init script after upgrading libssl1.0.0.
+@@ -616,7 +624,7 @@ needrestart (0.7) unstable; urgency=medium
+ 
+  -- Thomas Liske <[e-mail]>  Mon, 14 Apr 2014 21:50:15 +0200
+ 
+-needrestart (0.6) unstable; urgency=low
++needrestart 0.6
+ 
+   * Add lightdm to blacklist.
+     (Debian Bug#735027 by Michael Gilbert <[e-mail]>)
+@@ -630,7 +638,7 @@ needrestart (0.6) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Mon, 07 Apr 2014 22:52:18 +0200
+ 
+-needrestart (0.5) unstable; urgency=low
++needrestart 0.5
+ 
+   * Ignore mapped files in /tmp.
+   * Handle LSB tags case insensitivly.
+@@ -642,7 +650,7 @@ needrestart (0.5) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Thu, 02 Jan 2014 19:55:49 +0100
+ 
+-needrestart (0.4) unstable; urgency=low
++needrestart 0.4
+ 
+   * Fix spelling:
+     - typo in debconf template (s/restartet/restarted/;)
+@@ -663,7 +671,7 @@ needrestart (0.4) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Thu, 28 Nov 2013 19:30:06 +0100
+ 
+-needrestart (0.3) unstable; urgency=low
++needrestart 0.3
+ 
+   * Fix typo reported by Patrick Matthäi.
+   * Add man page provided by Patrick Matthäi (Debian).
+@@ -681,7 +689,7 @@ needrestart (0.3) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Sat, 14 Sep 2013 12:55:16 +0200
+ 
+-needrestart (0.2) unstable; urgency=low
++needrestart 0.2
+ 
+   * Support (l)ist only, (i)nteractive restart and
+     (a)utomaticly restart modes.
+@@ -693,7 +701,7 @@ needrestart (0.2) unstable; urgency=low
+ 
+  -- Thomas Liske <[e-mail]>  Tue, 02 Apr 2013 21:51:48 +0200
+ 
+-needrestart (0.1) unstable; urgency=low
++needrestart 0.1
+ 
+   * Initial release.
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0004-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0004-Update-ChangeLog.patch
new file mode 100644
index 0000000..9d76f9a
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0004-Update-ChangeLog.patch
@@ -0,0 +1,29 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, fabe313cd38937f3cfaf360411dfdf1ded15d395
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From fabe313cd38937f3cfaf360411dfdf1ded15d395 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sun, 5 Jul 2020 10:21:38 +0200
+Subject: [PATCH 04/43] Update ChangeLog.
+
+---
+ ChangeLog | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index d420a2e..3500dbe 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -3,6 +3,8 @@ needrestart 3.6
+   * Fixes:
+     - [Core] Fix comment for default value of `skip_mapfiles`.
+       (github pull request #179 by @iasdeoupxe)
++    - [Interp] Fix detection for ruby script started from relative paths.
++      (github pull request #182 by Alexander Neumann @rtpt-alex)
+ 
+  -- Thomas Liske <[e-mail]>  
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0005-Fix-typo.patch b/debian/patches/Jammy-update-to-git-eb3531af-0005-Fix-typo.patch
new file mode 100644
index 0000000..220b132
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0005-Fix-typo.patch
@@ -0,0 +1,29 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, e17fdb6aed5e60aa08583c3256df11b97667fa4d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From e17fdb6aed5e60aa08583c3256df11b97667fa4d Mon Sep 17 00:00:00 2001
+From: wwuck <[e-mail]>
+Date: Thu, 9 Jul 2020 11:39:26 +1000
+Subject: [PATCH 05/43] Fix typo
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index feffaf6..6c309b7 100644
+--- a/README.md
++++ b/README.md
+@@ -34,7 +34,7 @@ hooks support the following package managers:
+ * *rpm*
+ * *pacman*
+ 
+-The *service* command is used to run the tradiditional System V init script.
++The *service* command is used to run the traditional System V init script.
+ 
+ 
+ Frontends
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0006-Support-LXD-installed-through-snap.patch b/debian/patches/Jammy-update-to-git-eb3531af-0006-Support-LXD-installed-through-snap.patch
new file mode 100644
index 0000000..4a42d8e
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0006-Support-LXD-installed-through-snap.patch
@@ -0,0 +1,59 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 63cf8b28eb9083d2ef33dd3fa631e34415f5c342
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 63cf8b28eb9083d2ef33dd3fa631e34415f5c342 Mon Sep 17 00:00:00 2001
+From: James TD Smith <[e-mail]>
+Date: Tue, 22 Oct 2019 15:15:03 +0100
+Subject: [PATCH 06/43] Support LXD installed through snap
+
+This is the recommended way to install LXD and puts the container dirs in
+/var/snap/lxd/common/lxd/containers instead of /var/lib/lxd/containers.
+---
+ perl/lib/NeedRestart/CONT/LXC.pm | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
+index c3b091d..2a7dd6c 100644
+--- a/perl/lib/NeedRestart/CONT/LXC.pm
++++ b/perl/lib/NeedRestart/CONT/LXC.pm
+@@ -45,7 +45,16 @@ sub new {
+     $self->{lxc} = {};
+     $self->{lxd} = {};
+ 
+-    $self->{has_lxd} = -x q(/usr/bin/lxc);
++    if (-d q(/snap/lxd)) {
++	$self->{has_lxd} = 1;
++	$self->{lxd_bin} = q(/snap/bin/lxc);
++	$self->{lxd_container_path} = q(/var/snap/lxd/common/lxd/containers);
++	print STDERR "$LOGPREF LXD installed via snap\n" if($self->{debug});
++    } else {
++	$self->{has_lxd} = -x q(/usr/bin/lxc);
++	$self->{lxd_bin} = q(/usr/bin/lxc);
++	$self->{lxd_container_path} = q(/var/lib/lxd/containers);
++    }
+ 
+     return bless $self, $class;
+ }
+@@ -75,7 +84,8 @@ sub check {
+     return unless($cg =~ /^\d+:[^:]+:\/lxc\/([^\/\n]+)($|\/)/m);
+ 
+     my $name = $1;
+-    my $type = ($self->{has_lxd} && -d qq(/var/lib/lxd/containers/$name) ? 'LXD' : 'LXC');
++    my $type = ($self->{has_lxd} && -d qq($self->{lxd_container_path}/$name) ? 'LXD' : 'LXC');
++
+     unless($norestart) {
+ 	print STDERR "$LOGPREF #$pid is part of $type container '$name' and should be restarted\n" if($self->{debug});
+ 
+@@ -94,7 +104,7 @@ sub get {
+     return (map {
+ 	($_ => [qw(lxc-stop --reboot --name), $_]);
+     } keys %{ $self->{lxc} }), (map {
+-	($_ => [qw(lxc restart), $_]);
++	($_ => [ $self->{lxd_bin}, "restart", $_]);
+     } keys %{ $self->{lxd} });
+ }
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0007-Handle-differences-in-cgroup-names-for-LXD-container.patch b/debian/patches/Jammy-update-to-git-eb3531af-0007-Handle-differences-in-cgroup-names-for-LXD-container.patch
new file mode 100644
index 0000000..c2eadaa
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0007-Handle-differences-in-cgroup-names-for-LXD-container.patch
@@ -0,0 +1,31 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 1f1bd6d4c539ec70ecfdb7efe69c37386475a71e
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 1f1bd6d4c539ec70ecfdb7efe69c37386475a71e Mon Sep 17 00:00:00 2001
+From: James TD Smith <[e-mail]>
+Date: Tue, 22 Oct 2019 15:16:32 +0100
+Subject: [PATCH 07/43] Handle differences in cgroup names for LXD containers
+
+LXC containers on newer versions of LXC are under the lxc.payload cgroup, update
+the cgroup regex to match this too.
+---
+ perl/lib/NeedRestart/CONT/LXC.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
+index 2a7dd6c..53a4dda 100644
+--- a/perl/lib/NeedRestart/CONT/LXC.pm
++++ b/perl/lib/NeedRestart/CONT/LXC.pm
+@@ -81,7 +81,7 @@ sub check {
+     }
+ 
+     # look for LXC cgroups
+-    return unless($cg =~ /^\d+:[^:]+:\/lxc\/([^\/\n]+)($|\/)/m);
++    return unless($cg =~ /^\d+:[^:]+:\/lxc(?:.payload)?\/([^\/\n]+)($|\/)/m);
+ 
+     my $name = $1;
+     my $type = ($self->{has_lxd} && -d qq($self->{lxd_container_path}/$name) ? 'LXD' : 'LXC');
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0008-Fix-restarting-for-containers-in-LXD-projects.patch b/debian/patches/Jammy-update-to-git-eb3531af-0008-Fix-restarting-for-containers-in-LXD-projects.patch
new file mode 100644
index 0000000..3c6e70c
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0008-Fix-restarting-for-containers-in-LXD-projects.patch
@@ -0,0 +1,44 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 569d8d5fda5a4723a94be6b474eccd6c24ec5474
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 569d8d5fda5a4723a94be6b474eccd6c24ec5474 Mon Sep 17 00:00:00 2001
+From: James TD Smith <[e-mail]>
+Date: Tue, 22 Oct 2019 15:36:17 +0100
+Subject: [PATCH 08/43] Fix restarting for containers in LXD projects
+
+Check if containers are in a project and add the appropriate parameter to the
+restart command.
+---
+ perl/lib/NeedRestart/CONT/LXC.pm | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
+index 53a4dda..283d628 100644
+--- a/perl/lib/NeedRestart/CONT/LXC.pm
++++ b/perl/lib/NeedRestart/CONT/LXC.pm
+@@ -101,10 +101,20 @@ sub check {
+ sub get {
+     my $self = shift;
+ 
++    sub lxd_restart_with_project {
++	my ($bin, $container) = @_;
++	my @parts = split(/_/, $container);
++	if ($#parts == 1) {
++	    return [ $bin, 'restart', qq(--project=$parts[0]), $parts[1] ];
++	} else {
++	    [ $bin, 'restart', $container ]
++	}
++    }
++
+     return (map {
+ 	($_ => [qw(lxc-stop --reboot --name), $_]);
+     } keys %{ $self->{lxc} }), (map {
+-	($_ => [ $self->{lxd_bin}, "restart", $_]);
++	($_ => lxd_restart_with_project($self->{lxd_bin}, $_));
+     } keys %{ $self->{lxd} });
+ }
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0009-Update-documentation-for-LXC-LXD-support.patch b/debian/patches/Jammy-update-to-git-eb3531af-0009-Update-documentation-for-LXC-LXD-support.patch
new file mode 100644
index 0000000..de45e90
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0009-Update-documentation-for-LXC-LXD-support.patch
@@ -0,0 +1,35 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 58d0d1609ac0c8e0588850ec416727f1365b438e
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 58d0d1609ac0c8e0588850ec416727f1365b438e Mon Sep 17 00:00:00 2001
+From: James TD Smith <[e-mail]>
+Date: Tue, 22 Oct 2019 15:47:09 +0100
+Subject: [PATCH 09/43] Update documentation for LXC/LXD support
+
+---
+ README.Cont.md | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/README.Cont.md b/README.Cont.md
+index e2c06ec..dbc39df 100644
+--- a/README.Cont.md
++++ b/README.Cont.md
+@@ -21,11 +21,13 @@ within docker containers by design.
+ NeedRestart::CONT::LXC
+ ----------------------
+ 
+-Recognized by:	cgroup path (`/lxc/*`)
++Recognized by:	cgroup path (`/lxc/*` || `/lxc.payload/*`)
+ 
+ For each container which should be restarted needrestart calls
+ `lxc-stop --reboot --name $NAME`.
+ 
++This package also supports LXD containers, which are restarted by `lxc restart
++$NAME` or `lxc restart --project=$PROJECT $NAME` for containers in projects.
+ 
+ NeedRestart::CONT::machined
+ ---------------------------
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0010-Fix-typo-in-German-translation.patch b/debian/patches/Jammy-update-to-git-eb3531af-0010-Fix-typo-in-German-translation.patch
new file mode 100644
index 0000000..fcf28c6
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0010-Fix-typo-in-German-translation.patch
@@ -0,0 +1,30 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 712f2a30ae576745873e006e54fa49bcb81f3399
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 712f2a30ae576745873e006e54fa49bcb81f3399 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <[e-mail]>
+Date: Thu, 3 Sep 2020 10:49:49 +0200
+Subject: [PATCH 10/43] Fix typo in German translation
+
+Signed-off-by: Stefan Weil <[e-mail]>
+---
+ ex/debconf/po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ex/debconf/po/de.po b/ex/debconf/po/de.po
+index 091ccbc..f8d06a8 100644
+--- a/ex/debconf/po/de.po
++++ b/ex/debconf/po/de.po
+@@ -113,7 +113,7 @@ msgid ""
+ "not the expected microcode revision ${AVAIL}."
+ msgstr ""
+ "Die laufende Prozessor Mikrocode-Revision ist ${CURRENT}, es wird jedoch die "
+-"Revision ${AVAIL} erwaret."
++"Revision ${AVAIL} erwartet."
+ 
+ #. Type: note
+ #. Description
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0011-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0011-Update-ChangeLog.patch
new file mode 100644
index 0000000..e049737
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0011-Update-ChangeLog.patch
@@ -0,0 +1,34 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 86802ac6e1eba092b4a27ffb28503083cce47ebc
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 86802ac6e1eba092b4a27ffb28503083cce47ebc Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sat, 19 Sep 2020 19:26:10 +0200
+Subject: [PATCH 11/43] Update ChangeLog.
+
+---
+ ChangeLog | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3500dbe..046bceb 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -5,6 +5,13 @@ needrestart 3.6
+       (github pull request #179 by @iasdeoupxe)
+     - [Interp] Fix detection for ruby script started from relative paths.
+       (github pull request #182 by Alexander Neumann @rtpt-alex)
++    - [Cont] Improve LXD container support.
++      (github pull request #188 by James TD Smith @ahktenzero)
++
++  * Fixes:
++    - [Core] Fix typos.
++      (github pull request #189 by @wwuck)
++      (github pull request #193 by Stefan Weil @stweil)
+ 
+  -- Thomas Liske <[e-mail]>  
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0012-systemd-manager-restart-Support-also-exe-usr-lib-sys.patch b/debian/patches/Jammy-update-to-git-eb3531af-0012-systemd-manager-restart-Support-also-exe-usr-lib-sys.patch
new file mode 100644
index 0000000..6ff991c
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0012-systemd-manager-restart-Support-also-exe-usr-lib-sys.patch
@@ -0,0 +1,33 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 534513f31a8ee8ec60ee5acf842eeee6b0e86021
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 534513f31a8ee8ec60ee5acf842eeee6b0e86021 Mon Sep 17 00:00:00 2001
+From: Lars Kollstedt <[e-mail]>
+Date: Fri, 23 Oct 2020 16:47:13 +0200
+Subject: [PATCH 12/43] systemd-manager restart: Support also exe =>
+ /usr/lib/systemd/systemd
+
+In some cases especially Ubuntu 20.4 focal fossa the systemd process is
+/usr/lib/systemd/systemd not /lib/systemd/systemd. That leads to
+/etc/needrestart/restart.d/systemd-manager not beeing triggered.
+---
+ needrestart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/needrestart b/needrestart
+index d5c94fd..ec3cfad 100755
+--- a/needrestart
++++ b/needrestart
+@@ -623,7 +623,7 @@ if(defined($opt_l)) {
+ 
+ 	    if($is_systemd) {
+ 		# systemd manager
+-		if($pid == 1 && $exe =~ m@^/lib/systemd/systemd@) {
++		if($pid == 1 && $exe =~ m@^(/usr)?/lib/systemd/systemd@) {
+ 		    print STDERR "$LOGPREF #$pid is systemd manager\n" if($nrconf{verbosity} > 1);
+ 		    $restart{q(systemd-manager)}++;
+ 		    next;
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0014-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0014-Update-ChangeLog.patch
new file mode 100644
index 0000000..57f6b9e
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0014-Update-ChangeLog.patch
@@ -0,0 +1,43 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 8af1eecd359339b6a52ede6fd6db2b0e7510fd94
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 8af1eecd359339b6a52ede6fd6db2b0e7510fd94 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Thu, 29 Oct 2020 19:22:31 +0100
+Subject: [PATCH 14/43] Update ChangeLog.
+
+---
+ ChangeLog | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 046bceb..1af55b8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,14 +1,18 @@
+ needrestart 3.6
+ 
++  * Features:
++    - [Core] Add support for runit.
++      (Debian Bug#972685 by Lorenzo Puliti <[e-mail]>)
++
++  * Changes:
++    - [Cont] Improve LXD container support.
++      (github pull request #188 by James TD Smith @ahktenzero)
++
+   * Fixes:
+     - [Core] Fix comment for default value of `skip_mapfiles`.
+       (github pull request #179 by @iasdeoupxe)
+     - [Interp] Fix detection for ruby script started from relative paths.
+       (github pull request #182 by Alexander Neumann @rtpt-alex)
+-    - [Cont] Improve LXD container support.
+-      (github pull request #188 by James TD Smith @ahktenzero)
+-
+-  * Fixes:
+     - [Core] Fix typos.
+       (github pull request #189 by @wwuck)
+       (github pull request #193 by Stefan Weil @stweil)
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0015-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0015-Update-ChangeLog.patch
new file mode 100644
index 0000000..afa9bcd
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0015-Update-ChangeLog.patch
@@ -0,0 +1,29 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, cecbe20782912cf88c19a35be2fdc4e16fe2e71f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From cecbe20782912cf88c19a35be2fdc4e16fe2e71f Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Thu, 29 Oct 2020 19:34:54 +0100
+Subject: [PATCH 15/43] Update ChangeLog.
+
+---
+ ChangeLog | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 1af55b8..21a4eaa 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -7,6 +7,8 @@ needrestart 3.6
+   * Changes:
+     - [Cont] Improve LXD container support.
+       (github pull request #188 by James TD Smith @ahktenzero)
++    - [Core] Support systemd manager restart on Ubuntu 20.04+.
++      (github pull request #195 by Lars Kollstedt @LarsKollstedt)
+ 
+   * Fixes:
+     - [Core] Fix comment for default value of `skip_mapfiles`.
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0017-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0017-Update-ChangeLog.patch
new file mode 100644
index 0000000..2a994d8
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0017-Update-ChangeLog.patch
@@ -0,0 +1,29 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 0a437275787f47a2af8d78d7463556b33a7ba1c0
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 0a437275787f47a2af8d78d7463556b33a7ba1c0 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Mon, 23 Nov 2020 23:03:08 +0100
+Subject: [PATCH 17/43] Update ChangeLog.
+
+---
+ ChangeLog | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index 21a4eaa..f8affd8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -18,6 +18,8 @@ needrestart 3.6
+     - [Core] Fix typos.
+       (github pull request #189 by @wwuck)
+       (github pull request #193 by Stefan Weil @stweil)
++    - [Core] Fix verbose/verbosity confusion in needrestart.conf.
++      (github pull request #197 by Jan-Philipp Litza @jplitza)
+ 
+  -- Thomas Liske <[e-mail]>  
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0020-Update-LXC-D-cgroup-regex-for-LXC-4.0.patch b/debian/patches/Jammy-update-to-git-eb3531af-0020-Update-LXC-D-cgroup-regex-for-LXC-4.0.patch
new file mode 100644
index 0000000..6fd4bd6
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0020-Update-LXC-D-cgroup-regex-for-LXC-4.0.patch
@@ -0,0 +1,31 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, d2c4096902ffd307823fcb58e31059e030fdcf48
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From d2c4096902ffd307823fcb58e31059e030fdcf48 Mon Sep 17 00:00:00 2001
+From: James TD Smith <[e-mail]>
+Date: Tue, 6 Jul 2021 16:54:30 +0100
+Subject: [PATCH 20/43] Update LXC/D cgroup regex for LXC 4.0
+
+LXC 4.0 uses a flattened cgroup hierarchy (/lxc.payload.container1 vs
+/lxc.payload/container1), update the regex to also match these names.
+---
+ perl/lib/NeedRestart/CONT/LXC.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
+index 283d628..3f522ae 100644
+--- a/perl/lib/NeedRestart/CONT/LXC.pm
++++ b/perl/lib/NeedRestart/CONT/LXC.pm
+@@ -81,7 +81,7 @@ sub check {
+     }
+ 
+     # look for LXC cgroups
+-    return unless($cg =~ /^\d+:[^:]+:\/lxc(?:.payload)?\/([^\/\n]+)($|\/)/m);
++    return unless($cg =~ /^\d+:[^:]+:\/lxc(?:.payload)?[.\/]([^\/\n]+)($|\/)/m);
+ 
+     my $name = $1;
+     my $type = ($self->{has_lxd} && -d qq($self->{lxd_container_path}/$name) ? 'LXD' : 'LXC');
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0021-Do-not-restart-elogind-by-default-205.patch b/debian/patches/Jammy-update-to-git-eb3531af-0021-Do-not-restart-elogind-by-default-205.patch
new file mode 100644
index 0000000..94fce56
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0021-Do-not-restart-elogind-by-default-205.patch
@@ -0,0 +1,28 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 48fdf7055b42790238306e18bd3e5758200d879f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 48fdf7055b42790238306e18bd3e5758200d879f Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sat, 18 Sep 2021 11:31:46 +0200
+Subject: [PATCH 21/43] Do not restart elogind by default (#205).
+
+---
+ ex/needrestart.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index 4b2f6cb..b2d27a6 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -115,6 +115,7 @@ $nrconf{override_rc} = {
+     # (see also Debian Bug#784238 & #784437)
+     qr(^emergency\.service$) => 0,
+     qr(^rescue\.service$) => 0,
++    qr(^elogind) => 0,
+ 
+     # do not restart oneshot services, see also #862840
+     qr(^apt-daily\.service$) => 0,
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0022-Update-ChangeLog.patch b/debian/patches/Jammy-update-to-git-eb3531af-0022-Update-ChangeLog.patch
new file mode 100644
index 0000000..76df37b
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0022-Update-ChangeLog.patch
@@ -0,0 +1,44 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 12a75cdbd78ca85cd2dae9fa1307afbb1c40a019
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 12a75cdbd78ca85cd2dae9fa1307afbb1c40a019 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sat, 18 Sep 2021 12:01:23 +0200
+Subject: [PATCH 22/43] Update ChangeLog.
+
+---
+ ChangeLog | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index f8affd8..ba99976 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -7,8 +7,14 @@ needrestart 3.6
+   * Changes:
+     - [Cont] Improve LXD container support.
+       (github pull request #188 by James TD Smith @ahktenzero)
++    - [Cont] Update cgroup regex for LXC 4.0.
++      (github pull request #215 by James TD Smith @ahktenzero)
+     - [Core] Support systemd manager restart on Ubuntu 20.04+.
+       (github pull request #195 by Lars Kollstedt @LarsKollstedt)
++    - [Core] Do not restart bluetooth.service by default.
++      (github pull request #209 by Erik Tews @eriktews)
++    - [Core] Do not restart elogind by default.
++      (github issue #205 by @HumanG33k)
+ 
+   * Fixes:
+     - [Core] Fix comment for default value of `skip_mapfiles`.
+@@ -20,6 +26,8 @@ needrestart 3.6
+       (github pull request #193 by Stefan Weil @stweil)
+     - [Core] Fix verbose/verbosity confusion in needrestart.conf.
+       (github pull request #197 by Jan-Philipp Litza @jplitza)
++    - [Core] Ignore memfd files like used by nvidia's binary drivers.
++      (github pull request #200 by Jan Visser @starquake)
+ 
+  -- Thomas Liske <[e-mail]>  
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0023-Ignore-Java-Native-Access-mappings-closes-142-closes.patch b/debian/patches/Jammy-update-to-git-eb3531af-0023-Ignore-Java-Native-Access-mappings-closes-142-closes.patch
new file mode 100644
index 0000000..c217d71
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0023-Ignore-Java-Native-Access-mappings-closes-142-closes.patch
@@ -0,0 +1,46 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 30d3b27033bacfc7650690a92a132b8bfe977980
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 30d3b27033bacfc7650690a92a132b8bfe977980 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sat, 18 Sep 2021 12:21:57 +0200
+Subject: [PATCH 23/43] Ignore Java Native Access mappings (closes #142, closes
+ #185).
+
+---
+ ChangeLog           | 3 +++
+ ex/needrestart.conf | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/ChangeLog b/ChangeLog
+index ba99976..cb1dbef 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -28,6 +28,9 @@ needrestart 3.6
+       (github pull request #197 by Jan-Philipp Litza @jplitza)
+     - [Core] Ignore memfd files like used by nvidia's binary drivers.
+       (github pull request #200 by Jan Visser @starquake)
++    - [Core] Ignore Java Native Access mappings.
++      (github issue #142 by @nirgal)
++      (github issue #185 by Ivan Zaera @izaera)
+ 
+  -- Thomas Liske <[e-mail]>  
+ 
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index b2d27a6..0852d27 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -164,6 +164,9 @@ $nrconf{blacklist_mappings} = [
+     # plasmashell (issue #65)
+     qr(/#\d+( \(deleted\))?$),
+ 
++    # Java Native Access (issues #142 #185)
++    qr#/jna\d+\.tmp( \(deleted\))?$#,
++
+     # temporary stuff
+     qr#^(/var)?/tmp/#,
+     qr#^(/var)?/run/#,
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0024-Use-license-file-from-gnu.org.patch b/debian/patches/Jammy-update-to-git-eb3531af-0024-Use-license-file-from-gnu.org.patch
new file mode 100644
index 0000000..2dd53c8
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0024-Use-license-file-from-gnu.org.patch
@@ -0,0 +1,138 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, bb7de6d8c0fbd328e413eef8e855a9b6e3bec642
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From bb7de6d8c0fbd328e413eef8e855a9b6e3bec642 Mon Sep 17 00:00:00 2001
+From: a1346054 <[e-mail]>
+Date: Sun, 22 Aug 2021 16:12:10 +0000
+Subject: [PATCH 24/43] Use license file from gnu.org
+
+Downloaded from:
+https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+---
+ COPYING | 41 ++++++++++++++++++++---------------------
+ 1 file changed, 20 insertions(+), 21 deletions(-)
+
+diff --git a/COPYING b/COPYING
+index 623b625..d159169 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,12 @@
+-		    GNU GENERAL PUBLIC LICENSE
+-		       Version 2, June 1991
++                    GNU GENERAL PUBLIC LICENSE
++                       Version 2, June 1991
+ 
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+-			    Preamble
++                            Preamble
+ 
+   The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it.  (Some other Free Software Foundation software is covered by
+-the GNU Library General Public License instead.)  You can apply it to
++the GNU Lesser General Public License instead.)  You can apply it to
+ your programs, too.
+ 
+   When we speak of free software, we are referring to freedom, not
+@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
+ 
+   The precise terms and conditions for copying, distribution and
+ modification follow.
+-

+-		    GNU GENERAL PUBLIC LICENSE
++
++                    GNU GENERAL PUBLIC LICENSE
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+   0. This License applies to any program or other work which contains
+@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
+     License.  (Exception: if the Program itself is interactive but
+     does not normally print such an announcement, your work based on
+     the Program is not required to print an announcement.)
+-

++
+ These requirements apply to the modified work as a whole.  If
+ identifiable sections of that work are not derived from the Program,
+ and can be reasonably considered independent and separate works in
+@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
+ access to copy the source code from the same place counts as
+ distribution of the source code, even though third parties are not
+ compelled to copy the source along with the object code.
+-

++
+   4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License.  Any attempt
+ otherwise to copy, modify, sublicense or distribute the Program is
+@@ -225,7 +225,7 @@ impose that choice.
+ 
+ This section is intended to make thoroughly clear what is believed to
+ be a consequence of the rest of this License.
+-

++
+   8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces, the
+ original copyright holder who places the Program under this License
+@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+ 
+-			    NO WARRANTY
++                            NO WARRANTY
+ 
+   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ 
+-		     END OF TERMS AND CONDITIONS
+-

+-	    How to Apply These Terms to Your New Programs
++                     END OF TERMS AND CONDITIONS
++
++            How to Apply These Terms to Your New Programs
+ 
+   If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+ 
+-    You should have received a copy of the GNU General Public License
+-    along with this program; if not, write to the Free Software
+-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-
++    You should have received a copy of the GNU General Public License along
++    with this program; if not, write to the Free Software Foundation, Inc.,
++    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Also add information on how to contact you by electronic and paper mail.
+ 
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+ 
+-    Gnomovision version 69, Copyright (C) year  name of author
++    Gnomovision version 69, Copyright (C) year name of author
+     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it
+     under certain conditions; type `show c' for details.
+@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
+ This General Public License does not permit incorporating your program into
+ proprietary programs.  If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+-library.  If this is what you want to do, use the GNU Library General
++library.  If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0025-Fix-spelling.patch b/debian/patches/Jammy-update-to-git-eb3531af-0025-Fix-spelling.patch
new file mode 100644
index 0000000..1786c03
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0025-Fix-spelling.patch
@@ -0,0 +1,117 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 2585279051fff5ac685fc0bcdc442d5ff3f1c311
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 2585279051fff5ac685fc0bcdc442d5ff3f1c311 Mon Sep 17 00:00:00 2001
+From: a1346054 <[e-mail]>
+Date: Sun, 22 Aug 2021 16:20:54 +0000
+Subject: [PATCH 25/43] Fix spelling
+
+---
+ NEWS                | 2 +-
+ README.batch.md     | 2 +-
+ README.md           | 2 +-
+ README.raspberry.md | 2 +-
+ ex/needrestart.conf | 4 ++--
+ needrestart         | 4 ++--
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 847495c..6f2e7ef 100644
+--- a/NEWS
++++ b/NEWS
+@@ -80,7 +80,7 @@ Changes in 0.3
+ blacklisting
+ ------------
+ 
+-It might be a bad idea to (auto) restart certain daemons. Therefor
++It might be a bad idea to (auto) restart certain daemons. Therefore
+ a new config option is available to ignore binaries by matching
+ a regex. The supplied default configuration ignores dbus, NetworkManager
+ and various display managers.
+diff --git a/README.batch.md b/README.batch.md
+index a837ced..88fcd4e 100644
+--- a/README.batch.md
++++ b/README.batch.md
+@@ -16,7 +16,7 @@ NEEDRESTART-CONT: LXC web1
+ 
+ Batch mode can be used to use the results of needrestart in other scripts.
+ While needrestart is run in batch mode it will never show any UI dialogs
+-nor restart anything. The output format is complient to the
++nor restart anything. The output format is complaint to the
+ *apt-dater protocol*[1].
+ 
+ [1] https://github.com/DE-IBH/apt-dater-host/blob/master/doc/
+diff --git a/README.md b/README.md
+index 6c309b7..8f01ee7 100644
+--- a/README.md
++++ b/README.md
+@@ -40,7 +40,7 @@ The *service* command is used to run the traditional System V init script.
+ Frontends
+ ---------
+ 
+-*needrestart* uses a modular aproach based on perl packages providing
++*needrestart* uses a modular approach based on perl packages providing
+ the user interface. The following frontends are shipped:
+ 
+ * *NeedRestart::UI::Debconf* using *debconf*
+diff --git a/README.raspberry.md b/README.raspberry.md
+index 35296be..b7d67db 100644
+--- a/README.raspberry.md
++++ b/README.raspberry.md
+@@ -1,7 +1,7 @@
+ needrestart - Raspberry Pi
+ ==========================
+ 
+-Raspbian and other linux distris are installing multiple kernel images in
++Raspbian and other linux distros are installing multiple kernel images in
+ parallel:
+ 
+ - `kernel.img`
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index 0852d27..cfe2b09 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -63,7 +63,7 @@ $nrconf{blacklist} = [
+ ];
+ 
+ # Blacklist services (list of regex) - USE WITH CARE.
+-# You should prefere to put services to $nrconf{override_rc} instead.
++# You should prefer to put services to $nrconf{override_rc} instead.
+ # Any service listed in $nrconf{blacklist_rc} will be ignored completely!
+ #$nrconf{blacklist_rc} = [
+ #];
+@@ -172,7 +172,7 @@ $nrconf{blacklist_mappings} = [
+     qr#^(/var)?/run/#,
+ ];
+ 
+-# Verify mapped files in fileystem:
++# Verify mapped files in filesystem:
+ # 0 : enabled
+ # -1: ignore non-existing files, workaround for chroots and broken grsecurity kernels (default)
+ # 1 : disable check completely, rely on content of maps file only
+diff --git a/needrestart b/needrestart
+index d33abc3..1524543 100755
+--- a/needrestart
++++ b/needrestart
+@@ -726,7 +726,7 @@ if(defined($opt_l)) {
+ 			    print STDERR "$LOGPREF no LSB headers found at $v[1]\n" if($nrconf{verbosity} > 1);
+ 			    push(@nopids, $v[1]);
+ 			}
+-			# In the run-levels S and 1 no daemons are being started (normaly).
++			# In the run-levels S and 1 no daemons are being started (normally).
+ 			# We don't call any rc.d script not started in the current run-level.
+ 			elsif($lsb{'default-start'} =~ /$runlevel/) {
+ 			    # If a pidfile has been found, try to look for the daemon and ignore
+@@ -760,7 +760,7 @@ if(defined($opt_l)) {
+ 		if(!$found && $#nopids > -1) {
+ 		    foreach my $rc (@nopids) {
+ 			if($is_systemd && exists($restart{"$rc.service"})) {
+-			    print STDERR "$LOGPREF #$pid rc.d script $rc seems to be superseeded by $rc.service\n" if($nrconf{verbosity} > 1);
++			    print STDERR "$LOGPREF #$pid rc.d script $rc seems to be superseded by $rc.service\n" if($nrconf{verbosity} > 1);
+ 			}
+ 			else {
+ 			    $restart{$rc}++;
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0026-Fix-shellcheck-warnings.patch b/debian/patches/Jammy-update-to-git-eb3531af-0026-Fix-shellcheck-warnings.patch
new file mode 100644
index 0000000..67bc278
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0026-Fix-shellcheck-warnings.patch
@@ -0,0 +1,187 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 95d51c97ce94e1f1361c9b4db68fc9211d3a1ef4
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 95d51c97ce94e1f1361c9b4db68fc9211d3a1ef4 Mon Sep 17 00:00:00 2001
+From: a1346054 <[e-mail]>
+Date: Sun, 22 Aug 2021 16:23:32 +0000
+Subject: [PATCH 26/43] Fix shellcheck warnings
+
+Additionally improves readability by removing mix of tabs vs
+spaces and adding indentation where needed.
+---
+ ex/apt/dpkg-status          | 25 +++++++++++++----------
+ ex/notify.d/400-notify-send | 40 ++++++++++++++++++-------------------
+ ex/notify.d/600-mail        |  4 ++--
+ ex/restart.d/dbus.service   |  2 +-
+ lib/iucode-scan-versions    |  4 ++--
+ lib/vmlinuz-get-version     | 12 +++++------
+ 6 files changed, 44 insertions(+), 43 deletions(-)
+
+diff --git a/ex/apt/dpkg-status b/ex/apt/dpkg-status
+index b0f2527..79d12f6 100755
+--- a/ex/apt/dpkg-status
++++ b/ex/apt/dpkg-status
+@@ -23,17 +23,20 @@ touched=0
+ errored=0
+ 
+ while read tag p0 p1 p2 p3 p4 pp; do
+-    if [ "$tag" = 'status:' -a "$p1" = 'unpacked' ]; then
+-	if [ "$touched" = 0 ]; then
+-	    touch "$RUNDIR/unpacked"
+-	    touched=1
+-	fi
++    if [ "$tag" = 'status:' ] && [ "$p1" = 'unpacked' ]; then
++        if [ "$touched" = 0 ]; then
++            touch "$RUNDIR/unpacked"
++            touched=1
++        fi
+     else
+-	if [ "$tag" = 'status:' -a "$p1" = ':' -a "$p2" = 'error' -a "$p3" = ':' ]; then
+-	    if [ "$errored" = 0 ]; then
+-		touch "$RUNDIR/errored"
+-		errored=1
+-	    fi
+-	fi
++        if [ "$tag" = 'status:' ] && \
++            [ "$p1" = ':' ] && \
++            [ "$p2" = 'error' ] && \
++            [ "$p3" = ':' ]; then
++            if [ "$errored" = 0 ]; then
++                touch "$RUNDIR/errored"
++                errored=1
++            fi
++        fi
+     fi
+ done
+diff --git a/ex/notify.d/400-notify-send b/ex/notify.d/400-notify-send
+index 932ea78..fb01202 100755
+--- a/ex/notify.d/400-notify-send
++++ b/ex/notify.d/400-notify-send
+@@ -28,30 +28,30 @@ if [ "$NR_NOTIFYD_DISABLE_NOTIFY_SEND" = '1' ]; then
+ fi
+ 
+ case "$NR_SESSION" in
+-    session*)
+-	DBUS_SESSION_BUS_ADDRESS=$(sed -z -n s/^DBUS_SESSION_BUS_ADDRESS=//p "/proc/$NR_SESSPPID/environ")
+-	if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+-		unset DBUS_SESSION_BUS_ADDRESS
+-	fi
++  session*)
++    DBUS_SESSION_BUS_ADDRESS=$(sed -z -n s/^DBUS_SESSION_BUS_ADDRESS=//p "/proc/$NR_SESSPPID/environ")
++    if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
++        unset DBUS_SESSION_BUS_ADDRESS
++    fi
+ 
+-	export DISPLAY=$(sed -z -n s/^DISPLAY=//p "/proc/$NR_SESSPPID/environ")
+-	export XAUTHORITY=$(sed -z -n s/^XAUTHORITY=//p "/proc/$NR_SESSPPID/environ")
++    export DISPLAY=$(sed -z -n s/^DISPLAY=//p "/proc/$NR_SESSPPID/environ")
++    export XAUTHORITY=$(sed -z -n s/^XAUTHORITY=//p "/proc/$NR_SESSPPID/environ")
+ 
+-	if [ -z "$DISPLAY" ]; then
+- 	    echo "[$0] could not find DISPLAY for $NR_USERNAME on $NR_SESSION" 1>&2
+-	    exit 1
+-	fi
++    if [ -z "$DISPLAY" ]; then
++        echo "[$0] could not find DISPLAY for $NR_USERNAME on $NR_SESSION" 1>&2
++        exit 1
++    fi
+ 
+- 	echo "[$0] notify user $NR_USERNAME on $DISPLAY" 1>&2
++    echo "[$0] notify user $NR_USERNAME on $DISPLAY" 1>&2
+ 
+-	MSGTITLE=$(gettext 'Relogin or restarts required!')
+-	MSGBODY=$(gettext 'Your session is running obsolete binaries or libraries as listed below.
++    MSGTITLE=$(gettext 'Relogin or restarts required!')
++    MSGBODY=$(gettext 'Your session is running obsolete binaries or libraries as listed below.
+ <i><b>Please consider a relogin or restart of the affected processes!</b></i>')'\n'$(cat)
+ 
+-	su -p -s /bin/sh -c "$NSEND -a needrestart -u critical -i dialog-warning \"$MSGTITLE\" \"$MSGBODY\"" "$NR_USERNAME"
+-	;;
+-    *)
+- 	echo "[$0] skip session '$NR_SESSION'" 1>&2
+-	exit 1;
+-	;;
++    su -p -s /bin/sh -c "$NSEND -a needrestart -u critical -i dialog-warning \"$MSGTITLE\" \"$MSGBODY\"" "$NR_USERNAME"
++    ;;
++  *)
++    echo "[$0] skip session '$NR_SESSION'" 1>&2
++    exit 1;
++    ;;
+ esac
+diff --git a/ex/notify.d/600-mail b/ex/notify.d/600-mail
+index 934e281..473065f 100755
+--- a/ex/notify.d/600-mail
++++ b/ex/notify.d/600-mail
+@@ -28,8 +28,8 @@ if [ "$NR_NOTIFYD_DISABLE_MAIL" = '1' ]; then
+ fi
+ 
+ # Skip system users
+-NR_USERID=`id -u "$NR_USERNAME"`
+-if [ "0$NR_USERID" -gt 0 -a "0$NR_USERID" -lt 1000 ]; then
++NR_USERID=$(id -u "$NR_USERNAME")
++if [ "0$NR_USERID" -gt 0 ] && [ "0$NR_USERID" -lt 1000 ]; then
+     echo "[$0] do not notify system-user $NR_USERNAME via mail" 1>&2
+     exit 1
+ fi
+diff --git a/ex/restart.d/dbus.service b/ex/restart.d/dbus.service
+index 2db103a..c40f599 100755
+--- a/ex/restart.d/dbus.service
++++ b/ex/restart.d/dbus.service
+@@ -19,7 +19,7 @@ RESTART_CHK="NetworkManager.service"
+ RESTART_SVC="systemd-logind.service systemd-journald.service"
+ for svc in $RESTART_CHK; do
+     if [ "$(systemctl show $svc --property=ActiveState)" = 'ActiveState=active' ]; then
+-	RESTART_SVC="$RESTART_SVC $svc"
++        RESTART_SVC="$RESTART_SVC $svc"
+     fi
+ done
+ 
+diff --git a/lib/iucode-scan-versions b/lib/iucode-scan-versions
+index dc20c6a..2c3b142 100755
+--- a/lib/iucode-scan-versions
++++ b/lib/iucode-scan-versions
+@@ -29,9 +29,9 @@ if [ "$1" = "1" ]; then
+ fi
+ 
+ # filter for processor signature (and flags if available)
+-sig=`iucode_tool --scan-system 2>&1|grep -oE '[^[:space:]]+$'` #'
++sig=$(iucode_tool --scan-system 2>&1 | grep -oE '[^[:space:]]+$') #'
+ if [ -r /sys/devices/system/cpu/cpu0/microcode/processor_flags ]; then
+-    filter="-s $sig,"`cat /sys/devices/system/cpu/cpu0/microcode/processor_flags`
++    filter="-s $sig,"$(cat /sys/devices/system/cpu/cpu0/microcode/processor_flags)
+ else
+     filter="-S"
+ fi
+diff --git a/lib/vmlinuz-get-version b/lib/vmlinuz-get-version
+index 22a4365..ec94fe7 100755
+--- a/lib/vmlinuz-get-version
++++ b/lib/vmlinuz-get-version
+@@ -29,19 +29,17 @@ try_decompress()
+     # "grep" that report the byte offset of the line instead of the pattern.
+ 
+     # Try to find the header ($1) and decompress from here
+-    for	pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
+-    do
+-	pos=${pos%%:*}
+-	tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
+-	get_version $tmp
++    for pos in $(tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"); do
++        pos=${pos%%:*}
++        tail -c+$pos "$img" | $3 > $tmp 2>/dev/null
++        get_version $tmp
+     done
+ }
+ 
+ # Check invocation:
+ me=${0##*/}
+ img=$1
+-if	[ $# -lt 1 -o $# -gt 2  -o ! -s "$img" ]
+-then
++if [ $# -lt 1 ] || [ $# -gt 2 ] || [ ! -s "$img" ]; then
+     echo "Usage: $me <kernel-image> [debug]" >&2
+     exit 2
+ fi
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0027-Trim-excess-whitespace.patch b/debian/patches/Jammy-update-to-git-eb3531af-0027-Trim-excess-whitespace.patch
new file mode 100644
index 0000000..a02f8ae
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0027-Trim-excess-whitespace.patch
@@ -0,0 +1,161 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 0880b05c1b83ccc442f683c84a60449f489e8be4
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 0880b05c1b83ccc442f683c84a60449f489e8be4 Mon Sep 17 00:00:00 2001
+From: a1346054 <[e-mail]>
+Date: Sun, 22 Aug 2021 16:24:58 +0000
+Subject: [PATCH 27/43] Trim excess whitespace
+
+---
+ Makefile                              |  2 +-
+ ex/needrestart.conf                   |  1 -
+ needrestart                           | 14 +++++++-------
+ perl/lib/NeedRestart.pm               |  2 +-
+ perl/lib/NeedRestart/Interp/Python.pm |  6 +++---
+ perl/lib/NeedRestart/Interp/Ruby.pm   |  2 +-
+ perl/lib/NeedRestart/Kernel.pm        |  2 +-
+ 7 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c687d92..61841a1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ LOCALEDIR=/usr/share/locale
+ 
+ all: mo-files
+-	cd perl && perl Makefile.PL PREFIX=$(PREFIX) INSTALLDIRS=vendor 
++	cd perl && perl Makefile.PL PREFIX=$(PREFIX) INSTALLDIRS=vendor
+ 	cd perl && $(MAKE)
+ 
+ install: all
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index cfe2b09..1710b4c 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -1,4 +1,3 @@
+-
+ # needrestart - Restart daemons after library updates.
+ #
+ # This is the configuration file of needrestart. This is perl syntax.
+diff --git a/needrestart b/needrestart
+index 1524543..43e530d 100755
+--- a/needrestart
++++ b/needrestart
+@@ -449,20 +449,20 @@ if(defined($opt_l)) {
+     sub findppid($@) {
+ 	my $uid = shift;
+ 	my ($pid, @pids) = @_;
+-	
++
+ 	if($ptable->{$pid}->{ppid} == 1) {
+ 	    return $pid
+ 		if($ptable->{$pid}->{uid} == $uid);
+-	    
++
+ 	    return undef;
+ 	}
+-	
++
+ 	foreach my $pid (@pids) {
+ 	    my $ppid = &findppid($uid, $pid);
+-	    
++
+ 	    return $ppid if($ppid);
+ 	}
+-	
++
+ 	return $pid;
+     }
+ 
+@@ -978,7 +978,7 @@ if(defined($opt_l) && !$uid) {
+                 $nagios{sstr} .= " (!!)";
+             }
+         }
+-	    
++
+ 	    foreach my $rc (sort { lc($a) cmp lc($b) } keys %restart) {
+ 		# always combine restarts in one systemctl command
+ 		local $nrconf{systemctl_combine} = 1 unless($opt_r eq 'l');
+@@ -1278,7 +1278,7 @@ if($opt_p) {
+ 	2 => q(CRIT),
+ 	3 => q(UNKN),
+ 	);
+-    my ($ret) = reverse sort 
++    my ($ret) = reverse sort
+ 	(($opt_k ? $nagios{kret} : ()), ($opt_w ? $nagios{mret} : ()),
+ 	($opt_l ? ($nagios{sret}, $nagios{cret}, $nagios{uret}) : ()));
+ 
+diff --git a/perl/lib/NeedRestart.pm b/perl/lib/NeedRestart.pm
+index 07eec9c..595d69b 100644
+--- a/perl/lib/NeedRestart.pm
++++ b/perl/lib/NeedRestart.pm
+@@ -258,7 +258,7 @@ sub needrestart_cont_get($) {
+ 	$n =~ s/^NeedRestart::CONT:://;
+ 
+ 	my %c = $cont->get;
+-	
++
+ 	map {
+ 	    ("$n $_" => $c{$_});
+ 	} sort keys %c;
+diff --git a/perl/lib/NeedRestart/Interp/Python.pm b/perl/lib/NeedRestart/Interp/Python.pm
+index 12c5dd2..559666c 100644
+--- a/perl/lib/NeedRestart/Interp/Python.pm
++++ b/perl/lib/NeedRestart/Interp/Python.pm
+@@ -198,14 +198,14 @@ sub files {
+     elsif(exists($ENV{PYTHONPATH})) {
+ 	delete($ENV{PYTHONPATH});
+     }
+-    
++
+     # get include path
+     my ($pyread, $pywrite) = nr_fork_pipe2($self->{debug}, $ptable->{exec}, '-');
+     print $pywrite "import sys\nprint(sys.path)\n";
+     close($pywrite);
+     my ($path) = <$pyread>;
+     close($pyread);
+-    
++
+     # look for module source files
+     my @path;
+     if(defined($path)) {
+@@ -217,7 +217,7 @@ sub files {
+     else {
+ 	print STDERR "$LOGPREF #$pid: failed to retrieve include path\n" if($self->{debug});
+     }
+-    
++
+     my %files;
+     _scan($self->{debug}, $pid, $src, \%files, \@path);
+ 
+diff --git a/perl/lib/NeedRestart/Interp/Ruby.pm b/perl/lib/NeedRestart/Interp/Ruby.pm
+index 88d39c6..d02973d 100644
+--- a/perl/lib/NeedRestart/Interp/Ruby.pm
++++ b/perl/lib/NeedRestart/Interp/Ruby.pm
+@@ -195,7 +195,7 @@ sub files {
+     elsif(exists($ENV{RUBYLIB})) {
+ 	delete($ENV{RUBYLIB});
+     }
+-    
++
+     # get include path
+     my $rbread = nr_fork_pipe($self->{debug}, $ptable->{exec}, '-e', 'puts $:');
+     my @path = map { "/proc/$pid/root/$_"; } <$rbread>;
+diff --git a/perl/lib/NeedRestart/Kernel.pm b/perl/lib/NeedRestart/Kernel.pm
+index 221e8a2..ad8215b 100644
+--- a/perl/lib/NeedRestart/Kernel.pm
++++ b/perl/lib/NeedRestart/Kernel.pm
+@@ -143,7 +143,7 @@ sub nr_kernel_vcmp($$) {
+ # compare kernel version strings according to RPM version sorting
+ # adopted from RPM::VersionSort
+ sub nr_kernel_vcmp_rpm {
+-    # split version strings by non-alphanumeric digits 
++    # split version strings by non-alphanumeric digits
+     my @a = split(/[^a-z\d]+/i, shift);
+     my @b = split(/[^a-z\d]+/i, shift);
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0028-Update-README.batch.md.patch b/debian/patches/Jammy-update-to-git-eb3531af-0028-Update-README.batch.md.patch
new file mode 100644
index 0000000..1c22feb
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0028-Update-README.batch.md.patch
@@ -0,0 +1,30 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, d33b0c20cdc2999890acb07aa248378d0d175895
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From d33b0c20cdc2999890acb07aa248378d0d175895 Mon Sep 17 00:00:00 2001
+From: Stavros Ntentos <[e-mail]>
+Date: Tue, 28 Sep 2021 11:32:50 +0300
+Subject: [PATCH 28/43] Update README.batch.md
+
+Did you mean: compliant
+---
+ README.batch.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.batch.md b/README.batch.md
+index 88fcd4e..55c429e 100644
+--- a/README.batch.md
++++ b/README.batch.md
+@@ -16,7 +16,7 @@ NEEDRESTART-CONT: LXC web1
+ 
+ Batch mode can be used to use the results of needrestart in other scripts.
+ While needrestart is run in batch mode it will never show any UI dialogs
+-nor restart anything. The output format is complaint to the
++nor restart anything. The output format is compliant to the
+ *apt-dater protocol*[1].
+ 
+ [1] https://github.com/DE-IBH/apt-dater-host/blob/master/doc/
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0029-Ignore-all-memfd-mappings-Debian-Bug-972685-by-Micha.patch b/debian/patches/Jammy-update-to-git-eb3531af-0029-Ignore-all-memfd-mappings-Debian-Bug-972685-by-Micha.patch
new file mode 100644
index 0000000..d90fc79
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0029-Ignore-all-memfd-mappings-Debian-Bug-972685-by-Micha.patch
@@ -0,0 +1,46 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 6c87772bdc38091e9efbf4c59217fa502365dcf2
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 6c87772bdc38091e9efbf4c59217fa502365dcf2 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sun, 10 Oct 2021 22:35:04 +0200
+Subject: [PATCH 29/43] Ignore all memfd mappings (Debian Bug#972685 by Michail
+ Bachmann <[e-mail]>).
+
+---
+ ChangeLog           | 2 ++
+ ex/needrestart.conf | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index cb1dbef..7618b0d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -28,6 +28,8 @@ needrestart 3.6
+       (github pull request #197 by Jan-Philipp Litza @jplitza)
+     - [Core] Ignore memfd files like used by nvidia's binary drivers.
+       (github pull request #200 by Jan Visser @starquake)
++    - [Core] Ignore all memfd mappings.
++      (Debian Bug#972685 by Michail Bachmann <[e-mail]>)
+     - [Core] Ignore Java Native Access mappings.
+       (github issue #142 by @nirgal)
+       (github issue #185 by Ivan Zaera @izaera)
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index 1710b4c..d7fe3e9 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -151,8 +151,8 @@ $nrconf{blacklist_mappings} = [
+     # special device paths
+     qr(^/(SYSV00000000( \(deleted\))?|drm(\s|$)|dev/)),
+ 
+-    # ignore memfd file used by nvidia binary drivers
+-    qr(^/memfd:/.glXXXXXX),
++    # ignore memfd mappings
++    qr(^/memfd:),
+ 
+     # aio(7) mapping
+     qr(^/\[aio\]),
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0030-Kernel-Replace-strings-1-by-GNU-grep-to-drop-binutil.patch b/debian/patches/Jammy-update-to-git-eb3531af-0030-Kernel-Replace-strings-1-by-GNU-grep-to-drop-binutil.patch
new file mode 100644
index 0000000..240f952
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0030-Kernel-Replace-strings-1-by-GNU-grep-to-drop-binutil.patch
@@ -0,0 +1,45 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, e6176258e6b9f9f907736cbe1f8d148582a057d9
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From e6176258e6b9f9f907736cbe1f8d148582a057d9 Mon Sep 17 00:00:00 2001
+From: Thomas Liske <[e-mail]>
+Date: Sun, 10 Oct 2021 23:10:37 +0200
+Subject: [PATCH 30/43] [Kernel] Replace strings(1) by GNU grep to drop
+ binutils dependency (Debian Bug#986507 by Trent W. Buck
+ <[e-mail]>).
+
+---
+ ChangeLog               | 2 ++
+ lib/vmlinuz-get-version | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 7618b0d..73bd109 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -15,6 +15,8 @@ needrestart 3.6
+       (github pull request #209 by Erik Tews @eriktews)
+     - [Core] Do not restart elogind by default.
+       (github issue #205 by @HumanG33k)
++    - [Kernel] Replace strings(1) by GNU grep to drop binutils dependency.
++      (Debian Bug#986507 by Trent W. Buck <[e-mail]>)
+ 
+   * Fixes:
+     - [Core] Fix comment for default value of `skip_mapfiles`.
+diff --git a/lib/vmlinuz-get-version b/lib/vmlinuz-get-version
+index ec94fe7..8f650b5 100755
+--- a/lib/vmlinuz-get-version
++++ b/lib/vmlinuz-get-version
+@@ -20,7 +20,7 @@
+ get_version()
+ {
+     # search and output version string pattern
+-    strings "$1" | grep -m 1 '^Linux version ' && exit 0
++    grep -aom 1 'Linux version [0123456789].*' "$1" && exit 0
+ }
+ 
+ try_decompress()
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0031-Do-not-print-perfdata-if-unknown-state.patch b/debian/patches/Jammy-update-to-git-eb3531af-0031-Do-not-print-perfdata-if-unknown-state.patch
new file mode 100644
index 0000000..eb61cad
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0031-Do-not-print-perfdata-if-unknown-state.patch
@@ -0,0 +1,41 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 23d29f8b66d067bcdaa425a127bf184865e3eb53
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 23d29f8b66d067bcdaa425a127bf184865e3eb53 Mon Sep 17 00:00:00 2001
+From: rincewind <[e-mail]>
+Date: Sat, 23 Oct 2021 12:41:57 +0200
+Subject: [PATCH 31/43] Do not print perfdata if unknown state
+
+When using the nagios plugin mode, the performance data were printed
+in an invalid format if the result of one subcheck returned UNKNOWN.
+This fixes this and will only print the performance data, if the state
+of the subcheck is really known.
+---
+ needrestart | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/needrestart b/needrestart
+index 43e530d..f4eff15 100755
+--- a/needrestart
++++ b/needrestart
+@@ -1289,11 +1289,11 @@ if($opt_p) {
+ 	       ($opt_l ? "Containers: $nagios{cstr}" : ()),
+ 	       ($opt_l ? "Sessions: $nagios{ustr}" : ()),
+ 	), '|', join(' ',
+-	       ($opt_k ? "Kernel=$nagios{kperf};0;;0;2" : ()),
+-	       ($opt_w ? "Microcode=$nagios{mperf};0;;0;1" : ()),
+-	       ($opt_l ? "Services=$nagios{sperf};;0;0" : ()),
+-	       ($opt_l ? "Containers=$nagios{cperf};;0;0" : ()),
+-	       ($opt_l ? "Sessions=$nagios{uperf};0;;0" : ()),
++	       ( ($opt_k && $nagios{kret} != 3) ? "Kernel=$nagios{kperf};0;;0;2" : ()),
++	       ( ($opt_w && $nagios{mret} != 3) ? "Microcode=$nagios{mperf};0;;0;1" : ()),
++	       ( ($opt_l && $nagios{sret} != 3) ? "Services=$nagios{sperf};;0;0" : ()),
++	       ( ($opt_l && $nagios{cret} != 3) ? "Containers=$nagios{cperf};;0;0" : ()),
++	       ( ($opt_l && $nagios{uret} != 3) ? "Sessions=$nagios{uperf};0;;0" : ()),
+ 	), "\n";
+ 
+     if(scalar %restart) {
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0032-Add-icinga2-example-config.patch b/debian/patches/Jammy-update-to-git-eb3531af-0032-Add-icinga2-example-config.patch
new file mode 100644
index 0000000..287c697
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0032-Add-icinga2-example-config.patch
@@ -0,0 +1,58 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 84e56f12095aa2a16ae5f31808702e23950ae7eb
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 84e56f12095aa2a16ae5f31808702e23950ae7eb Mon Sep 17 00:00:00 2001
+From: rincewind <[e-mail]>
+Date: Sat, 23 Oct 2021 15:38:35 +0200
+Subject: [PATCH 32/43] Add icinga2 example config
+
+---
+ ex/icinga2/command.conf        | 17 +++++++++++++++++
+ ex/icinga2/needrestart-sudoers | 10 ++++++++++
+ 2 files changed, 27 insertions(+)
+ create mode 100644 ex/icinga2/command.conf
+ create mode 100644 ex/icinga2/needrestart-sudoers
+
+diff --git a/ex/icinga2/command.conf b/ex/icinga2/command.conf
+new file mode 100644
+index 0000000..d410b80
+--- /dev/null
++++ b/ex/icinga2/command.conf
+@@ -0,0 +1,17 @@
++object CheckCommand "needrestart" {
++	command = [ "/usr/sbin/needrestart", "-p" ]
++	arguments = {
++		"-k" = {
++			description = "check for obsolete kernel"
++			set_if = "$needrestart_kernel$"
++		}
++		"-l" = {
++			description = "check for obsolete libraries"
++			set_if = "$needrestart_libraries$"
++		}
++		"-w" = {
++			description = "check for obsolete CPU microcode"
++			set_if = "$needrestart_microcode$"
++		}
++	}
++}
+diff --git a/ex/icinga2/needrestart-sudoers b/ex/icinga2/needrestart-sudoers
+new file mode 100644
+index 0000000..ef55834
+--- /dev/null
++++ b/ex/icinga2/needrestart-sudoers
+@@ -0,0 +1,10 @@
++# needrestart nagios plugin sudoers.d config file
++# -----------------------------------------------
++#
++# Please consider a look at /etc/sudoers.d/README howto enable this file.
++#
++
++# Allow nagios to execute the needrestart command on debian based systems (icinga user is called "nagios")
++nagios ALL=NOPASSWD: /usr/sbin/needrestart
++# Allow nagios to execute the needrestart command on centos and family (icinga user is called "icinga")
++icinga ALL=NOPASSWD: /usr/sbin/needrestart
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0033-also-output-user-sessions-in-batch-mode.patch b/debian/patches/Jammy-update-to-git-eb3531af-0033-also-output-user-sessions-in-batch-mode.patch
new file mode 100644
index 0000000..5676eaa
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0033-also-output-user-sessions-in-batch-mode.patch
@@ -0,0 +1,100 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 1ff1bf40eac4bdf56862fcdbd261829e18eb5873
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 1ff1bf40eac4bdf56862fcdbd261829e18eb5873 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <[e-mail]>
+Date: Tue, 25 Jan 2022 21:38:57 -0500
+Subject: [PATCH 33/43] also output user sessions in batch mode
+
+The user sessions present in the normal and nagios output is
+mysteriously missing from the batch output. This remedies that
+limitation by reusing the user-readable output from the Nagios output.
+
+We also update the README.batch documentation, but that's still
+lacking a little, see #230.
+
+Closes: #231
+---
+ README.batch.md |  2 ++
+ needrestart     | 43 ++++++++++++++++++++++++++++---------------
+ 2 files changed, 30 insertions(+), 15 deletions(-)
+
+diff --git a/README.batch.md b/README.batch.md
+index 88fcd4e..cc7ef2c 100644
+--- a/README.batch.md
++++ b/README.batch.md
+@@ -12,6 +12,8 @@ NEEDRESTART-KSTA: 1
+ NEEDRESTART-SVC: systemd-journald.service
+ NEEDRESTART-SVC: systemd-machined.service
+ NEEDRESTART-CONT: LXC web1
++NEEDRESTART-SESS: metabase @ user manager service
++NEEDRESTART-SESS: root @ session #28017
+ ```
+ 
+ Batch mode can be used to use the results of needrestart in other scripts.
+diff --git a/needrestart b/needrestart
+index 43e530d..7af9843 100755
+--- a/needrestart
++++ b/needrestart
+@@ -1270,6 +1270,27 @@ if(scalar @easy_hints) {
+     $ui->announce_ehint(EHINT => ($h ? join(' ', $h, __ 'and', '') : '') . $t);
+ }
+ 
++my @sessions_list;
++if(scalar %sessions) {
++    # build a sorted list of user @ session strings
++    #
++    # used in the nagios and batch outputs below
++    @sessions_list = map {
++        my $uid = $_;
++        my $user = uid2name($uid);
++        my @ret;
++
++        foreach my $sess (sort keys %{ $sessions{$uid} }) {
++            push(@ret, "$user \@ $sess");
++        }
++
++        @ret;
++    }
++    sort {
++        ncmp(uid2name($a), uid2name($b));
++    } keys %sessions
++}
++
+ # nagios plugin output
+ if($opt_p) {
+     my %states = (
+@@ -1306,22 +1327,14 @@ if($opt_p) {
+     }
+ 
+     if(scalar %sessions) {
+-	print "Sessions:", join("\n- ", '',
+-				map {
+-				    my $uid = $_;
+-				    my $user = uid2name($uid);
+-				    my @ret;
+-
+-				    foreach my $sess (sort keys %{ $sessions{$uid} }) {
+-					push(@ret, "$user \@ $sess");
+-				    }
+-
+-				    @ret;
+-				}
+-				sort {
+-				    ncmp(uid2name($a), uid2name($b));
+-				} keys %sessions), "\n";
++	print "Sessions:", join("\n- ", '', @sessions_list), "\n";
+     }
+ 
+     exit $ret;
+ }
++
++if ($opt_b and scalar %sessions) {
++    for my $sess (@sessions_list) {
++    	print "NEEDRESTART-SESS: $sess\n";
++    }
++}
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0034-Update-README.batch.md.patch b/debian/patches/Jammy-update-to-git-eb3531af-0034-Update-README.batch.md.patch
new file mode 100644
index 0000000..5722a10
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0034-Update-README.batch.md.patch
@@ -0,0 +1,32 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, e9fb6c990e887349f9c733e174845e0424e3b219
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From e9fb6c990e887349f9c733e174845e0424e3b219 Mon Sep 17 00:00:00 2001
+From: Stavros Ntentos <[e-mail]>
+Date: Wed, 26 Jan 2022 07:43:49 +0200
+Subject: [PATCH 34/43] Update README.batch.md
+
+_Commit suggestion from @anarcat_
+
+Co-authored-by: anarcat <[e-mail]>
+---
+ README.batch.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.batch.md b/README.batch.md
+index 55c429e..cdbd2c2 100644
+--- a/README.batch.md
++++ b/README.batch.md
+@@ -16,7 +16,7 @@ NEEDRESTART-CONT: LXC web1
+ 
+ Batch mode can be used to use the results of needrestart in other scripts.
+ While needrestart is run in batch mode it will never show any UI dialogs
+-nor restart anything. The output format is compliant to the
++nor restart anything. The output format is compliant with the
+ *apt-dater protocol*[1].
+ 
+ [1] https://github.com/DE-IBH/apt-dater-host/blob/master/doc/
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0035-use-a-configurable-tolerance-when-checking-interpret.patch b/debian/patches/Jammy-update-to-git-eb3531af-0035-use-a-configurable-tolerance-when-checking-interpret.patch
new file mode 100644
index 0000000..390b1f2
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0035-use-a-configurable-tolerance-when-checking-interpret.patch
@@ -0,0 +1,127 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 2c74dc034f3e5c177c255642c230d0eab4230395
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 2c74dc034f3e5c177c255642c230d0eab4230395 Mon Sep 17 00:00:00 2001
+From: Corey Hickey <[e-mail]>
+Date: Thu, 27 Jan 2022 14:55:43 -0800
+Subject: [PATCH 35/43] use a configurable tolerance when checking interpreter
+ files
+
+This addresses:
+https://github.com/liske/needrestart/issues/228
+...without being a complete "fix", since that does not seem to be
+possible.
+
+Further details are in the bug report above, but in brief, Linux can
+only report process start time with a precision of 1.1 seconds, and that
+gets rounded off, thus false positives are quite possible for processes
+that start immediately after their files are created.
+
+Since this can allow some false negatives, allow the user to decide.
+The default tolerance of 2 should accomodate common use cases without
+causing excessive false negatives.
+---
+ man/needrestart.1       |  3 +++
+ needrestart             | 10 +++++++---
+ perl/lib/NeedRestart.pm |  5 +++--
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/man/needrestart.1 b/man/needrestart.1
+index 75042bf..39627dd 100644
+--- a/man/needrestart.1
++++ b/man/needrestart.1
+@@ -52,6 +52,9 @@ nagios plugin mode: makes output and exit codes nagios compatible
+ \fB\-f\fR <fe>
+ override debconf(7) frontend, sets the DEBIAN_FRONTEND environment variable to <fe>
+ .TP
++\fB\-t\fR <seconds>
++When checking running interpreter processes, allow process start times that are close to timestamps of files the interpreter uses, within this tolerance (default 2). The default value of 2 seconds is best for checks of Linux hosts, on which system limitations prevent more accurate measurements of process start times. Values higher than 0 should prevent false positives yet may in extreme cases cause false negatives; values higher than 2 should not be necessary.
++.TP
+ \fB\-u\fR <ui>
+ use preferred UI package (-u ? shows available packages)
+ .PP
+diff --git a/needrestart b/needrestart
+index 0a048b5..91c467e 100755
+--- a/needrestart
++++ b/needrestart
+@@ -92,6 +92,7 @@ Usage:
+     -b		enable batch mode
+     -p          enable nagios plugin mode
+     -f <fe>	override debconf frontend (DEBIAN_FRONTEND, debconf(7))
++    -t <seconds> tolerate interpreter process start times within this value
+     -u <ui>     use preferred UI package (-u ? shows available packages)
+ 
+   By using the following options only the specified checks are performed:
+@@ -157,6 +158,7 @@ our %nrconf = (
+     containers => 1,
+     },
+     has_pam_systemd => 1,
++    tolerance => 2,
+ );
+ 
+ # backup ARGV (required for Debconf)
+@@ -173,9 +175,10 @@ our $opt_k;
+ our $opt_l;
+ our $opt_p;
+ our $opt_q;
++our $opt_t;
+ our $opt_u;
+ our $opt_w;
+-unless(getopts('c:vr:nm:bf:klpqu:w')) {
++unless(getopts('c:vr:nm:bf:klpqt:u:w')) {
+     HELP_MESSAGE;
+     exit 1;
+ }
+@@ -224,6 +227,7 @@ $opt_r = 'l' if(!$is_tty && $opt_r eq 'i');
+ $opt_m = $nrconf{ui_mode} unless(defined($opt_m));
+ die "ERROR: Unknown UI mode '$opt_m'!\n" unless($opt_m =~ /^(e|a)$/);
+ $opt_r = 'l' if($opt_m eq 'e');
++$opt_t = $nrconf{tolerance} unless(defined($opt_t));
+ 
+ $nrconf{defno}++ if($opt_n);
+ $opt_b++ if($opt_p);
+@@ -564,11 +568,11 @@ if(defined($opt_l)) {
+ 	}
+ 
+ 	unless($restart || !$nrconf{interpscan}) {
+-	    $restart++ if(needrestart_interp_check($nrconf{verbosity} > 1, $pid, $exe, $nrconf{blacklist_interp}));
++	    $restart++ if(needrestart_interp_check($nrconf{verbosity} > 1, $pid, $exe, $nrconf{blacklist_interp}, $opt_t));
+ 	}
+ 
+ 	# handle containers (LXC, docker, etc.)
+-	next if($restart && needrestart_cont_check($nrconf{verbosity} > 1, $pid, $exe));
++	next if($restart && needrestart_cont_check($nrconf{verbosity} > 1, $pid, $exe, $opt_t));
+ 
+ 	# restart needed?
+ 	next unless($restart);
+diff --git a/perl/lib/NeedRestart.pm b/perl/lib/NeedRestart.pm
+index 595d69b..99afc5d 100644
+--- a/perl/lib/NeedRestart.pm
++++ b/perl/lib/NeedRestart.pm
+@@ -155,11 +155,12 @@ sub needrestart_interp_init($) {
+     }
+ }
+ 
+-sub needrestart_interp_check($$$$) {
++sub needrestart_interp_check($$$$$) {
+     my $debug = shift;
+     my $pid = shift;
+     my $bin = shift;
+     my $blacklist = shift;
++    my $tolerance = shift;
+ 
+     needrestart_interp_init($debug) unless(%Interps);
+ 
+@@ -176,7 +177,7 @@ sub needrestart_interp_check($$$$) {
+ 		delete($files{$path});
+ 	    }
+ 
+-	    if(grep {!defined($_) || $_ > $ps->start} values %files) {
++	    if(grep {!defined($_) || $_ > $ps->start + $tolerance} values %files) {
+ 		if($debug) {
+ 		    print STDERR "$LOGPREF #$pid uses obsolete script file(s):";
+ 		    print STDERR join("\n$LOGPREF #$pid  ", '', map {(!defined($files{$_}) || $files{$_} > $ps->start ? $_ : ())} keys %files);
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0036-Fix-docker-detection-on-newer-Kernels.patch b/debian/patches/Jammy-update-to-git-eb3531af-0036-Fix-docker-detection-on-newer-Kernels.patch
new file mode 100644
index 0000000..cad1045
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0036-Fix-docker-detection-on-newer-Kernels.patch
@@ -0,0 +1,38 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, c250c9042900d5ea12fdeaac0a05a78d6fc08b73
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From c250c9042900d5ea12fdeaac0a05a78d6fc08b73 Mon Sep 17 00:00:00 2001
+From: Markus Frosch <[e-mail]>
+Date: Fri, 11 Feb 2022 17:49:32 +0100
+Subject: [PATCH 36/43] Fix docker detection on newer Kernels
+
+On Debian bullseye there will not always be a string after the first colon.
+
+Example:
+
+    0::/system.slice/docker-xxx.scope
+---
+ perl/lib/NeedRestart/CONT/docker.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/docker.pm b/perl/lib/NeedRestart/CONT/docker.pm
+index 80fdfc4..4a22525 100644
+--- a/perl/lib/NeedRestart/CONT/docker.pm
++++ b/perl/lib/NeedRestart/CONT/docker.pm
+@@ -67,9 +67,9 @@ sub check {
+     }
+ 
+     # look for docker cgroups
+-    return 0 unless($cg =~ /^\d+:[^:]+:\/system.slice\/docker-(.+)\.scope$/m ||
+-                    $cg =~ /^\d+:[^:]+:\/system.slice\/docker\.service$/m ||
+-                    $cg =~ /^\d+:[^:]+:\/docker\/([\da-f]+)$/m);
++    return 0 unless($cg =~ /^\d+:[^:]*:\/system.slice\/docker-(.+)\.scope$/m ||
++                    $cg =~ /^\d+:[^:]*:\/system.slice\/docker\.service$/m ||
++                    $cg =~ /^\d+:[^:]*:\/docker\/([\da-f]+)$/m);
+ 
+     print STDERR "$LOGPREF #$pid is part of docker container '$1' and will be ignored\n" if($self->{debug});
+ 
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0037-Default-override-virtlogd-virtlockd.patch b/debian/patches/Jammy-update-to-git-eb3531af-0037-Default-override-virtlogd-virtlockd.patch
new file mode 100644
index 0000000..88872b4
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0037-Default-override-virtlogd-virtlockd.patch
@@ -0,0 +1,41 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 0284ddc1be44303f131142448663c5702a44bc09
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 0284ddc1be44303f131142448663c5702a44bc09 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Fri, 9 Jul 2021 08:21:49 +0200
+Subject: [PATCH 37/43] Default override virtlogd / virtlockd
+
+Restarting virtlogd / virtlockd is really bad as guests would be fenced
+and restarted. This is intentionally skipped on the package upgrade [1]
+and tried to be the last that dies by upstream [2][3].
+
+We should at least not preselect those services to avoid these issues,
+therefore add them to the default override config.
+
+[1]: https://salsa.debian.org/libvirt-team/libvirt/-/blob/debian/master/debian/rules#L254
+[2]: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/logging/virtlogd.service.in;h=8ab547851772298ff570487f1ce2d3680c7e4d68;hb=HEAD#l13
+[3]: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/locking/virtlockd.service.in;h=4a6fab05ab309a04a8565a5c73cbcfb47dae8d5d;hb=HEAD#l13
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ ex/needrestart.conf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index d7fe3e9..29d1e62 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -108,6 +108,8 @@ $nrconf{override_rc} = {
+     qr(^xendomains) => 0,
+     qr(^lxcfs) => 0,
+     qr(^libvirt) => 0,
++    qr(^virtlogd)} = 0,
++    qr(^virtlockd)} = 0,
+     qr(^docker) => 0,
+ 
+     # systemd stuff
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0038-Detect-and-report-outdated-VMs.patch b/debian/patches/Jammy-update-to-git-eb3531af-0038-Detect-and-report-outdated-VMs.patch
new file mode 100644
index 0000000..f55667b
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0038-Detect-and-report-outdated-VMs.patch
@@ -0,0 +1,106 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 19c05a0e9bf425b0349d491ed026812a3a4d7359
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 19c05a0e9bf425b0349d491ed026812a3a4d7359 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Fri, 9 Jul 2021 08:38:08 +0200
+Subject: [PATCH 38/43] Detect and report outdated VMs
+
+Needrestart is awesome in detecting long running services or user
+sessions that are still running with old binaries. But there is
+another common kind of long-running process - VM Guests.
+
+Detecting the common qemu/KVM guests and reporting those to the
+user will help them to realize that also those guests should be
+considered to be restarted (or migrated onto an updated host)
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ needrestart | 42 +++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/needrestart b/needrestart
+index 91c467e..d38515c 100755
+--- a/needrestart
++++ b/needrestart
+@@ -441,6 +441,7 @@ print "NEEDRESTART-VER: $NeedRestart::VERSION\n" if($opt_b && !$opt_p);
+ 
+ my %restart;
+ my %sessions;
++my @guests;
+ my @easy_hints;
+ 
+ if(defined($opt_l)) {
+@@ -617,7 +618,7 @@ if(defined($opt_l)) {
+ 
+     if(scalar keys %stage2 && !$uid) {
+ 	$ui->progress_prep(scalar keys %stage2, __ 'Scanning candidates...');
+-	foreach my $pid (sort {$a <=> $b} keys %stage2) {
++	PIDLOOP: foreach my $pid (sort {$a <=> $b} keys %stage2) {
+ 	    $ui->progress_step;
+ 
+ 	    # skip myself
+@@ -660,6 +661,25 @@ if(defined($opt_l)) {
+ 				print STDERR "$LOGPREF #$pid part of user manager service: uid=$1\n" if($nrconf{verbosity} > 1);
+ 				push(@{ $sessions{$1}->{'user manager service'}->{ $ptable->{$pid}->{fname} } }, $pid);
+ 				next;
++			    }
++				if($value =~ m@/machine.slice/machine.qemu(.*).scope@) {
++				for my $cmdlineidx (0 .. $#{$ptable->{$pid}->{cmdline}} ) {
++					if ( ${$ptable->{$pid}->{cmdline}}[$cmdlineidx] eq "-name") {
++						foreach ( split(/,/, ${$ptable->{$pid}->{cmdline}}[$cmdlineidx+1]) ) {
++							if ( index($_, "guest=") == 0 ) {
++								my @namearg = split(/=/, $_, 2);
++								if ($#{namearg} == 1) {
++									print STDERR "$LOGPREF #$pid detected as VM guest '$namearg[1]' in group '$value'\n" if($nrconf{verbosity} > 1);
++									push(@guests, "VM '$namearg[1]' with pid $pid" );
++								}
++								next PIDLOOP;
++							}
++						}
++					}
++				}
++				print STDERR "$LOGPREF #$pid detected as VM guest with unknown name in group '$value'\n" if($nrconf{verbosity} > 1);
++				push(@guests, "'Unkown VM' with pid $pid" );
++				next;
+ 			    }
+ 			    elsif($value =~ m@/([^/]+\.service)$@) {
+ 				($1);
+@@ -761,6 +781,7 @@ if(defined($opt_l)) {
+ 		}
+ 
+ 		# No perfect hit - call any rc scripts instead.
++                print STDERR "$LOGPREF #$pid running $hook no perfect hit found $found pids $#nopids\n" if($nrconf{verbosity} > 1);
+ 		if(!$found && $#nopids > -1) {
+ 		    foreach my $rc (@nopids) {
+ 			if($is_systemd && exists($restart{"$rc.service"})) {
+@@ -1265,6 +1286,25 @@ if(defined($opt_l) && !$uid) {
+ 	    }
+ 	}
+     }
++
++	## GUESTS
++	$ui->vspace();
++	if (! @guests) {
++		$ui->notice(__ 'No VM guests are running outdated binaries.') unless($opt_b || $opt_m eq 'e');
++	}
++	else {
++		if($opt_m eq 'e') {
++			push(@easy_hints, __ 'outdated VM guests');
++		}
++		else {
++			unless($opt_p || $opt_b) {
++				$ui->notice(__ 'VM guests running outdated binaries:');
++				foreach ( @guests ) {
++				$ui->notice(__ " $_");
++				}
++			}
++		}
++	}
+ }
+ 
+ # easy mode: print hint on outdated stuff
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0039-VM-detection-improve-wording.patch b/debian/patches/Jammy-update-to-git-eb3531af-0039-VM-detection-improve-wording.patch
new file mode 100644
index 0000000..3e92871
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0039-VM-detection-improve-wording.patch
@@ -0,0 +1,42 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 7bd0690e5707b1df4565c5d171273b57f716fda0
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 7bd0690e5707b1df4565c5d171273b57f716fda0 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Thu, 3 Feb 2022 15:06:28 +0100
+Subject: [PATCH 39/43] VM detection: improve wording
+
+As discussed in the PR this shal avoid misunderstandings that we might
+scan inside the guest.
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ needrestart | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/needrestart b/needrestart
+index d38515c..f664571 100755
+--- a/needrestart
++++ b/needrestart
+@@ -1290,7 +1290,7 @@ if(defined($opt_l) && !$uid) {
+ 	## GUESTS
+ 	$ui->vspace();
+ 	if (! @guests) {
+-		$ui->notice(__ 'No VM guests are running outdated binaries.') unless($opt_b || $opt_m eq 'e');
++		$ui->notice(__ 'No VM guests are running outdated hypervisor (qemu) binaries on this host.') unless($opt_b || $opt_m eq 'e');
+ 	}
+ 	else {
+ 		if($opt_m eq 'e') {
+@@ -1298,7 +1298,7 @@ if(defined($opt_l) && !$uid) {
+ 		}
+ 		else {
+ 			unless($opt_p || $opt_b) {
+-				$ui->notice(__ 'VM guests running outdated binaries:');
++				$ui->notice(__ 'VM guests are running outdated hypervisor (qemu) binaries on this host:');
+ 				foreach ( @guests ) {
+ 				$ui->notice(__ " $_");
+ 				}
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0040-VM-detection-fix-whitespace-damage.patch b/debian/patches/Jammy-update-to-git-eb3531af-0040-VM-detection-fix-whitespace-damage.patch
new file mode 100644
index 0000000..1147aa0
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0040-VM-detection-fix-whitespace-damage.patch
@@ -0,0 +1,30 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, a2395bad0e40ac4f52ddcfadc1a09276f78d0e0f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From a2395bad0e40ac4f52ddcfadc1a09276f78d0e0f Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Thu, 3 Feb 2022 15:07:53 +0100
+Subject: [PATCH 40/43] VM detection: fix whitespace damage
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ needrestart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/needrestart b/needrestart
+index f664571..68db6c8 100755
+--- a/needrestart
++++ b/needrestart
+@@ -781,7 +781,7 @@ if(defined($opt_l)) {
+ 		}
+ 
+ 		# No perfect hit - call any rc scripts instead.
+-                print STDERR "$LOGPREF #$pid running $hook no perfect hit found $found pids $#nopids\n" if($nrconf{verbosity} > 1);
++		print STDERR "$LOGPREF #$pid running $hook no perfect hit found $found pids $#nopids\n" if($nrconf{verbosity} > 1);
+ 		if(!$found && $#nopids > -1) {
+ 		    foreach my $rc (@nopids) {
+ 			if($is_systemd && exists($restart{"$rc.service"})) {
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0041-VM-detection-do-not-localize-guests-that-are-found.patch b/debian/patches/Jammy-update-to-git-eb3531af-0041-VM-detection-do-not-localize-guests-that-are-found.patch
new file mode 100644
index 0000000..67dd63d
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0041-VM-detection-do-not-localize-guests-that-are-found.patch
@@ -0,0 +1,30 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, c47a314a149a9fb1d3dacfce6fe914695ab1a0c2
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From c47a314a149a9fb1d3dacfce6fe914695ab1a0c2 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Tue, 15 Feb 2022 10:04:28 +0100
+Subject: [PATCH 41/43] VM detection: do not localize guests that are found
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ needrestart | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/needrestart b/needrestart
+index 68db6c8..fde3083 100755
+--- a/needrestart
++++ b/needrestart
+@@ -1300,7 +1300,7 @@ if(defined($opt_l) && !$uid) {
+ 			unless($opt_p || $opt_b) {
+ 				$ui->notice(__ 'VM guests are running outdated hypervisor (qemu) binaries on this host:');
+ 				foreach ( @guests ) {
+-				$ui->notice(__ " $_");
++				$ui->notice(" $_");
+ 				}
+ 			}
+ 		}
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0042-VM-detection-localize-normal-output-of-vm-detection.patch b/debian/patches/Jammy-update-to-git-eb3531af-0042-VM-detection-localize-normal-output-of-vm-detection.patch
new file mode 100644
index 0000000..256f166
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0042-VM-detection-localize-normal-output-of-vm-detection.patch
@@ -0,0 +1,39 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, babfc9d810cbd1df4b7397139d3c81130f51a49c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From babfc9d810cbd1df4b7397139d3c81130f51a49c Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Tue, 8 Mar 2022 09:24:33 +0100
+Subject: [PATCH 42/43] VM detection: localize normal output of vm detection
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+---
+ needrestart | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/needrestart b/needrestart
+index fde3083..9f3d12b 100755
+--- a/needrestart
++++ b/needrestart
+@@ -670,7 +670,7 @@ if(defined($opt_l)) {
+ 								my @namearg = split(/=/, $_, 2);
+ 								if ($#{namearg} == 1) {
+ 									print STDERR "$LOGPREF #$pid detected as VM guest '$namearg[1]' in group '$value'\n" if($nrconf{verbosity} > 1);
+-									push(@guests, "VM '$namearg[1]' with pid $pid" );
++									push(@guests, __x("'{name}' with pid {pid}", name => $namearg[1], pid=>$pid) );
+ 								}
+ 								next PIDLOOP;
+ 							}
+@@ -678,7 +678,7 @@ if(defined($opt_l)) {
+ 					}
+ 				}
+ 				print STDERR "$LOGPREF #$pid detected as VM guest with unknown name in group '$value'\n" if($nrconf{verbosity} > 1);
+-				push(@guests, "'Unkown VM' with pid $pid" );
++				push(@guests, __x("'Unkown VM' with pid {pid}", pid=>$pid) );
+ 				next;
+ 			    }
+ 			    elsif($value =~ m@/([^/]+\.service)$@) {
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0043-Fix-LXC-LXD-and-machined-detection-for-cgroups-v2.patch b/debian/patches/Jammy-update-to-git-eb3531af-0043-Fix-LXC-LXD-and-machined-detection-for-cgroups-v2.patch
new file mode 100644
index 0000000..a734e70
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0043-Fix-LXC-LXD-and-machined-detection-for-cgroups-v2.patch
@@ -0,0 +1,48 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 8465c3eb9774ac2a07c8d1dd99a75c2bfdd10aa7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-16
+From 8465c3eb9774ac2a07c8d1dd99a75c2bfdd10aa7 Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <[e-mail]>
+Date: Thu, 10 Mar 2022 15:11:42 +0800
+Subject: [PATCH 43/43] Fix LXC/LXD and machined detection for cgroups v2
+
+The second field is always blank in cgroups v2 unlike v1, adjust parsing to
+support both cases for LXC/LXD and machined. This is the same fix as previously
+made for Docker in #234.
+
+Example: 0::/lxc.payload.focal/system.slice/avahi-daemon.service
+---
+ perl/lib/NeedRestart/CONT/LXC.pm      | 2 +-
+ perl/lib/NeedRestart/CONT/machined.pm | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
+index 3f522ae..4542f5b 100644
+--- a/perl/lib/NeedRestart/CONT/LXC.pm
++++ b/perl/lib/NeedRestart/CONT/LXC.pm
+@@ -81,7 +81,7 @@ sub check {
+     }
+ 
+     # look for LXC cgroups
+-    return unless($cg =~ /^\d+:[^:]+:\/lxc(?:.payload)?[.\/]([^\/\n]+)($|\/)/m);
++    return unless($cg =~ /^\d+:[^:]*:\/lxc(?:.payload)?[.\/]([^\/\n]+)($|\/)/m);
+ 
+     my $name = $1;
+     my $type = ($self->{has_lxd} && -d qq($self->{lxd_container_path}/$name) ? 'LXD' : 'LXC');
+diff --git a/perl/lib/NeedRestart/CONT/machined.pm b/perl/lib/NeedRestart/CONT/machined.pm
+index c86ac48..bdeb5ec 100644
+--- a/perl/lib/NeedRestart/CONT/machined.pm
++++ b/perl/lib/NeedRestart/CONT/machined.pm
+@@ -68,7 +68,7 @@ sub check {
+     }
+ 
+     # look for machined cgroups
+-    return 0 unless($cg =~ /^\d+:[^:]+:\/machine.slice\/machine-(.+)\.scope$/m);
++    return 0 unless($cg =~ /^\d+:[^:]*:\/machine.slice\/machine-(.+)\.scope$/m);
+ 
+     my $name = $1;
+     unless($norestart) {
+-- 
+2.35.1
+
diff --git a/debian/patches/Jammy-update-to-git-eb3531af-0044-Correct-syntax.patch b/debian/patches/Jammy-update-to-git-eb3531af-0044-Correct-syntax.patch
new file mode 100644
index 0000000..97dd19c
--- /dev/null
+++ b/debian/patches/Jammy-update-to-git-eb3531af-0044-Correct-syntax.patch
@@ -0,0 +1,37 @@
+Description: backport from git to stabilize jammy
+Origin: upstream, 8465c3eb9774ac2a07c8d1dd99a75c2bfdd10aa7
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1965090
+Last-Update: 2022-03-17
+From 477e85b3f81702066f38f6caa0d6fbdf5c0e0003 Mon Sep 17 00:00:00 2001
+From: Mark Wagie <[e-mail]>
+Date: Wed, 16 Mar 2022 08:37:00 -0600
+Subject: [PATCH] Correct syntax
+
+```
+Error parsing /etc/needrestart/needrestart.conf: Can't modify anonymous hash ({}) in scalar assignment at (eval 12) line 111, near "0,"
+Unmatched right curly bracket at (eval 12) line 112, at end of line
+syntax error at (eval 12) line 112, near "qr(^virtlockd)}"
+Unmatched right curly bracket at (eval 12) line 133, at end of line
+```
+---
+ ex/needrestart.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index 29d1e62..92f51f6 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -108,8 +108,8 @@ $nrconf{override_rc} = {
+     qr(^xendomains) => 0,
+     qr(^lxcfs) => 0,
+     qr(^libvirt) => 0,
+-    qr(^virtlogd)} = 0,
+-    qr(^virtlockd)} = 0,
++    qr(^virtlogd) => 0,
++    qr(^virtlockd) => 0,
+     qr(^docker) => 0,
+ 
+     # systemd stuff
+-- 
+2.35.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 77eec81..a1df828 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,44 @@
 06-dont-restart-bluetooth.diff
 07-runit.diff
 168.patch
+# Update based on git for various fixes before Jammy is released
+# Of the linear series from git patches 1/2/13/16/18/19 are already applied
+# above in the Debian packaging
+Jammy-update-to-git-eb3531af-0003-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0004-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0005-Fix-typo.patch
+Jammy-update-to-git-eb3531af-0006-Support-LXD-installed-through-snap.patch
+Jammy-update-to-git-eb3531af-0007-Handle-differences-in-cgroup-names-for-LXD-container.patch
+Jammy-update-to-git-eb3531af-0008-Fix-restarting-for-containers-in-LXD-projects.patch
+Jammy-update-to-git-eb3531af-0009-Update-documentation-for-LXC-LXD-support.patch
+Jammy-update-to-git-eb3531af-0010-Fix-typo-in-German-translation.patch
+Jammy-update-to-git-eb3531af-0011-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0012-systemd-manager-restart-Support-also-exe-usr-lib-sys.patch
+Jammy-update-to-git-eb3531af-0014-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0015-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0017-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0020-Update-LXC-D-cgroup-regex-for-LXC-4.0.patch
+Jammy-update-to-git-eb3531af-0021-Do-not-restart-elogind-by-default-205.patch
+Jammy-update-to-git-eb3531af-0022-Update-ChangeLog.patch
+Jammy-update-to-git-eb3531af-0023-Ignore-Java-Native-Access-mappings-closes-142-closes.patch
+Jammy-update-to-git-eb3531af-0024-Use-license-file-from-gnu.org.patch
+Jammy-update-to-git-eb3531af-0025-Fix-spelling.patch
+Jammy-update-to-git-eb3531af-0026-Fix-shellcheck-warnings.patch
+Jammy-update-to-git-eb3531af-0027-Trim-excess-whitespace.patch
+Jammy-update-to-git-eb3531af-0028-Update-README.batch.md.patch
+Jammy-update-to-git-eb3531af-0029-Ignore-all-memfd-mappings-Debian-Bug-972685-by-Micha.patch
+Jammy-update-to-git-eb3531af-0030-Kernel-Replace-strings-1-by-GNU-grep-to-drop-binutil.patch
+Jammy-update-to-git-eb3531af-0031-Do-not-print-perfdata-if-unknown-state.patch
+Jammy-update-to-git-eb3531af-0032-Add-icinga2-example-config.patch
+Jammy-update-to-git-eb3531af-0033-also-output-user-sessions-in-batch-mode.patch
+Jammy-update-to-git-eb3531af-0034-Update-README.batch.md.patch
+Jammy-update-to-git-eb3531af-0035-use-a-configurable-tolerance-when-checking-interpret.patch
+Jammy-update-to-git-eb3531af-0036-Fix-docker-detection-on-newer-Kernels.patch
+Jammy-update-to-git-eb3531af-0037-Default-override-virtlogd-virtlockd.patch
+Jammy-update-to-git-eb3531af-0038-Detect-and-report-outdated-VMs.patch
+Jammy-update-to-git-eb3531af-0039-VM-detection-improve-wording.patch
+Jammy-update-to-git-eb3531af-0040-VM-detection-fix-whitespace-damage.patch
+Jammy-update-to-git-eb3531af-0041-VM-detection-do-not-localize-guests-that-are-found.patch
+Jammy-update-to-git-eb3531af-0042-VM-detection-localize-normal-output-of-vm-detection.patch
+Jammy-update-to-git-eb3531af-0043-Fix-LXC-LXD-and-machined-detection-for-cgroups-v2.patch
+Jammy-update-to-git-eb3531af-0044-Correct-syntax.patch