diff -Nru logwatch-7.4.2/debian/changelog logwatch-7.4.2/debian/changelog --- logwatch-7.4.2/debian/changelog 2020-09-03 04:21:50.000000000 +0000 +++ logwatch-7.4.2/debian/changelog 2021-04-16 16:20:27.000000000 +0000 @@ -1,3 +1,12 @@ +logwatch (7.4.2-1ubuntu1.2) xenial; 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 Wed, 07 Apr 2021 15:14:57 -0700 + logwatch (7.4.2-1ubuntu1.1) xenial; urgency=medium [ Bryce Harrington ] diff -Nru logwatch-7.4.2/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch logwatch-7.4.2/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch --- logwatch-7.4.2/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch 2020-09-03 04:21:50.000000000 +0000 +++ logwatch-7.4.2/debian/patches/0010-00-debspecific-disable-su-reporting-in-secure.diff.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 01136a8b3e14a58660db6cc39138d3e40a852737 Mon Sep 17 00:00:00 2001 -From: bjorn -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 ---- - 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 -Nru logwatch-7.4.2/debian/patches/0010-zz-zfs-detect-zfs-location.patch logwatch-7.4.2/debian/patches/0010-zz-zfs-detect-zfs-location.patch --- logwatch-7.4.2/debian/patches/0010-zz-zfs-detect-zfs-location.patch 1970-01-01 00:00:00.000000000 +0000 +++ logwatch-7.4.2/debian/patches/0010-zz-zfs-detect-zfs-location.patch 2021-04-14 19:27:00.000000000 +0000 @@ -0,0 +1,42 @@ +From d9bc6c1b096be0c469bcc13dde3d083d52eb580a Mon Sep 17 00:00:00 2001 +From: Bryce Harrington +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 -Nru logwatch-7.4.2/debian/patches/series logwatch-7.4.2/debian/patches/series --- logwatch-7.4.2/debian/patches/series 2020-09-03 04:21:50.000000000 +0000 +++ logwatch-7.4.2/debian/patches/series 2021-04-14 19:24:27.000000000 +0000 @@ -6,7 +6,7 @@ 0006-postfix-Support-also-openspf.net-in-pattern-not-only.patch ssh-ignore-disconnected.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 0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch