Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: tho...@fiasko-nw.net
Please unblock package needrestart [ Reason ] In the past I have used the wrong version number, to remove a leftover config file. Also this update should close two noisy bugs (ignore serial-getty) and especially make the VM & microcode detection work again (just produced by a small typo). [ Impact ] Some smaller but noisy bugs. [ Tests ] Automated: debian/tests/sanity-test.sh I also manual tested the update [ Risks ] Small diffs, I do not see a risk here. [ Checklist ] [x ] all changes are documented in the d/changelog [x ] I reviewed all changes and I approve them [x ] attach debdiff against the package in testing unblock needrestart/3.6-4
diff -Nru needrestart-3.6/debian/changelog needrestart-3.6/debian/changelog --- needrestart-3.6/debian/changelog 2023-01-12 11:08:33.000000000 +0100 +++ needrestart-3.6/debian/changelog 2023-05-31 16:47:03.000000000 +0200 @@ -1,3 +1,15 @@ +needrestart (3.6-4) unstable; urgency=medium + + * Remove leftover conffile 30-pacman with 3.6-4. + Closes: #1036526 + * Add patch 03-ignore-serial-getty from Helmut Grohne to ignore serial-getty. + Closes: #1035721 + * Add upstream patch 04-vm-detection to fix a typo, which prevents the VM and + microcode detection. + Closes: #1026026 + + -- Patrick Matthäi <pmatth...@debian.org> Wed, 31 May 2023 16:47:03 +0200 + needrestart (3.6-3) unstable; urgency=medium * Adjust debian/watch to work again with GitHub. diff -Nru needrestart-3.6/debian/needrestart.postinst needrestart-3.6/debian/needrestart.postinst --- needrestart-3.6/debian/needrestart.postinst 2023-01-12 11:08:33.000000000 +0100 +++ needrestart-3.6/debian/needrestart.postinst 2023-05-31 16:47:03.000000000 +0200 @@ -2,6 +2,6 @@ set -e -dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.5-4 -- "$@" +dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.6-4 -- "$@" #DEBHELPER# diff -Nru needrestart-3.6/debian/needrestart.postrm needrestart-3.6/debian/needrestart.postrm --- needrestart-3.6/debian/needrestart.postrm 2023-01-12 11:08:33.000000000 +0100 +++ needrestart-3.6/debian/needrestart.postrm 2023-05-31 16:47:03.000000000 +0200 @@ -2,6 +2,6 @@ set -e -dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.5-4 -- "$@" +dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.6-4 -- "$@" #DEBHELPER# diff -Nru needrestart-3.6/debian/needrestart.preinst needrestart-3.6/debian/needrestart.preinst --- needrestart-3.6/debian/needrestart.preinst 2023-01-12 11:08:33.000000000 +0100 +++ needrestart-3.6/debian/needrestart.preinst 2023-05-31 16:47:03.000000000 +0200 @@ -2,6 +2,6 @@ set -e -dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.5-4 -- "$@" +dpkg-maintscript-helper rm_conffile /etc/needrestart/hook.d/30-pacman 3.6-4 -- "$@" #DEBHELPER# diff -Nru needrestart-3.6/debian/patches/03-ignore-serial-getty.diff needrestart-3.6/debian/patches/03-ignore-serial-getty.diff --- needrestart-3.6/debian/patches/03-ignore-serial-getty.diff 1970-01-01 01:00:00.000000000 +0100 +++ needrestart-3.6/debian/patches/03-ignore-serial-getty.diff 2023-05-31 16:47:03.000000000 +0200 @@ -0,0 +1,13 @@ +Subject: do not restart serial-getty@*.service +Author: Helmut Grohne <hel...@subdivi.de> + +--- a/ex/needrestart.conf ++++ b/ex/needrestart.conf +@@ -98,6 +98,7 @@ $nrconf{override_rc} = { + + # gettys + qr(^getty@.+\.service) => 0, ++ qr(^serial-getty@.+\.service) => 0, + + # systemd --user + qr(^user@\d+\.service) => 0, diff -Nru needrestart-3.6/debian/patches/04-vm-detection.diff needrestart-3.6/debian/patches/04-vm-detection.diff --- needrestart-3.6/debian/patches/04-vm-detection.diff 1970-01-01 01:00:00.000000000 +0100 +++ needrestart-3.6/debian/patches/04-vm-detection.diff 2023-05-31 16:47:03.000000000 +0200 @@ -0,0 +1,22 @@ +From 27bf4678bb92f68dfadd04ab04e96cba6ea2c376 Mon Sep 17 00:00:00 2001 +From: zxyrepf <53189615+zxyr...@users.noreply.github.com> +Date: Sun, 24 Jul 2022 08:30:19 +0000 +Subject: [PATCH] Fix VM detection regression introduced in f54d85c + +--- + needrestart | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/needrestart b/needrestart +index 64509ba..bcec62b 100755 +--- a/needrestart ++++ b/needrestart +@@ -51,7 +51,7 @@ my $is_tty = (-t *STDERR || -t *STDOUT || -t *STDIN); + my $is_vm; + my $is_container; + +-if($is_systemd && -x q(/usr/bin/systemds-detect-virt)) { ++if($is_systemd && -x q(/usr/bin/systemd-detect-virt)) { + # check if we are inside of a vm + my $ret = system(qw(/usr/bin/systemd-detect-virt --vm --quiet)); + unless($? == -1 || $? & 127) { diff -Nru needrestart-3.6/debian/patches/series needrestart-3.6/debian/patches/series --- needrestart-3.6/debian/patches/series 2023-01-12 11:08:33.000000000 +0100 +++ needrestart-3.6/debian/patches/series 2023-05-31 16:47:03.000000000 +0200 @@ -1,2 +1,4 @@ 01-use-invoke-rc-d.diff 02-bash-term-in-posix-shell.diff +03-ignore-serial-getty.diff +04-vm-detection.diff