Merge ~bryce/ubuntu/+source/logwatch:sru-lp1880211-focal into ubuntu/+source/logwatch:ubuntu/focal-devel

[Bryce Harrington]

This corrects an earlier URL that pulled in upstream's reimplementation of our proposed fix, but which actually introduced a regression. The new code assumed Perl's -x operator considers the $PATH, but it doesn't appear to do so. Instead, we need to explicitly check abspaths in order to find zfs.

This also tightens up requirements to require both `zfs` and `zpool` to be available, and not just assume if one is the other will too.

Note that installing zfsutils-linux in LXC seems to be pretty fussy about kernel module versions, so my testing has been a bit synthetic (and I suppose is why the original issue slipped through). So extra attention on testing in review would be appreciated.

[Christian Ehrhardt  (paelzer)]

Hmm, LP is confused by the Focal MP for this case.

Current packages:
 logwatch | 7.5.2-1ubuntu1 | focal | source, all
 logwatch | 7.5.2-1ubuntu1.1 | focal-updates | source, all

Checking it in git

commit c7185e41e4a9554b1611d0c6a801abf8f78911ed (HEAD -> sru-lp1880211-focal, tag: pkg/upload/7.5.2-1ubuntu1.1, tag: pkg/import/7.5.2-1ubuntu1.1, tag: bryce/upload/7.5.2-1ubuntu1.1, pkg/ubuntu/focal-updates, pkg/ubuntu/focal-proposed, pkg/ubuntu/focal-devel, bryce/sru-lp1880211-focal, bryce/fix-unmatched-entries-focal)
Author: Bryce Harrington <email address hidden>
Date: Fri Sep 4 11:58:57 2020 -0700

    changelog

That is a bit noisy, but the following is empty:
$ git diff sru-lp1880211-focal..pkg/ubuntu/focal-devel

Therefore this is missing ... something ...

review: Needs Fixing

696555e... by Bryce Harrington on 2021-04-16

changelog

55d2f9d... by Bryce Harrington on 2021-04-16

  * Replace zfs/zpool executable detection change with fixed version.
    - Add d/p/0010-zz-zfs-detect-zfs-location.patch
    - Drop d/p/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch
    (LP: #1880211)

[Utkarsh Gupta (utkarsh)]

Hello,

Looks good now, I guess. Go ahead with the upload, Bryce! \o/

[Bryce Harrington (bryce)]

Thanks Utkarsh

$ git ubuntu tag --upload
$ git push pkg upload/7.5.2-1ubuntu1.2
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 12 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.98 KiB | 507.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/logwatch
 * [new tag] upload/7.5.2-1ubuntu1.2 -> upload/7.5.2-1ubuntu1.2
$ dput ubuntu logwatch_7.5.2-1ubuntu1.2_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/Logwatch/sru-lp1880211/logwatch_7.5.2-1ubuntu1.2_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/Logwatch/sru-lp1880211/logwatch_7.5.2-1ubuntu1.2.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading logwatch_7.5.2-1ubuntu1.2.dsc: done.
  Uploading logwatch_7.5.2-1ubuntu1.2.debian.tar.xz: done.
  Uploading logwatch_7.5.2-1ubuntu1.2_source.buildinfo: done.
  Uploading logwatch_7.5.2-1ubuntu1.2_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This appeared in -proposed and is in git-ubuntu

 logwatch | 7.4.3+git20161207-2ubuntu1.3 | bionic-proposed | source, all
 logwatch | 7.5.2-1ubuntu1.2 | focal-proposed | source, all
 logwatch | 7.5.4-0ubuntu3.1 | groovy-proposed | source, all

Setting to merged

diff --git a/debian/changelog b/debian/changelog
index aa7efed..9bc9fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+logwatch (7.5.2-1ubuntu1.2) focal; urgency=medium
+
+  * Replace zfs/zpool executable detection change with fixed version.
+    - Add d/p/0010-zz-zfs-detect-zfs-location.patch
+    - Drop d/p/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch
+    (LP: #1880211)
+
+ -- Bryce Harrington <[e-mail]>  Fri, 16 Apr 2021 16:05:11 +0000
+
 logwatch (7.5.2-1ubuntu1.1) focal; urgency=medium
 
   [ Bryce Harrington ]
diff --git a/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch b/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch
deleted file mode 100644
index bd08f5a..0000000
--- a/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 01136a8b3e14a58660db6cc39138d3e40a852737 Mon Sep 17 00:00:00 2001
-From: bjorn <[e-mail]>
-Date: Sat, 6 Jun 2020 18:03:32 -0700
-Subject: [PATCH] [zz-zfs] Use $PATH to determine location of zpool and zfs. 
- Reported by          Paride Legovini, and previously by Stephen Sewell.
-
-Signed-off-by: Bryce Harrington <[e-mail]>
----
- scripts/services/zz-zfs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Origin: upstream, https://sourceforge.net/p/logwatch/git/ci/01136a8b3e14a58660db6cc39138d3e40a852737/
-Bug: https://sourceforge.net/p/logwatch/bugs/83
-Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1880211
-Last-Updated: 2020-09-08
-
-diff --git a/scripts/services/zz-zfs b/scripts/services/zz-zfs
-index 2234403..95eff2c 100644
---- a/scripts/services/zz-zfs
-+++ b/scripts/services/zz-zfs
-@@ -52,8 +52,8 @@ if ($ENV{'LOGWATCH_ONLY_HOSTNAME'} && ($logwatch_hostname ne $host)) {
-   exit 0;
- }
- 
--my $pathto_zpool = $ENV{'pathto_zpool'} || '/usr/sbin/zpool';
--my $pathto_zfs   = $ENV{'pathto_zfs'}   || '/usr/sbin/zfs';
-+my $pathto_zpool = $ENV{'pathto_zpool'} || 'zpool';
-+my $pathto_zfs   = $ENV{'pathto_zfs'}   || 'zfs';
- my $summary_only = $ENV{'summary_only'} || ($detail < 5);
- my $detail_only  = $ENV{'detail_only'}  || 0;
- 
--- 
-2.25.1
-
diff --git a/debian/patches/0010-zz-zfs-detect-zfs-location.patch b/debian/patches/0010-zz-zfs-detect-zfs-location.patch
new file mode 100644
index 0000000..9a74a36
--- /dev/null
+++ b/debian/patches/0010-zz-zfs-detect-zfs-location.patch
@@ -0,0 +1,42 @@
+From d9bc6c1b096be0c469bcc13dde3d083d52eb580a Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Wed, 7 Apr 2021 13:55:38 -0700
+Subject: [PATCH] zz-zfs Detect zfs location
+
+Some Linux distributions have installed zpool and zfs to /sbin, others
+to /usr/sbin.  Since the -x test does not take PATH into account, the
+code needs to explicitly check both locations.
+
+---
+ scripts/services/zz-zfs | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+Bug: https://sourceforge.net/p/logwatch/bugs/83
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1880211
+Last-Updated: 2021-04-07
+
+diff --git a/scripts/services/zz-zfs b/scripts/services/zz-zfs
+index 3d6da9e..6461fd6 100644
+--- a/scripts/services/zz-zfs
++++ b/scripts/services/zz-zfs
+@@ -55,9 +55,14 @@ my $pathto_zfs   = $ENV{'pathto_zfs'}   || '/usr/sbin/zfs';
+ my $summary_only = $ENV{'summary_only'} || ($detail < 5);
+ my $detail_only  = $ENV{'detail_only'}  || 0;
+ 
+-if (!-x $pathto_zpool) {
+-   # Doesn't support ZFS
+-   exit 0;
++if (!-x $pathto_zpool || !-x $pathto_zfs) {
++    if (-x '/sbin/zpool' && -x '/sbin/zfs') {
++	$pathto_zpool = '/sbin/zpool';
++	$pathto_zfs = '/sbin/zfs';
++    } else {
++	# Doesn't support ZFS
++	exit 0;
++    }
+ }
+ 
+ if ( $debug >= 5 ) {
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c6cdcf7..66ce090 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 0002-logfiles-vsftpd.conf-Use-custom-pattern-for-applystd.patch
 0003-Ignore-ecryptfs-automounting-messages-in-cron.patch
 0004-scripts-mdadm-Fix-parsing-of-mdadm.conf-handle-ignor.patch
-0010-00-debspecific-disable-su-reporting-in-secure.diff.patch
+0010-zz-zfs-detect-zfs-location.patch
 0011-postfix-Ignore-Resolved-loghost-to-127.0.0.1.patch
 0012-postfix-Handle-backwards-compatible-mode.patch
 0013-secure-Ignore-warnings-about-gnome-keyring-daemon-it.patch