Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package needrestart It adds some upstream patches to fix some small bugs: $ diff -Naur 3.5-2/ 3.5-4/ |diffstat changelog | 24 ++++++++++++++++ patches/02-ruby-relative-path.diff | 19 ++++++++++++ patches/03-fix-wrong-default-comment.diff | 21 ++++++++++++++ patches/04-verbose-and-verbosity-confusion.diff | 19 ++++++++++++ patches/05-ignore-nvidia-memfd.diff | 20 +++++++++++++ patches/06-dont-restart-bluetooth.diff | 25 ++++++++++++++++ patches/07-runit.diff | 36 ++++++++++++++++++++++++ patches/series | 6 ++++ watch | 2 - 9 files changed, 171 insertions(+), 1 deletion(-) I have attached the full diff. unblock needrestart/3.5-4 -- System Information: Debian Release: 10.9 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 4.19.0-16-amd64 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Naur 3.5-2/debian/changelog 3.5-4/debian/changelog --- 3.5-2/debian/changelog 2020-11-19 15:10:20.971201274 +0100 +++ 3.5-4/debian/changelog 2021-04-12 10:08:42.636804816 +0200 @@ -1,3 +1,27 @@ +needrestart (3.5-4) unstable; urgency=medium + + * New source only upload. + + -- Patrick Matthäi <pmatth...@debian.org> Mon, 12 Apr 2021 10:04:21 +0200 + +needrestart (3.5-3) unstable; urgency=medium + + * debian/watch: Adjust github URL. + * Add stable upstream patch 02-ruby-relative-path to fix detection for ruby + script started from relative paths. + * Add stable upstream patch 03-fix-wrong-default-comment to fix comment for + default value of skip_mapfiles. + * Add stable upstream patch 04-verbose-and-verbosity-confusion to fix + verbose/verbosity confusion in needrestart.conf. + * Add stable upstream patch 05-ignore-nvidia-memfd to ignore memfd used by + nvidia binary drivers. + * Add stable upstream patch 06-dont-restart-bluetooth to ignore restarting + bluetooth by default. + * Add stable upstream patch 07-runit to add support for runit. + Closes: #972685 + + -- Patrick Matthäi <pmatth...@debian.org> Fri, 09 Apr 2021 11:17:52 +0200 + needrestart (3.5-2) unstable; urgency=medium * Adjust lintian overrides. diff -Naur 3.5-2/debian/patches/02-ruby-relative-path.diff 3.5-4/debian/patches/02-ruby-relative-path.diff --- 3.5-2/debian/patches/02-ruby-relative-path.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/02-ruby-relative-path.diff 2021-04-12 10:08:42.636804816 +0200 @@ -0,0 +1,19 @@ +commit 6c32e54d57af4f70e0bb4e8504d752d394c773e5 +Author: Alexander Neumann <alexander.neum...@redteam-pentesting.de> +Date: Wed May 20 12:10:30 2020 +0200 + + [Interp] Fix detection for ruby script started from relative paths. + +diff --git a/perl/lib/NeedRestart/Interp/Ruby.pm b/perl/lib/NeedRestart/Interp/Ruby.pm +index a333504..88d39c6 100644 +--- a/perl/lib/NeedRestart/Interp/Ruby.pm ++++ b/perl/lib/NeedRestart/Interp/Ruby.pm +@@ -171,7 +171,7 @@ sub files { + print STDERR "$LOGPREF #$pid: could not get a source file, skipping\n" if($self->{debug}); + return (); + } +- my $src = $ARGV[0]; ++ my $src = abs_path($ARGV[0]); + unless(-r $src && -f $src) { + chdir($cwd); + print STDERR "$LOGPREF #$pid: source file '$src' not found, skipping\n" if($self->{debug}); diff -Naur 3.5-2/debian/patches/03-fix-wrong-default-comment.diff 3.5-4/debian/patches/03-fix-wrong-default-comment.diff --- 3.5-2/debian/patches/03-fix-wrong-default-comment.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/03-fix-wrong-default-comment.diff 2021-04-12 10:08:42.636804816 +0200 @@ -0,0 +1,21 @@ +commit 621e7bf65b86adcd2fc0448944d1ac9659e1d317 +Author: iasdeoupxe <39667843+iasdeou...@users.noreply.github.com> +Date: Sat Apr 4 21:16:31 2020 +0200 + + [Core] Fix comment for default value of `skip_mapfiles`. + +diff --git a/ex/needrestart.conf b/ex/needrestart.conf +index b327855..c83bddb 100644 +--- a/ex/needrestart.conf ++++ b/ex/needrestart.conf +@@ -165,8 +165,8 @@ $nrconf{blacklist_mappings} = [ + ]; + + # Verify mapped files in fileystem: +-# 0 : enabled (default) +-# -1: ignore non-existing files, workaround for chroots and broken grsecurity kernels ++# 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 + $nrconf{skip_mapfiles} = -1; + diff -Naur 3.5-2/debian/patches/04-verbose-and-verbosity-confusion.diff 3.5-4/debian/patches/04-verbose-and-verbosity-confusion.diff --- 3.5-2/debian/patches/04-verbose-and-verbosity-confusion.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/04-verbose-and-verbosity-confusion.diff 2021-04-12 10:08:42.640804793 +0200 @@ -0,0 +1,19 @@ +commit 059377a86f6db6b6bddd0914c3a3ae179b36ee32 +Author: Jan-Philipp Litza <jpli...@users.noreply.github.com> +Date: Wed Nov 4 10:30:09 2020 +0100 + + [Core] Fix verbose/verbosity confusion in needrestart.conf. + +diff --git a/ex/needrestart.conf b/ex/needrestart.conf +index c83bddb..b532c89 100644 +--- a/ex/needrestart.conf ++++ b/ex/needrestart.conf +@@ -206,7 +206,7 @@ $nrconf{skip_mapfiles} = -1; + # Read additional config snippets. + if(-d q(/etc/needrestart/conf.d)) { + foreach my $fn (sort </etc/needrestart/conf.d/*.conf>) { +- print STDERR "$LOGPREF eval $fn\n" if($nrconf{verbose}); ++ print STDERR "$LOGPREF eval $fn\n" if($nrconf{verbosity} > 1); + eval do { local(@ARGV, $/) = $fn; <>}; + die "Error parsing $fn: $@" if($@); + } diff -Naur 3.5-2/debian/patches/05-ignore-nvidia-memfd.diff 3.5-4/debian/patches/05-ignore-nvidia-memfd.diff --- 3.5-2/debian/patches/05-ignore-nvidia-memfd.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/05-ignore-nvidia-memfd.diff 2021-04-12 10:08:42.636804816 +0200 @@ -0,0 +1,20 @@ +commit 19cac775eb76591458659b413454b22d67a1b578 +Author: StarQuake <starqu...@linuxeverywhere.org> +Date: Mon Nov 30 16:52:05 2020 +0100 + + [Core] Ignore memfd used by nvidia binary drivers. + +diff --git a/ex/needrestart.conf b/ex/needrestart.conf +index b532c89..a2acb99 100644 +--- a/ex/needrestart.conf ++++ b/ex/needrestart.conf +@@ -150,6 +150,9 @@ $nrconf{blacklist_mappings} = [ + # special device paths + qr(^/(SYSV00000000( \(deleted\))?|drm(\s|$)|dev/)), + ++ # ignore memfd file used by nvidia binary drivers ++ qr(^/memfd:/.glXXXXXX), ++ + # aio(7) mapping + qr(^/\[aio\]), + diff -Naur 3.5-2/debian/patches/06-dont-restart-bluetooth.diff 3.5-4/debian/patches/06-dont-restart-bluetooth.diff --- 3.5-2/debian/patches/06-dont-restart-bluetooth.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/06-dont-restart-bluetooth.diff 2021-04-12 10:08:42.640804793 +0200 @@ -0,0 +1,25 @@ +commit b5903849e93929cadb51b6498fd3efa07f6f417b +Author: Erik Tews <e...@datenzone.de> +Date: Wed Mar 3 16:00:40 2021 +0100 + + [Core] Don't restart bluetooth service by default. + + Depending on how the system is configured, a restart of the bluetooth + service might result in a loss of network connectivity as well. Also, + it will disconnect bluetooth speakers/headphones, which is annoying + for the user. + + With this commit, bluetooth is not restarted by default. + +diff --git a/ex/needrestart.conf b/ex/needrestart.conf +index a2acb99..4b2f6cb 100644 +--- a/ex/needrestart.conf ++++ b/ex/needrestart.conf +@@ -95,6 +95,7 @@ $nrconf{override_rc} = { + qr(^frr) => 0, + qr(^tinc) => 0, + qr(^(open|free|libre|strong)swan) => 0, ++ qr(^bluetooth) => 0, + + # gettys + qr(^getty@.+\.service) => 0, diff -Naur 3.5-2/debian/patches/07-runit.diff 3.5-4/debian/patches/07-runit.diff --- 3.5-2/debian/patches/07-runit.diff 1970-01-01 01:00:00.000000000 +0100 +++ 3.5-4/debian/patches/07-runit.diff 2021-04-12 10:08:42.636804816 +0200 @@ -0,0 +1,36 @@ +commit 4b9d262204bc5be97b84993922771e0db3ceb0ac +Author: Lorenzo Puliti <plore...@disroot.org> +Date: Fri Oct 23 10:46:55 2020 +0200 + + [Core] Add support for runit (fixes Debian Bug#972685). + + When runit is used as init system, a native runscript exists + and is enabled, use 'sv' instead of 'service'. + If no native runscript exists (or is disabled) we fallback on 'service' + +diff -Naur needrestart-3.5.orig/needrestart needrestart-3.5/needrestart +--- needrestart-3.5.orig/needrestart 2021-04-09 11:20:51.000000000 +0200 ++++ needrestart-3.5/needrestart 2021-04-09 11:23:36.106602774 +0200 +@@ -46,6 +46,7 @@ + + my $LOGPREF = '[main]'; + my $is_systemd = -d q(/run/systemd/system); ++my $is_runit = -e q(/run/runit.stopit); + my $is_tty = (-t *STDERR || -t *STDOUT || -t *STDIN); + my $is_vm; + my $is_container; +@@ -386,6 +387,14 @@ + (qw(systemctl restart), qq($rc.service)); + } + } ++ elsif($is_runit && -d qq(/etc/sv/$rc)) { ++ if(-e qq(/etc/service/$rc)) { ++ (qw(sv restart), $rc); ++ } ++ else { ++ (q(service), $rc, q(restart)); ++ } ++ } + else { + (q(invoke-rc.d), $rc, q(restart)); + } diff -Naur 3.5-2/debian/patches/series 3.5-4/debian/patches/series --- 3.5-2/debian/patches/series 2020-11-19 15:10:20.979201245 +0100 +++ 3.5-4/debian/patches/series 2021-04-12 10:08:42.636804816 +0200 @@ -1 +1,7 @@ 01-use-invoke-rc-d.diff +02-ruby-relative-path.diff +03-fix-wrong-default-comment.diff +04-verbose-and-verbosity-confusion.diff +05-ignore-nvidia-memfd.diff +06-dont-restart-bluetooth.diff +07-runit.diff diff -Naur 3.5-2/debian/watch 3.5-4/debian/watch --- 3.5-2/debian/watch 2020-11-19 15:10:20.999201173 +0100 +++ 3.5-4/debian/watch 2021-04-12 10:08:42.640804793 +0200 @@ -1,3 +1,3 @@ version=4 https://github.com/liske/needrestart/releases \ -/liske/needrestart/archive/v(.+)\.tar\.gz +/liske/needrestart/archive/refs/tags/v(.+)\.tar\.gz