Merge ~bryce/ubuntu/+source/logwatch:merge-v7.5.6-1-jammy into ubuntu/+source/logwatch:debian/sid

[Bryce Harrington]

Merge with Debian's package.

Patch 0015 needed a bit of update to keep it applying properly, otherwise everything remains as is. The three patches are the remainder from a larger set we sent upstream, but these three weren't picked up since they deal with log chatter that's pretty specific to Ubuntu so stay in our delta, for now.

The autopkgtests were already forwarded to Debian (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996893). No response yet, so we will continue to carry them as-is.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/logwatch-merge-v7.5.6-1-jammy/+packages

Bileto: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-bryce-logwatch-merge-v7.5.6-1-jammy/
  logwatch @ amd64:
    13.01.22 03:42:41 Log 🗒️ ✅ Triggers: ['logwatch/7.5.6-1ubuntu1']
  logwatch @ arm64:
    13.01.22 03:46:44 Log 🗒️ ✅ Triggers: ['logwatch/7.5.6-1ubuntu1']
  logwatch @ armhf:
    13.01.22 03:55:07 Log 🗒️ ✅ Triggers: ['logwatch/7.5.6-1ubuntu1']
  logwatch @ ppc64el:
    13.01.22 03:41:18 Log 🗒️ ✅ Triggers: ['logwatch/7.5.6-1ubuntu1']
  logwatch @ s390x:
    13.01.22 03:41:32 Log 🗒️ ✅ Triggers: ['logwatch/7.5.6-1ubuntu1']

Usual tags pushed for review:
  - tags/old/debian 73b16c8
  - tags/new/debian 90c98cf
  - tags/old/ubuntu ba860c7
  - tags/logical/7.5.5-1ubuntu3 dfd5381
  - tags/reconstruct/7.5.5-1ubuntu3 0c4148e
  - tags/split/7.5.5-1ubuntu3 2c7d7e7

[Sergio Durigan Junior (sergiodj)]

I'm taking a look at this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Bryce.

The package builds fine locally. Also confirmed that autopkgtest passed when running locally, which is great.

I like that the dep8 tests have been submitted to Debian, but unfortunately there hasn't been any replies so far. If I may suggest something, it would be that you (or Miriam, who authored the tests) also create a Merge Request against the package on salsa.d.o; some maintainers prefer receiving patches via the BTS, others prefer salsa, so it's usually a good idea to cover both fronts.

I looked at the patches we're carrying, and I agree with the changes. I've been thinking whether it would be possible to write some of those patches in a "generic" way so that they could be upstreamed, but this is definitely not urgent.

LGTM, +1.

review: Approve

[Bryce Harrington (bryce)]

Thanks, I touched base with miriam about getting the tests upstream, and agree it'd be nice if Debian picked them up.

Regarding patch upstreaming, generally I agree although it strikes me that Logwatch is kind of a special case since it is essentially a filter on log files that should cover both general log chatter as well as distro-specific log entries (and ideally also distro-specific services). The latter likely aren't going to be relevant in debian and/or upstream. So in a sense this package is kind of an oddball in that a healthy amount of Ubuntu-specific delta would mean we're keeping it well-maintained. %-)

[Sergio Durigan Junior (sergiodj)]

On Thursday, January 13 2022, Bryce Harrington wrote:

> Regarding patch upstreaming, generally I agree although it strikes me
> that Logwatch is kind of a special case since it is essentially a
> filter on log files that should cover both general log chatter as well
> as distro-specific log entries (and ideally also distro-specific
> services). The latter likely aren't going to be relevant in debian
> and/or upstream. So in a sense this package is kind of an oddball in
> that a healthy amount of Ubuntu-specific delta would mean we're
> keeping it well-maintained. %-)

Thanks for the reply, Bryce. I defer to your knowledge of the package
(which is greater than mine), and so I'm fine and convinced that the
current situation is OK.

Cheers,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 05cd8c0..e0db786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+logwatch (7.5.6-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946872).
+    Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+    - d/p/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch:
+      zz-sys: Suppress warnings if Sys::CPU or Sys::MemInfo are missing.
+      These are not installed by default in Ubuntu's logwatch packaging.
+      (LP #1890749)
+    - d/p/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch:
+      pam_unix: Ignore issues about /etc/securetty being missing.
+      (LP #1890751)
+    - d/p/0010-zz-zfs-detect-zfs-location.patch: Use explicit paths for
+      finding zfs and zpool executables.
+      (LP #1880211)
+    - d/tests: Add autopkgtest DEP8 tests (LP #1679329):
+      + d/t/control: New file.
+      + d/t/basic-checks: Test basic configuration and version.
+      + d/t/syntax-check: Perl syntax checking for the logwatch's scripts.
+      + d/t/detail: Check the amount of output when using low, med and
+        high values with the detail flag.
+      + d/t/su-l-check: Check if properly report when a user become root.
+      + d/t/data/su-l: Log portion used in the above test.
+      + d/t/apparmor-unmatched-entries,
+        d/t/data/unmatched-entries-apparmor_kern.log: Test for not
+        logging as unmatched some lines for apparmor audit in kern.log.
+        (LP #1577948)
+      + d/t/packages-and-report: Check if the corresponding section
+        is present into logwatch report for a list of packages/services
+        (now only for sshd).
+
+ -- Bryce Harrington <[e-mail]>  Thu, 13 Jan 2022 02:14:59 +0000
+
 logwatch (7.5.6-1) unstable; urgency=medium
 
   * New upstream version 7.5.6
@@ -5,12 +39,130 @@ logwatch (7.5.6-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Fri, 05 Nov 2021 13:47:57 +0100
 
+logwatch (7.5.5-1ubuntu3) impish; urgency=medium
+
+  * d/tests: Add autopkgtest DEP8 tests (LP: #1679329):
+    - d/t/control: New file.
+    - d/t/basic-checks: Test basic configuration and version. 
+    - d/t/syntax-check: Perl syntax checking for the logwatch's scripts.
+    - d/t/detail: Check the amount of output when using low, med and
+      high values with the detail flag. 
+    - d/t/su-l-check: Check if properly report when a user become root.
+      + d/t/data/su-l: Log portion used in this test.
+    - d/t/apparmor-unmatched-entries : Test for not logging as unmatched
+      some lines for apparmor audit in kern.log.
+      + d/t/data/unmatched-entries-apparmor_kern.log: Log portion
+        used in the test (LP #1577948).
+    - d/t/packages-and-report: Check if the corresponding section
+      is present into logwatch report for a list of packages/services
+      (now only for sshd).
+
+ -- Miriam España Acebal <[e-mail]>  Thu, 29 Jul 2021 16:53:01 +0200
+
+logwatch (7.5.5-1ubuntu2) hirsute; urgency=medium
+
+  * d/p/0010-zz-zfs-detect-zfs-location.patch: Use explicit paths for
+    finding zfs and zpool executables.
+    (LP: #1880211)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 14 Apr 2021 20:11:05 +0000
+
+logwatch (7.5.5-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+    - d/p/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch:
+      zz-sys: Suppress warnings if Sys::CPU or Sys::MemInfo are missing.
+      These are not installed by default in Ubuntu's logwatch packaging.
+      (LP #1890749)
+    - d/p/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch:
+      pam_unix: Ignore issues about /etc/securetty being missing.
+      (LP #1890751)
+  * Dropped:
+    - d/p/0011-postfix-Ignore-Resolved-loghost-to-127.0.0.1.patch:
+      postfix: Ignore Resolved loghost to 127.0.0.1.
+      (LP: #1583705)
+      [Taken upstream]
+    - d/p/0012-postfix-Handle-backwards-compatible-mode.patch:
+      postfix: Handle backwards-compatible mode.
+      (LP #1583705)
+      [Taken upstream]
+    - d/p/0013-secure-Ignore-warnings-about-gnome-keyring-daemon-it.patch:
+      secure: Ignore warnings about gnome-keyring-daemon items already
+      registered.
+      (LP #1890752)
+      [Taken upstream]
+    - d/p/0017-audit-Apparmor-DENIED-entries-don-t-always-include-p.patch
+      audit: Don't handle "unconfined" profile changes distinct from ordinary loads
+      [Taken upstream]
+    - d/p/0018-audit-Handle-apparmor-errors-on-DENIED-messages.patch:
+      audit: Treat Denial Errors same as Denied
+      (LP #1577948)
+      [Taken upstream]
+    - d/p/0019-exim-Handle-self-signed-certs-warnings.patch:
+      exim: Handle self-signed certs warnings.
+      (LP #1892269)
+      [Taken upstream]
+    - d/p/0020-dhcpd-Ignore-lease-age-under-threshold-messages.patch:
+      dhcpd: Ignore lease age under threshold messages
+      (LP #1578001)
+      [Taken upstream]
+    - d/p/0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch:
+      audit: use the term ALLOWED instead of Grants
+      (LP #1577948)
+      [Taken upstream]
+
+ -- Bryce Harrington <[e-mail]>  Tue, 23 Feb 2021 18:54:42 +0000
+
 logwatch (7.5.5-1) unstable; urgency=medium
 
   * New upstream version 7.5.5
 
  -- Willi Mann <[e-mail]>  Sun, 31 Jan 2021 19:58:46 +0100
 
+logwatch (7.5.4-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+    - d/p/0011-postfix-Ignore-Resolved-loghost-to-127.0.0.1.patch:
+      postfix: Ignore Resolved loghost to 127.0.0.1.
+      (LP #1583705)
+    - d/p/0012-postfix-Handle-backwards-compatible-mode.patch:
+      postfix: Handle backwards-compatible mode.
+      (LP #1583705)
+    - d/p/0013-secure-Ignore-warnings-about-gnome-keyring-daemon-it.patch:
+      secure: Ignore warnings about gnome-keyring-daemon items already
+      registered.
+      (LP #1890752)
+    - d/p/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch:
+      zz-sys: Suppress warnings if Sys::CPU or Sys::MemInfo are missing.
+      These are not installed by default in Ubuntu's logwatch packaging.
+      (LP #1890749)
+    - d/p/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch:
+      pam_unix: Ignore issues about /etc/securetty being missing.
+      (LP #1890751)
+    - d/p/0017-audit-Apparmor-DENIED-entries-don-t-always-include-p.patch
+      audit: Don't handle "unconfined" profile changes distinct from ordinary loads
+    - d/p/0018-audit-Handle-apparmor-errors-on-DENIED-messages.patch:
+      audit: Treat Denial Errors same as Denied
+      (LP #1577948)
+    - d/p/0019-exim-Handle-self-signed-certs-warnings.patch:
+      exim: Handle self-signed certs warnings.
+      (LP #1892269)
+    - d/p/0020-dhcpd-Ignore-lease-age-under-threshold-messages.patch:
+      dhcpd: Ignore lease age under threshold messages
+      (LP #1578001)
+    - d/p/0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch:
+      audit: use the term ALLOWED instead of Grants
+      (LP #1577948)
+  * Dropped:
+    - d/control: Update upstream's homepage
+      [Taken in 7.5.4-1]
+
+ -- Bryce Harrington <[e-mail]>  Thu, 05 Nov 2020 04:28:07 +0000
+
 logwatch (7.5.4-1) unstable; urgency=medium
 
   * New upstream version 7.5.4 (closes: #970684)
@@ -20,6 +172,91 @@ logwatch (7.5.4-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Sun, 04 Oct 2020 20:40:40 +0200
 
+logwatch (7.5.4-0ubuntu3) groovy; urgency=medium
+
+  * d/p/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch:
+    Update DEP3 to indicate this patch does not need forwarded upstream
+    since it corrects a distro packaging issue.
+  * d/p/0018-audit-Treat-Denial-Errors-same-as-Denied.patch:
+    Update DEP3 to link to where this patch was forwarded upstream.
+  * d/p/0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch:
+    Fix typo in variable '$allawed'; refresh patch.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 04 Sep 2020 16:08:47 -0700
+
+logwatch (7.5.4-0ubuntu2) groovy; urgency=medium
+
+  [ Bryce Harrington ]
+  * d/p/0020-dhcpd-Ignore-lease-age-under-threshold-messages.patch:
+    dhcpd: Ignore lease age under threshold messages
+    (LP: #1578001)
+  * d/p/0019-exim-Handle-self-signed-certs-warnings.patch:
+    exim: Handle self-signed certs warnings.
+    (LP: #1892269)
+  * d/p/0018-audit-Treat-Denial-Errors-same-as-Denied.patch:
+    audit: Treat Denial-Errors same as Denied.
+    (LP: #1577948)
+  * d/p/0017-audit-Apparmor-DENIED-entries-don-t-always-include-p.patch:
+    audit: Apparmor DENIED entries don't always include parent=N.
+    (LP: #1577948)
+  * d/p/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch:
+    pam_unix: Ignore issues about /etc/securetty being missing.
+    (LP: #1890751)
+  * d/p/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch:
+    zz-sys: Suppress warnings if Sys::CPU or Sys::MemInfo are missing.
+    These are not installed by default in Ubuntu's logwatch packaging.
+    (LP: #1890749)
+  * d/p/0013-secure-Ignore-warnings-about-gnome-keyring-daemon-it.patch:
+    secure: Ignore warnings about gnome-keyring-daemon items already
+    registered.
+    (LP: #1890752)
+  * d/p/0012-postfix-Handle-backwards-compatible-mode.patch:
+    postfix: Handle backwards-compatible mode.
+    (LP: #1583705)
+  * d/p/0011-postfix-Ignore-Resolved-loghost-to-127.0.0.1.patch:
+    postfix: Ignore Resolved loghost to 127.0.0.1.
+    (LP: #1583705)
+  * d/control: Update upstream's homepage
+    (LP: #1891604)
+
+  [ Lucas Kanashiro ]
+  * d/p/0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch:
+    audit: use the term ALLOWED instead of Grants.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 21 Aug 2020 01:30:10 +0000
+
+logwatch (7.5.4-0ubuntu1) groovy; urgency=medium
+
+  * New upstream version 7.5.4.  Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+  * Dropped:
+    - Drop 0005-Match-connection-shutdown-by-couriertls.patch
+      [Taken upstream in 7.5.4]
+    - Drop 0006-imapd-Handle-SSL3-connection-errors.patch
+      [Taken upstream in 7.5.4]
+  
+ -- Bryce Harrington <[e-mail]>  Mon, 03 Aug 2020 18:27:31 -0700
+
+logwatch (7.5.2-1ubuntu2) groovy; urgency=medium
+
+  * 0006-imapd-Handle-SSL3-connection-errors.patch: Handle SSL3
+    connection errors for couriertls in imapd.
+  * 0005-Match-connection-shutdown-by-couriertls.patch: Match connection
+    shutdown entries by couriertls.  These are likely just client errors
+    and do not represent real problems.
+    (LP: #1578004)
+
+ -- Bryce Harrington <[e-mail]>  Fri, 05 Jun 2020 23:16:23 +0000
+
+logwatch (7.5.2-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+
+ -- Bryce Harrington <[e-mail]>  Thu, 23 Jan 2020 11:53:10 -0800
+
 logwatch (7.5.2-1) unstable; urgency=medium
 
   * New upstream version 7.5.2
@@ -28,12 +265,40 @@ logwatch (7.5.2-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Sun, 12 Jan 2020 12:25:08 +0100
 
+logwatch (7.5.0-2ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+  * Dropped:
+    - debian/control: depend on postfix rather than exim4.
+      [default-mta is provided by postfix as of precise at least]
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation.
+      [While the file is no longer present, it'll just be silently
+       ignored if it's listed in the config file, so no need to maintain
+       a delta against debian for this.]
+
+ -- Bryce Harrington <[e-mail]>  Thu, 23 May 2019 10:40:17 -0700
+
 logwatch (7.5.0-2) unstable; urgency=high
 
   * s/s/kernel: fix typo. closes: 917836
 
  -- Willi Mann <[e-mail]>  Sat, 09 Mar 2019 18:14:03 +0100
 
+logwatch (7.5.0-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian unstable (LP: #1810928). Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+  * Dropped Changes:
+    - d/p/ssh-ignore-disconnected.patch: [sshd] ignore disconnected from user
+      [upstream]
+
+ -- Karl Stenerud <[e-mail]>  Wed, 09 Jan 2019 10:55:11 +0100
+
 logwatch (7.5.0-1) unstable; urgency=medium
 
   * New upstream version
@@ -72,6 +337,23 @@ logwatch (7.4.3+git20180713-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Tue, 02 Oct 2018 19:52:16 +0200
 
+logwatch (7.4.3+git20161207-2ubuntu2) cosmic; urgency=medium
+
+  * d/p/ssh-ignore-disconnected.patch: [sshd] ignore disconnected from user
+    USER (LP: 1644057)
+
+ -- Karl Stenerud <[e-mail]>  Fri, 31 Aug 2018 09:44:50 -0700
+
+logwatch (7.4.3+git20161207-2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian testing. Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 16 Feb 2017 09:08:52 +0100
+
 logwatch (7.4.3+git20161207-2) unstable; urgency=medium
 
   * Revert upstream's change of the declared mail charset.
@@ -91,6 +373,16 @@ logwatch (7.4.3+git20161207-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Fri, 16 Dec 2016 20:15:26 +0100
 
+logwatch (7.4.3-2ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 01 Dec 2016 16:46:22 +0100
+
 logwatch (7.4.3-2) unstable; urgency=medium
 
   * s/s/amavis: Fix perl warning "redundant argument in sprintf".
@@ -99,6 +391,16 @@ logwatch (7.4.3-2) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Wed, 02 Nov 2016 19:32:35 +0100
 
+logwatch (7.4.3-1ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 26 Jul 2016 12:56:34 +0200
+
 logwatch (7.4.3-1) unstable; urgency=medium
 
   * Imported Upstream version 7.4.3
@@ -106,6 +408,16 @@ logwatch (7.4.3-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Sat, 30 Apr 2016 14:40:57 +0200
 
+logwatch (7.4.2-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable (LP: #1552983). Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl and libsys-meminfo-perl from Recommends to
+      Suggests as they are in universe.
+
+ -- Nishanth Aravamudan <[e-mail]>  Fri, 04 Mar 2016 11:42:51 -0800
+
 logwatch (7.4.2-1) unstable; urgency=medium
 
   * Imported Upstream version 7.4.2
@@ -121,6 +433,18 @@ logwatch (7.4.1+svn20160106rev308-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Sun, 24 Jan 2016 19:17:34 +0100
 
+logwatch (7.4.1+svn20151218rev302-1ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable (LP: #1531262). Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+    - Drop libsys-cpu-perl from Recommends to Suggests as it is in
+      universe.
+  * Drop libsys-meminfo-perl from Recommends to Suggests as it is in
+    universe.
+
+ -- Nishanth Aravamudan <[e-mail]>  Thu, 07 Jan 2016 20:53:20 -0800
+
 logwatch (7.4.1+svn20151218rev302-1) unstable; urgency=medium
 
   * Imported Upstream version 7.4.1+svn20151218rev302
@@ -148,6 +472,21 @@ logwatch (7.4.1+svn20150731rev294-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Wed, 02 Sep 2015 18:50:14 +0200
 
+logwatch (7.4.1-2ubuntu2) vivid; urgency=medium
+
+  * Drop libsys-cpu-perl from Recommends to Suggests as it is in
+    universe.
+
+ -- Robie Basak <[e-mail]>  Fri, 06 Feb 2015 14:29:06 +0000
+
+logwatch (7.4.1-2ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable (LP: #1387817). Remaining changes:
+    - debian/control: depend on postfix rather than exim4.
+    - debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+
+ -- Robie Basak <[e-mail]>  Mon, 02 Feb 2015 04:03:21 +0000
+
 logwatch (7.4.1-2) unstable; urgency=medium
 
   * Revert upstream change on fail2ban service config. This makes fail2ban
@@ -208,6 +547,15 @@ logwatch (7.4.0+svn20131108rev175-1) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Thu, 28 Nov 2013 20:10:09 +0100
 
+logwatch (7.4.0+svn20130529rev144-1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    + debian/control:
+      - Depend on postfix rather than exim4.
+    + debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+
+ -- Robie Basak <[e-mail]>  Tue, 09 Jul 2013 15:06:43 +0000
+
 logwatch (7.4.0+svn20130529rev144-1) unstable; urgency=low
 
   * Imported Upstream version 7.4.0+svn20130529rev144
@@ -220,6 +568,20 @@ logwatch (7.4.0+svn20130529rev144-1) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Sat, 01 Jun 2013 14:03:28 +0200
 
+logwatch (7.4.0+svn20120502rev103-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian testing (LP: #1102414). Remaining changes:
+    + debian/control:
+      - Depend on postfix rather than exim4.
+    + debian/dist.conf/logfiles/maillog.conf: adjust for logrotation
+
+  * Dropped changes, merged in Debian:
+    + debian/dist.conf/services/cron.conf: this change already disappeared
+      previously, looks related to Debian bug 615006 which is already applied
+      and thus presumed no longer needed.
+
+ -- Robie Basak <[e-mail]>  Mon, 21 Jan 2013 13:53:24 +0000
+
 logwatch (7.4.0+svn20120502rev103-1) unstable; urgency=low
 
   * Set VDate in logwatch.pl to svn date for svn snapshots
@@ -243,6 +605,17 @@ logwatch (7.4.0+svn20120227rev85-1) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Fri, 06 Apr 2012 21:11:23 +0200
 
+logwatch (7.4.0+svn20111221rev79-1ubuntu1) precise; urgency=low
+
+  [ Chuck Short ]
+  * Merge from Debian testing.  Remaining changes:
+    + debian/conrol:
+      - Depend on postfix rather than exim4.
+    + debian/dist.conf/services_cron.conf, 
+      debian/dist.conf/logfiles_maillog.conf: Adjust for logrotation
+
+ -- Chuck Short <[e-mail]>  Mon, 06 Feb 2012 08:59:12 -0500
+
 logwatch (7.4.0+svn20111221rev79-1) unstable; urgency=low
 
   * Imported Upstream version 7.4.0+svn20111221rev79
@@ -272,6 +645,19 @@ logwatch (7.4.0+svn20111018rev68-1) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Sat, 05 Nov 2011 20:44:36 +0100
 
+logwatch (7.4.0+svn20110808rev66-1ubuntu1) precise; urgency=low
+
+  * Merged from Debian testing, remaining changes are:
+    + debian/conrol:
+      - Depend on postfix rather than exim4.
+    + debian/dist.conf/services_cron.conf, debian/dist.conf/logfiles_maillog.conf,
+      debian/dist.conf/logfiles_messages.conf: Adjust for logrotation.
+    + Dropped:
+      - debian/patches/lp-809753-comify: No longer needed.
+      - debian/rules: Dont use quilt anymore logwatch uses source 3.0
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Nov 2011 09:39:15 -0500
+
 logwatch (7.4.0+svn20110808rev66-1) unstable; urgency=low
 
   * New Upstream snapshot 7.4.0+svn20110808rev66 (closes: #644053)
@@ -301,6 +687,57 @@ logwatch (7.3.6.cvs20090906-2) unstable; urgency=high
 
  -- Willi Mann <[e-mail]>  Wed, 02 Mar 2011 08:57:07 +0100
 
+logwatch (7.3.6.cvs20090906-1ubuntu5) oneiric; urgency=low
+
+  * debian/patches/lp-809753-commify:
+    - return undef is not defined, instead of error (LP: #809753)
+  * debian/control:
+    - build depend on quilt
+  * debian/rules:
+    - add dh_quilt_patch and dh_quilt_unpatch
+
+ -- Ante Karamatic <[e-mail]>  Wed, 17 Aug 2011 19:28:17 +0200
+
+logwatch (7.3.6.cvs20090906-1ubuntu4) natty; urgency=low
+
+  * SECURITY UPDATE: privileged code execution via badly named logfiles
+    - scripts/logwatch.pl: encapsulate logfiles in 's and ensure logfile
+      names don't contain '.
+    - http://logwatch.svn.sourceforge.net/viewvc/logwatch?view=revision&revision=26
+    - CVE-2011-1018
+  * debian/dist.conf/services/cron.conf: adjust to capture cron entries,
+    thanks to Oliver Brakmann (LP: #719898)
+  * scripts/services/named: update to upstream version to correctly
+    capture more information (LP: #584229)
+    - http://logwatch.svn.sourceforge.net/viewvc/logwatch/scripts/services/named?revision=19
+  * logwatch.8: replace examples containing obsolete --print argument
+    with --output=stdout (LP: #564796)
+
+ -- Steve Beattie <[e-mail]>  Wed, 02 Mar 2011 13:44:53 +0100
+
+logwatch (7.3.6.cvs20090906-1ubuntu3) maverick; urgency=low
+
+  * conf/logfiles/*, debian/dist.conf/logfiles/*:
+    Due to migration to rsyslog, the first rotation is now .1 and not .0
+    (fixes LP: #606715)
+
+ -- Thierry Carrez (ttx) <[e-mail]>  Mon, 06 Sep 2010 14:57:14 +0200
+
+logwatch (7.3.6.cvs20090906-1ubuntu2) lucid; urgency=low
+
+  * conf/html/{footer.html,header.html} Re-add dropped from the 
+    previous version of logtwatch. (LP: #481327) 
+
+ -- Chuck Short <[e-mail]>  Tue, 17 Nov 2009 14:57:58 -0500
+
+logwatch (7.3.6.cvs20090906-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #228917, #391077, #425206, #443252),
+    remaining changes:
+    - Use postfix rather than exim4.
+
+ -- Kees Cook <[e-mail]>  Mon, 05 Oct 2009 09:20:31 -0700
+
 logwatch (7.3.6.cvs20090906-1) unstable; urgency=low
 
   * New CVS snapshot + postfix-logwatch 1.38.01
@@ -324,6 +761,16 @@ logwatch (7.3.6.cvs20090906-1) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Mon, 07 Sep 2009 17:04:43 +0200
 
+logwatch (7.3.6.cvs20080702-2ubuntu1) jaunty; urgency=low
+
+  [ Bhavani Shankar ]
+  * Merge from debian unstable, remaining changes: LP: #314620
+    - Use postfix rather than exim4.
+    - Fix logwatch.pl for servers that have the same hostname as a config
+      variable (ie: medium). Thanks for Nathan Crawford. (LP: #296349)
+
+ -- Mathias Gug <[e-mail]>  Wed, 07 Jan 2009 19:23:58 -0500
+
 logwatch (7.3.6.cvs20080702-2) unstable; urgency=low
 
   * add Michael Tautschnig to changelog of former version, crediting
@@ -339,6 +786,33 @@ logwatch (7.3.6.cvs20080702-2) unstable; urgency=low
 
  -- Willi Mann <[e-mail]>  Sun, 07 Dec 2008 08:20:06 +0100
 
+logwatch (7.3.6.cvs20080702-1ubuntu4) jaunty; urgency=low
+
+  * Fix typo. (LP: #296349) 
+
+ -- Chuck Short <[e-mail]>  Wed, 03 Dec 2008 15:22:33 +0000
+
+logwatch (7.3.6.cvs20080702-1ubuntu3) jaunty; urgency=low
+
+  * Fix logwatch.pl for servers that have the same hostname as a config
+    variable (ie: medium). Thanks for Nathan Crawford. (LP: #296349) 
+
+ -- Chuck Short <[e-mail]>  Mon, 10 Nov 2008 16:46:59 +0000
+
+logwatch (7.3.6.cvs20080702-1ubuntu2) intrepid; urgency=low
+
+  * Corrected FTBFS from the merge by correcting arch from any to all
+
+ -- Michael Casadevall <[e-mail]>  Fri, 05 Sep 2008 19:20:30 -0400
+
+logwatch (7.3.6.cvs20080702-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Use postfix rather than exim4.
+    - Update maintainers according to spec.
+
+ -- Chuck Short <[e-mail]>  Sat, 05 Jul 2008 11:49:54 +0100
+
 logwatch (7.3.6.cvs20080702-1) unstable; urgency=medium
 
   * New upstream CVS snapshot
@@ -358,6 +832,15 @@ logwatch (7.3.6.cvs20080702-1) unstable; urgency=medium
 
  -- Willi Mann <[e-mail]>  Fri, 04 Jul 2008 16:51:36 +0200
 
+logwatch (7.3.6-1ubuntu1) hardy; urgency=low
+
+  * Added patch from Paul Schulz to fix 'pam_unix unknown entries'
+    for authlog. (LP: #181690)
+  * Bumped starndards version to 3.7.3
+  * Use postfix rather than exim4.
+
+ -- Chuck Short <[e-mail]>  Thu, 21 Feb 2008 08:35:13 -0500
+
 logwatch (7.3.6-1) unstable; urgency=low
 
   * New upstream version:
@@ -783,3 +1266,4 @@ logwatch (5.0-1) unstable; urgency=low
     to the logfile(s). That's most likely the problem.
 
  -- Willi Mann <[e-mail]>  Wed, 12 Nov 2003 20:14:15 +0100
+
diff --git a/debian/control b/debian/control
index 764bd58..e39f936 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: logwatch
 Section: admin
 Priority: optional
-Maintainer: Willi Mann <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Willi Mann <[e-mail]>
 Build-Depends: debhelper (>> 11.0.0~)
 Standards-Version: 4.5.0
 Homepage: https://sourceforge.net/projects/logwatch/
@@ -11,7 +12,8 @@ Vcs-Git: https://salsa.debian.org/debian/logwatch.git
 Package: logwatch
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, default-mta | mail-transport-agent
-Recommends: libdate-manip-perl, libsys-cpu-perl, libsys-meminfo-perl
+Recommends: libdate-manip-perl
+Suggests: libsys-cpu-perl, libsys-meminfo-perl
 Description: log analyser with nice output written in Perl
  Logwatch is a modular log analyser that runs every night
  and mails you the results. It can also be run from command line.
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/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch b/debian/patches/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch
new file mode 100644
index 0000000..9154652
--- /dev/null
+++ b/debian/patches/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch
@@ -0,0 +1,52 @@
+From 488a232634c1d383f4ec356d776b4ee292e48b0a Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Wed, 19 Aug 2020 04:39:22 +0000
+Subject: [PATCH 04/10] zz-sys: Suppress warnings if Sys::CPU or Sys::MemInfo
+ are missing
+
+Neither of these perl modules are installed by default with a logwatch
+installation, by intention, so the missing module warnings are
+inappropriate.  These modules only provide a minor amount of detail when
+installed, and their information is volatile which can trigger false
+test failures in some cases.
+
+Fixes: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1890749
+Signed-off-by: Bryce Harrington <[e-mail]>
+---
+ scripts/services/zz-sys | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1890749
+Forwarded: not-needed
+Last-Updated: 2020-08-20
+
+diff --git a/scripts/services/zz-sys b/scripts/services/zz-sys
+index 39f94ce..6bbf3fe 100644
+--- a/scripts/services/zz-sys
++++ b/scripts/services/zz-sys
+@@ -35,8 +35,8 @@
+ 
+ eval "require Sys::CPU";
+ if ($@) {
+-   print STDERR "No Sys::CPU module installed.  To install, execute the command:\n";
+-   print STDERR "   perl -MCPAN -e 'install Sys::CPU' \n\n";
++   # Sys::CPU (and Sys::MemInfo) are intentionally not installed on Ubuntu.
++   # Silently skip this if not present.
+ } else {
+    import Sys::CPU;
+    print "   CPU:     " . Sys::CPU::cpu_count() . " " . Sys::CPU::cpu_type() . " at " . Sys::CPU::cpu_clock() . "MHz\n";
+@@ -52,8 +52,8 @@ print "   Release: $OStitle $release\n";
+ 
+ eval "require Sys::MemInfo";
+ if ($@) {
+-   print STDERR "No Sys::MemInfo module installed.  To install, execute the command:\n";
+-   print STDERR "   perl -MCPAN -e 'install Sys::MemInfo' \n\n";
++   # Sys::CPU (and Sys::MemInfo) are intentionally not installed on Ubuntu.
++   # Silently skip this if not present.
+ } else {
+    import Sys::MemInfo qw(totalmem freemem totalswap freeswap);
+    my $swapused = &totalswap - &freeswap;
+-- 
+2.27.0
+
diff --git a/debian/patches/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch b/debian/patches/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch
new file mode 100644
index 0000000..83abeb3
--- /dev/null
+++ b/debian/patches/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch
@@ -0,0 +1,44 @@
+From 1b471a45e1a0bb55302d65e3cffb72fa0ea66391 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <[e-mail]>
+Date: Wed, 19 Aug 2020 04:43:25 +0000
+Subject: [PATCH 05/10] pam_unix: Ignore issues about /etc/securetty being
+ missing
+
+Fixes: https://bugs.launchpad.net/ubuntu/focal/+source/logwatch/+bug/1890751
+Signed-off-by: Bryce Harrington <[e-mail]>
+---
+ scripts/services/pam_unix | 5 +++++
+ scripts/services/sudo     | 3 +++
+ 2 files changed, 8 insertions(+)
+
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/focal/+source/logwatch/+bug/1890751
+Forwarded: https://sourceforge.net/p/logwatch/git/merge-requests/46/
+Last-Updated: 2020-08-20
+
+--- a/scripts/services/pam_unix
++++ b/scripts/services/pam_unix
+@@ -73,6 +73,11 @@
+    } else {
+       next;
+    }
++   # handle all missing /etc/securetty warnings
++   if ($line =~ /Couldn.t open \/etc\/securetty/) {
++      # Ignore - see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674857#25
++      next;
++   }
+    # handle password expiring globally
+    if ($line =~ /^password for user (.+) will expire in (\d+) days/) {
+       $data{"all"}{'Password Expiring'}{"$1 in $2 days"}++;
+--- a/scripts/services/sudo
++++ b/scripts/services/sudo
+@@ -72,6 +72,9 @@
+          or $ThisLine =~ /pam_systemd\(sudo:session\): Cannot create session: Already (running in|occupied by) a session/
+            ) {
+      # Ignore
++   # handle all missing /etc/securetty warnings
++   } elsif ($ThisLine =~ /pam_unix\(sudo:auth\): Couldn.t open \/etc\/securetty/) {
++      # Ignore - see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674857#25
+    } elsif ($ThisLine =~ /(.+): conversation failed/) {
+      $ConFailed{$1}++;
+    } elsif ( ($user, $error, $tty, $dir, $euser, $egroup, $cmd, $args) = $ThisLine =~ m/^\s*(\S+) : ([^=]+; )?(?:TTY=(\S+) ; )?PWD=(.*?) ; USER=(\S+) ;(?: GROUP=(\S+) ;)? COMMAND=(\S+)( ?.*)/) {
diff --git a/debian/patches/series b/debian/patches/series
index bd7d188..f691691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,8 @@
 0003-Ignore-ecryptfs-automounting-messages-in-cron.patch
 0004-scripts-mdadm-Fix-parsing-of-mdadm.conf-handle-ignor.patch
 0005-clam-update-Fix-encoding.patch
+
+# Ubuntu patches
+0010-zz-zfs-detect-zfs-location.patch
+0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch
+0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch
diff --git a/debian/tests/apparmor-unmatched-entries b/debian/tests/apparmor-unmatched-entries
new file mode 100644
index 0000000..4bfd784
--- /dev/null
+++ b/debian/tests/apparmor-unmatched-entries
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+######################################################
+### no apparmor STATUS entries marked as unmatched ###
+######################################################
+
+set -eo pipefail
+
+LOGWATCH_CONF_FILE="/etc/logwatch/conf/logwatch.conf"
+NEED_ERASING=1
+
+clear_logwatch_conf_file(){
+    if [ "${NEED_ERASING}" -eq "0" ]; then 
+        if [ -e "${LOGWATCH_CONF_FILE}".test.bak ]; then
+            cp "${LOGWATCH_CONF_FILE}".test.bak "${LOGWATCH_CONF_FILE}"
+            rm "${LOGWATCH_CONF_FILE}".test.bak
+        else
+            rm "${LOGWATCH_CONF_FILE}"
+        fi
+    fi
+}
+
+trap ' clear_logwatch_conf_file ' 0 INT QUIT ABRT PIPE TERM
+
+cp "$(dirname "${0}")"/data/unmatched-entries-apparmor_kern.log "${AUTOPKGTEST_TMP}"/kern.log
+
+if  ! [ -f "${LOGWATCH_CONF_FILE}" ] ; then
+    echo "AppendVarLogToLogDirs = 0" >> "${LOGWATCH_CONF_FILE}"
+elif ! grep -q "^AppendVarLogToLogDirs" "${LOGWATCH_CONF_FILE}" ; then
+    cp "${LOGWATCH_CONF_FILE}" "${LOGWATCH_CONF_FILE}".test.bak
+    echo "AppendVarLogToLogDirs = 0" >> "${LOGWATCH_CONF_FILE}"
+else
+    sed -i.test.bak 's/^\(AppendVarLogToLogDirs = \).*/\10/' "${LOGWATCH_CONF_FILE}"
+fi
+NEED_ERASING=0
+
+if logwatch --detail High --range all --service kernel --logdir "${AUTOPKGTEST_TMP}" --output stdout | grep -qF "**Unmatched Entries**"; then
+    exit 1
+else
+    exit 0
+fi
diff --git a/debian/tests/basic-checks b/debian/tests/basic-checks
new file mode 100755
index 0000000..dcec7b9
--- /dev/null
+++ b/debian/tests/basic-checks
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+############################################
+### Check main installation requirements ###
+############################################
+
+set -e
+
+SHAREDIR="/usr/share/logwatch"
+
+# Config file
+echo "Checking config file present"
+test -e "${SHAREDIR}"/dist.conf/logwatch.conf
+
+# Services
+echo "Checking service configs are installed"
+test -d "${SHAREDIR}"/dist.conf/services
+services_conf_files=("${SHAREDIR}"/dist.conf/services/*.conf)
+num_scf=${#services_conf_files[@]}
+echo "Service files are = ${num_scf}"
+test "${num_scf}" -gt "0"
+
+# Logfiles
+echo "Checking logs configs are installed"
+test -d "$SHAREDIR/dist.conf/logfiles"
+logfiles_conf_files=("${SHAREDIR}"/dist.conf/logfiles/*.conf)
+num_lcf=${#logfiles_conf_files[@]}
+echo "Logfiles are = ${num_lcf}"
+test "${num_lcf}" -gt "0"
+
+# Script
+echo "Checking binary is present and its usefulness"
+test -e /usr/sbin/logwatch
+logwatch --version
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..feefe91
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,15 @@
+Tests: basic-checks
+Depends: @
+Restrictions: superficial
+
+Tests: syntax-check
+Depends: @, liburi-perl
+Restrictions: allow-stderr 
+
+Tests: detail su-l-check apparmor-unmatched-entries
+Depends: @ 
+Restrictions: needs-root
+
+Tests: packages-and-report
+Depends: @
+Restrictions:needs-root isolation-container
diff --git a/debian/tests/data/su-l b/debian/tests/data/su-l
new file mode 100644
index 0000000..4687e20
--- /dev/null
+++ b/debian/tests/data/su-l
@@ -0,0 +1,2 @@
+Jul 27 15:29:50 test-logwatch su: pam_unix(su-l:session): session opened for user root by ubuntu(uid=0)
+Jul 27 23:22:22 test-logwatch su: pam_unix(su-l:session): session closed for user root
diff --git a/debian/tests/data/unmatched-entries-apparmor_kern.log b/debian/tests/data/unmatched-entries-apparmor_kern.log
new file mode 100644
index 0000000..57a535d
--- /dev/null
+++ b/debian/tests/data/unmatched-entries-apparmor_kern.log
@@ -0,0 +1,14 @@
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209116.753:18): apparmor="STATUS" operation="profile_replace" profile="unconfined" name="/usr/sbin/named" pid=22094 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.641:2): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/bin/freshclam" pid=1760 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.657:3): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/sbin/dhclient" pid=1759 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.657:4): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-client.action" pid=1759 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.657:5): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/NetworkManager/nm-dhcp-helper" pid=1759 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.657:6): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/connman/scripts/dhclient-script" pid=1759 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.657:7): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/clamd" pid=1765 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.673:8): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/cups-browsed" pid=1767 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.677:9): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/lib/cups/backend/cups-pdf" pid=1768 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.677:10): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/cupsd" pid=1768 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1462209262.677:11): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/cupsd//third_party" pid=1768 comm="apparmor_parser"
+Aug 17 11:59:06 stirling kernel: [2731097.177750] audit: type=1400 audit(1597690746.037:8074): apparmor="STATUS" operation="profile_remove" profile="unconfined" name="lxd-open-iscsi-review-mp389234-groovy_</var/snap/lxd/common/lxd>" pid=1695060 comm="apparmor_parser"
+Aug 17 15:23:04 stirling kernel: [2743335.144325] audit: type=1400 audit(1597702984.306:8075): apparmor="STATUS" operation="profile_load" profile="snap.multipass.multipassd" name="multipass.qemu-img" pid=1712259 comm="apparmor_parser"
+Aug 17 15:23:04 stirling kernel: [2743335.189665] audit: type=1400 audit(1597702984.350:8076): apparmor="STATUS" operation="profile_remove" profile="snap.multipass.multipassd" name="multipass.qemu-img" pid=1712263 comm="apparmor_parser"
diff --git a/debian/tests/detail b/debian/tests/detail
new file mode 100644
index 0000000..c690f4a
--- /dev/null
+++ b/debian/tests/detail
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+##################################
+### Check detail option output ###
+##################################
+
+set -eo pipefail
+
+low="$(logwatch --detail Low --range all --service all --output stdout | wc -l)"
+high="$(logwatch --detail High --range all --service all --output stdout | wc -l)"
+med="$(logwatch --detail Med --range all --service all --output stdout | wc -l)"
+
+echo "Checking that Low detail is less than Med detail"
+test "${low}" -lt "${med}"
+echo "Checking that Med detail is less High detail"
+test "${med}" -lt "${high}"
diff --git a/debian/tests/packages-and-report b/debian/tests/packages-and-report
new file mode 100644
index 0000000..f367e68
--- /dev/null
+++ b/debian/tests/packages-and-report
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################
+### Check services output ###
+#############################
+
+set -eo pipefail
+
+check_package_report_present(){
+
+    local package="${1}"
+    local key="${2}"
+    local service="${3}"
+
+    if ! dpkg-query -s "${package}" >/dev/null 2>&1; then
+        apt install -y "${package}" >/dev/null 2>&1  
+    fi 
+
+    PATTERN="- ${key}"
+    section_exists="$(logwatch --detail High --range all --service "${service}" --output stdout | awk -v var="${PATTERN}" '$0 ~ var && position{print NR-position-1} $0 ~ var {position=NR}')"
+    
+    echo "Number of lines for the report: ${section_exists}"
+    if [ -z "${section_exists}" ]; then
+        exit 1
+    fi
+
+}
+
+packages=("openssh-server")
+keys=("SSHD") 
+service=("sshd")
+
+for((i=0;i<"${#packages[@]}";i++)); do
+    echo "Checking section ${keys[${i}]} exists in logwatch report for package ${packages[${i}]}"
+    check_package_report_present "${packages[${i}]}" "${keys[${i}]}" "${service[${i}]}"
+done
diff --git a/debian/tests/su-l-check b/debian/tests/su-l-check
new file mode 100755
index 0000000..f9cdc56
--- /dev/null
+++ b/debian/tests/su-l-check
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+##################################
+### Check detection su -l      ###
+##################################
+
+set -eo pipefail
+
+LOGWATCH_CONF_FILE="/etc/logwatch/conf/logwatch.conf"
+NEED_ERASING=1
+
+clear_logwatch_conf_file(){
+    if [ "${NEED_ERASING}" -eq "0" ]; then 
+        if [ -e "${LOGWATCH_CONF_FILE}".test.bak ]; then
+            cp "${LOGWATCH_CONF_FILE}".test.bak "${LOGWATCH_CONF_FILE}"
+            rm "${LOGWATCH_CONF_FILE}".test.bak
+        else
+            rm "${LOGWATCH_CONF_FILE}"
+        fi
+    fi
+}
+
+trap 'clear_logwatch_conf_file' 0 INT QUIT ABRT PIPE TERM
+
+cp "$(dirname "${0}")"/data/su-l "${AUTOPKGTEST_TMP}"/auth.log
+
+if  ! [ -e "${LOGWATCH_CONF_FILE}" ] ; then
+    echo "AppendVarLogToLogDirs = 0" >> "${LOGWATCH_CONF_FILE}"
+elif ! grep -q "^AppendVarLogToLogDirs" "${LOGWATCH_CONF_FILE}" ; then
+    cp "${LOGWATCH_CONF_FILE}" "${LOGWATCH_CONF_FILE}".test.bak
+    echo "AppendVarLogToLogDirs = 0" >> "${LOGWATCH_CONF_FILE}"
+else
+    sed -i.test.bak 's/^\(AppendVarLogToLogDirs = \).*/\10/' "${LOGWATCH_CONF_FILE}"
+fi
+NEED_ERASING=0
+
+logwatch --detail High --range all --service pam_unix --logdir "${AUTOPKGTEST_TMP}" --output stdout | grep -qF "ubuntu -> root"
diff --git a/debian/tests/syntax-check b/debian/tests/syntax-check
new file mode 100755
index 0000000..b90af37
--- /dev/null
+++ b/debian/tests/syntax-check
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+################################
+### Check perl syntax status ###
+################################
+
+set -e
+
+SHAREDIR="/usr/share/logwatch"
+
+echo "Checking script's perl syntax"
+
+while IFS= read -r f
+do
+  PERL5LIB="${SHAREDIR}"/lib perl -c "${f}"
+done < <(grep -Erl "\#\!.*perl" "${SHAREDIR}"/scripts/)