Merge ~bryce/ubuntu/+source/logwatch:sru-lp1904362-groovy into ubuntu/+source/logwatch:ubuntu/groovy-devel

[Bryce Harrington]

SRU fix to add an option to turn off hostname checking.

Bug: https://bugs.launchpad.net/ubuntu/xenial/+source/logwatch/+bug/1904362
PPA: https://launchpad.net/~bryce/+archive/ubuntu/logwatch-sru-lp1904362-disable-hostname-lookup

[Christian Ehrhardt  (paelzer)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [-] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [-] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

* There is one problem and it is not in the MR.
The SRU template section "[Where Problems Could Occur]" still has the template content.
Please update that before going to -unapproved.

review: Approve

[Bryce Harrington (bryce)]

Thanks for catching that, I've filled in the section in the SRU. Tagged & uploaded.

diff --git a/debian/changelog b/debian/changelog
index 850f2a9..595376a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+logwatch (7.5.4-0ubuntu3.2) groovy; urgency=medium
+
+  * d/p/allow-disabling-lookup.patch: Allow skipping ip lookup
+    (LP: #1904362)
+
+ -- Bryce Harrington <[e-mail]>  Thu, 01 Jul 2021 03:44:20 +0000
+
 logwatch (7.5.4-0ubuntu3.1) groovy; urgency=medium
 
   * d/p/0010-zz-zfs-detect-zfs-location.patch: Use explicit paths for
diff --git a/debian/patches/allow-disabling-lookup.patch b/debian/patches/allow-disabling-lookup.patch
new file mode 100644
index 0000000..e8881b5
--- /dev/null
+++ b/debian/patches/allow-disabling-lookup.patch
@@ -0,0 +1,39 @@
+From 88c0d675f10e425faeddd23316c061f425f39a06 Mon Sep 17 00:00:00 2001
+From: bjorn <[e-mail]>
+Date: Sun, 20 Sep 2020 14:39:02 -0700
+Subject: [PATCH logwatch] [sshd] Added LookupIP disable.  Requested by Joseph
+ Mocker.
+
+---
+ conf/services/sshd.conf | 3 +++
+ scripts/services/sshd   | 1 +
+ 2 files changed, 4 insertions(+)
+
+Origin: upstream, https://sourceforge.net/p/logwatch/git/ci/88c0d675f10e425faeddd23316c061f425f39a06/
+Bug: https://sourceforge.net/p/logwatch/discussion/1115929/thread/952d84109c/
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1904362
+Reviewed-By: Bryce Harrington <[e-mail]>
+Applied-Upstream: 7.5.5, commit:88c0d675f10e425faeddd23316c061f425f39a06
+
+--- a/conf/services/sshd.conf
++++ b/conf/services/sshd.conf
+@@ -43,6 +43,9 @@
+ # specified threshold
+ #$illegal_users_threshold = 4
+ 
++# Set to No to disable IP lookups
++$sshd_ip_lookup = Yes
++
+ 
+ ########################################################
+ # This was written and is maintained by:
+--- a/scripts/services/sshd
++++ b/scripts/services/sshd
+@@ -31,6 +31,7 @@
+ my $IgnoreHost = $ENV{'sshd_ignore_host'} || "";
+ my $RefusedConnectionsThreshold = $ENV{'refused_connections_threshold'} || 0;
+ my $IllegalUsersThreshold = $ENV{'illegal_users_threshold'} || 0;
++$main::DoLookup = $ENV{'sshd_ip_lookup'}; 
+ my $DebugCounter = 0;
+ 
+ # No sense in running if 'sshd' doesn't even exist on this system...
diff --git a/debian/patches/series b/debian/patches/series
index 3c54a4f..943a302 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0019-exim-Handle-self-signed-certs-warnings.patch
 0020-dhcpd-Ignore-lease-age-under-threshold-messages.patch
 0021-audit-use-the-term-ALLOWED-instead-of-Grants.patch
+allow-disabling-lookup.patch