Merge ~bryce/ubuntu/+source/logwatch:sru.1797836-bionic into ubuntu/+source/logwatch:ubuntu/bionic-devel

[Bryce Harrington]

Fixes LP: #1797836 for Ubuntu bionic by adding a backported patch from
logwatch 7.5.0.

PPA with test package: https://launchpad.net/~bryce/+archive/ubuntu/logwatch-sru-1797836/+packages
  $ sudo add-apt-repository ppa:bryce/logwatch-sru-1797836
  $ sudo apt-get update
  $ sudo apt-get install logwatch

Test case:
  $ now=$(date +"%b %d %T")
  $ uptime=$(cat /proc/uptime | cut -d' ' -f1)
  $ fake_message="${now} ${HOSTNAME} kernel: [${uptime}] RAS: Correctable Errors collector initialized"
  $ echo "${fake_message}" >> /var/log/kern.log
  $ logwatch --service kernel --range Today

  With the current Ubuntu version, logwatch will display a report
  showing the RAS error.

  With the PPA version, logwatch should show no output.

[Christian Ehrhardt  (paelzer)]

Current state:
 logwatch | 7.4.2-1ubuntu1 | xenial
 logwatch | 7.4.3+git20161207-2ubuntu1 | bionic
 logwatch | 7.4.3+git20161207-2ubuntu2 | cosmic
 logwatch | 7.5.0-1ubuntu1 | disco

Since we are not pushing the same version to Cosmic there is no need to extend it with per-release numbers.
This would do it:
  7.4.3+git20161207-2ubuntu1.1

All the rest (headers, patch, patch source, build, SRU, test) LGTM.
+1

You can fix up the version when sponsoring this yourself right?

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review, tagged and uploaded:

$ git push pkg upload/7.4.3+git20161207-2ubuntu1.1
Counting objects: 11, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.98 KiB | 253.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/logwatch
 * [new tag] upload/7.4.3+git20161207-2ubuntu1.1 -> upload/7.4.3+git20161207-2ubuntu1.1

$ dput ubuntu logwatch_7.4.3+git20161207-2ubuntu1.1_source.changes
Checking signature on .changes
gpg: /home/bryce/ubuntu/Logwatch/sru.1797836/logwatch_7.4.3+git20161207-2ubuntu1.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/ubuntu/Logwatch/sru.1797836/logwatch_7.4.3+git20161207-2ubuntu1.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading logwatch_7.4.3+git20161207-2ubuntu1.1.dsc: done.
  Uploading logwatch_7.4.3+git20161207-2ubuntu1.1.debian.tar.xz: done.
  Uploading logwatch_7.4.3+git20161207-2ubuntu1.1_source.buildinfo: done.
  Uploading logwatch_7.4.3+git20161207-2ubuntu1.1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This is in -proposed, thereby setting merged

diff --git a/debian/changelog b/debian/changelog
index af5fcfc..ae1c30b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+logwatch (7.4.3+git20161207-2ubuntu1.18.04.1) bionic; urgency=medium
+
+  * Add d/patches/ignore-ras-correctable-errors.patch to fix false
+    reporting of kernel error "RAS: Correctable Errors collector..."
+    (LP: #1797836)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 09 Jul 2019 15:39:57 -0700
+
 logwatch (7.4.3+git20161207-2ubuntu1) zesty; urgency=medium
 
   * Merge from Debian testing. Remaining changes:
diff --git a/debian/patches/ignore-ras-correctable-errors.patch b/debian/patches/ignore-ras-correctable-errors.patch
new file mode 100644
index 0000000..9c3d36c
--- /dev/null
+++ b/debian/patches/ignore-ras-correctable-errors.patch
@@ -0,0 +1,31 @@
+From ce8cd7421f34722b3c5411cb2544e34f627384cc Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <[e-mail]>
+Date: Fri, 1 Jun 2018 11:23:56 -0600
+Subject: [PATCH] [kernel] Ignore RAS: Correctable Errors collector initialized
+ message
+
+Author:	Orion Poplawski <[e-mail]>
+Origin: upstream, https://sourceforge.net/p/logwatch/git/ci/ce8cd7421f34722b3c5411cb2544e34f627384cc
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/logwatch/+bug/1797836
+Reviewed-By: Bryce Harrington <[e-mail]>
+Applied-Upstream: 7.5.0, commit:ce8cd7421f34722b3c5411cb2544e34f627384cc
+Last-Updated: 2019-06-27
+---
+ scripts/services/kernel | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/services/kernel b/scripts/services/kernel
+index 7c4ae26..9803c14 100755
+--- a/scripts/services/kernel
++++ b/scripts/services/kernel
+@@ -85,6 +85,7 @@ while (defined(my $ThisLine = <STDIN>)) {
+       # following now in iptables service
+       or ($ThisLine =~ /^Packet log: .*PROTO=/)
+       or ($ThisLine =~ /IN=.*OUT=.*SRC=.*DST=.*PROTO=/)
++      or ($ThisLine =~ /RAS: Correctable Errors collector initialized/)
+       # user specified ignore messages, lower cased
+       or ($ThisLine =~ /$Ignore_messages/i)
+       ) { # ignore the above strings
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ce06425..35fbd8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
 0007-dovecot-Ignore-Debug-output.patch
 0008-postfix-Fix-unaligned-output.patch
 0009-Revert-Changed-encoding-to-UTF-8-as-suggested-by-G-r.patch
+
+ignore-ras-correctable-errors.patch