Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package needrestart
It fixes some grave and a few important bugs (patchset 13+14 are also
important).
diffstat:
changelog | 16 +++++++++++++
patches/10-respect-override-auto.diff | 31 +++++++++++++++++++++++++++
patches/11-systemd-journald-workaround.diff | 21 ++++++++++++++++++
patches/12-ignore-systemd-user-sessions.diff | 21 ++++++++++++++++++
patches/13-falsepos-aio-fix.diff | 19 ++++++++++++++++
patches/14-wpa_supplicant-override.diff | 17 ++++++++++++++
patches/series | 5 ++++
7 files changed, 130 insertions(+)
full diff:
diff -Naur '--exclude=.svn' 1.2-5/debian/changelog 1.2-6/debian/changelog
--- 1.2-5/debian/changelog 2014-12-04 13:52:42.079128087 +0100
+++ 1.2-6/debian/changelog 2014-12-04 14:15:54.812814981 +0100
@@ -1,3 +1,19 @@
+needrestart (1.2-6) unstable; urgency=high
+
+ * Add patch 10-respect-override-auto to not restart services with overrides
+ in auto mode.
+ Closes: #770937
+ * Add patch 11-systemd-journald-workaround to add systemd-journald to
+ override_rc as a workaround tue to #771122.
+ Closes: #771254
+ * Add patch 12-ignore-systemd-user-sessions to ignore user sessions.
+ Closes: #771348
+ * Add patch 13-falsepos-aio-fix to skip POSIX async I/O mappings to prevent
+ false positive restarts.
+ * Add patch 14-wpa_supplicant-override to ignore wpa_supplicant.
+
+ -- Patrick Matthäi <pmatth...@debian.org> Thu, 04 Dec 2014 14:07:10 +0100
+
needrestart (1.2-5) unstable; urgency=high
* Add patch 08-fix-broken-debconf to fix a debconf hang up if no kernel image
diff -Naur '--exclude=.svn' 1.2-5/debian/patches/10-respect-override-auto.diff
1.2-6/debian/patches/10-respect-override-auto.diff
--- 1.2-5/debian/patches/10-respect-override-auto.diff 1970-01-01
01:00:00.000000000 +0100
+++ 1.2-6/debian/patches/10-respect-override-auto.diff 2014-12-04
14:15:54.892814609 +0100
@@ -0,0 +1,31 @@
+# Don't restart services with overrides in auto mode.
+# Closes: #770937
+
+diff --git a/needrestart b/needrestart
+index 32bbd13..558f4f6 100755
+--- a/needrestart
++++ b/needrestart
+@@ -516,6 +516,20 @@ if(defined($opt_l)) {
+ next;
+ }
+
++ # don't restart greylisted services...
++ my $restart = !$nrconf{defno};
++ foreach my $re (keys %{$nrconf{override_rc}}) {
++ next unless($rc =~ /$re/);
++
++ $restart = $nrconf{override_rc}->{$re};
++ last;
++ }
++ # ...but complain about them
++ unless($restart) {
++ $ui->notice("Skipping $rc...");
++ next;
++ }
++
+ my @cmd = restart_cmd($rc);
+ next unless($#cmd > -1);
+
+--
+2.1.3
+
diff -Naur '--exclude=.svn'
1.2-5/debian/patches/11-systemd-journald-workaround.diff
1.2-6/debian/patches/11-systemd-journald-workaround.diff
--- 1.2-5/debian/patches/11-systemd-journald-workaround.diff 1970-01-01
01:00:00.000000000 +0100
+++ 1.2-6/debian/patches/11-systemd-journald-workaround.diff 2014-12-04
14:15:54.880814664 +0100
@@ -0,0 +1,21 @@
+# Add systemd-journald to override_rc as a workaround due to Debian Bug#771122.
+# Closes: #771254
+
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index 235ce8c..c99cffd 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -81,6 +81,10 @@ $nrconf{override_rc} = {
+ # misc
+ q(^zfs-fuse) => 0,
+ q(^mythtv-backend) => 0,
++
++ # workaround for broken systemd-journald
++ # (see also Debian Bug#771122 & #771254)
++ q(^systemd-journald) => 0,
+ };
+
+ # Disable interpreter scanners.
+--
+2.1.3
+
diff -Naur '--exclude=.svn'
1.2-5/debian/patches/12-ignore-systemd-user-sessions.diff
1.2-6/debian/patches/12-ignore-systemd-user-sessions.diff
--- 1.2-5/debian/patches/12-ignore-systemd-user-sessions.diff 1970-01-01
01:00:00.000000000 +0100
+++ 1.2-6/debian/patches/12-ignore-systemd-user-sessions.diff 2014-12-04
14:15:54.900814569 +0100
@@ -0,0 +1,21 @@
+# Ignore pids of user sessions completely.
+# Closes: #771348
+
+diff --git a/needrestart b/needrestart
+index 558f4f6..932e595 100755
+--- a/needrestart
++++ b/needrestart
+@@ -351,6 +351,10 @@ if(defined($opt_l)) {
+ if($value =~ m@/([^/]+\.service)$@) {
+ ($1);
+ }
++ elsif($value =
m@/user-(\d+).slice/session-(\d+).scope@) {
++ print STDERR "$LOGPREF #$pid is ignored; part
of user session: uid=$1 sess=$2\n" if($nrconf{verbose});
++ next;
++ }
+ else {
+ print STDERR "$LOGPREF #$pid unexpected cgroup
'$value'\n" if($nrconf{verbose});
+ ();
+--
+2.1.3
+
diff -Naur '--exclude=.svn' 1.2-5/debian/patches/13-falsepos-aio-fix.diff
1.2-6/debian/patches/13-falsepos-aio-fix.diff
--- 1.2-5/debian/patches/13-falsepos-aio-fix.diff 1970-01-01
01:00:00.000000000 +0100
+++ 1.2-6/debian/patches/13-falsepos-aio-fix.diff 2014-12-04
14:15:54.892814609 +0100
@@ -0,0 +1,19 @@
+# Skip POSIX async I/O mappings to prevent false positive restarts (i.e.
zfs-fuse).
+
+diff --git a/needrestart b/needrestart
+index 932e595..a1c43d9 100755
+--- a/needrestart
++++ b/needrestart
+@@ -251,6 +251,9 @@ if(defined($opt_l)) {
+ # skip special device paths
+ next if($path =~ m@^/(SYSV00000000$|drm$|dev/)@);
+
++ # skip aio(7) mapping
++ next if($path =~ m@^/\[aio\]@);
++
+ # check for non-existing libs
+ unless(-e $path) {
+ unless($path =~ m@^/tmp/@) {
+--
+2.1.3
+
diff -Naur '--exclude=.svn'
1.2-5/debian/patches/14-wpa_supplicant-override.diff
1.2-6/debian/patches/14-wpa_supplicant-override.diff
--- 1.2-5/debian/patches/14-wpa_supplicant-override.diff 1970-01-01
01:00:00.000000000 +0100
+++ 1.2-6/debian/patches/14-wpa_supplicant-override.diff 2014-12-04
14:15:54.900814569 +0100
@@ -0,0 +1,17 @@
+# Add override_rc entry for wpa_supplicant.service.
+
+diff --git a/ex/needrestart.conf b/ex/needrestart.conf
+index d20af39..95efb3f 100644
+--- a/ex/needrestart.conf
++++ b/ex/needrestart.conf
+@@ -64,6 +64,7 @@ $nrconf{override_rc} = {
+ # networking stuff
+ q(^network-manager) => 0,
+ q(^NetworkManager) => 0,
++ q(^wpa_supplicant) => 0,
+ q(^openvpn) => 0,
+ q(^quagga) => 0,
+ q(^tinc) => 0,
+--
+2.1.3
+
diff -Naur '--exclude=.svn' 1.2-5/debian/patches/series
1.2-6/debian/patches/series
--- 1.2-5/debian/patches/series 2014-12-04 13:52:42.051128214 +0100
+++ 1.2-6/debian/patches/series 2014-12-04 14:15:54.892814609 +0100
@@ -7,3 +7,8 @@
07-fix-warnings-without-tty.diff
08-fix-broken-debconf.diff
09-add-some-overrides.diff
+10-respect-override-auto.diff
+11-systemd-journald-workaround.diff
+12-ignore-systemd-user-sessions.diff
+13-falsepos-aio-fix.diff
+14-wpa_supplicant-override.diff
unblock needrestart/1.2-6
-- System Information:
Debian Release: 7.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
