Merge ~kstenerud/ubuntu/+source/logwatch:merge-7.5.0-1-disco into ubuntu/+source/logwatch:debian/sid

[Karl Stenerud]

PPA: https://launchpad.net/~kstenerud/+archive/ubuntu/disco-at-merge-1810928

Test install:

lxc launch ubuntu-daily:disco tester && lxc exec tester bash

add-apt-repository -y ppa:kstenerud/disco-at-merge-1810928 &&
apt update &&
apt dist-upgrade -y &&
apt install -y logwatch &&
logwatch --version

** Note: It will say 7.4.3 due to an upstream bug

Test upgrade:

lxc launch ubuntu-daily:disco tester && lxc exec tester bash

apt update &&
apt dist-upgrade -y &&
apt install -y logwatch &&
logwatch --version

add-apt-repository -y ppa:kstenerud/disco-at-merge-1810928 &&
apt update &&
apt dist-upgrade -y &&
logwatch --version

** Note: It will still say 7.4.3 due to an upstream bug

Package tests: none

[Christian Ehrhardt  (paelzer)]

looks mostly good to me, one thing missing in changelog thou.
Old Ubuntu had
 51 * d/p/ssh-ignore-disconnected.patch: [sshd] ignore disconnected from user
 52 USER (LP: 1644057)

That was dropped (correct) but missed to mention in changelog.

review: Needs Fixing

[Karl Stenerud (kstenerud)]

Added mention to changelog.

[Christian Ehrhardt  (paelzer)]

Hi,
we usually add why we drop things, alternatives often are "is in Debian", "is upstream" or "nor more needed because ..."
It is just good habit to do so to allow somebody looking at it later understanding the thought of the developer.

The style might differ and is case-by-case decision. most often I saw is next line with brackets

  * Dropped Changes:
    - Foo: change to bar
      [now in Debian]

I think we talked about it before, but it might be missing in your guide so far.
Please make "adding the reasoning" part of your step that mentioned dropped changes.

review: Needs Fixing

[Karl Stenerud (kstenerud)]

Updated, and added to document.

[Christian Ehrhardt  (paelzer)]

But in this case isn't the change "upstream".
I mean by that it also is in Debian, but I'd have expected "upstream" being called out as the reason to drop it.

[Karl Stenerud (kstenerud)]

Updated

[Christian Ehrhardt  (paelzer)]

LGTM now thanks.
Tagged and sponsored 8ffeaf2d

Please track proposed migration

review: Approve

[Christian Ehrhardt  (paelzer)]

Saw the mail:
[ubuntu/disco-proposed] logwatch 7.5.0-1ubuntu1 (Accepted)

Setting it to merged

diff --git a/debian/changelog b/debian/changelog
index 3f2a80a..0109597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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
@@ -36,6 +49,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.
@@ -55,6 +85,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".
@@ -63,6 +103,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
@@ -70,6 +120,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
@@ -85,6 +145,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
@@ -112,6 +184,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
@@ -172,6 +259,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
@@ -184,6 +280,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
@@ -207,6 +317,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
@@ -236,6 +357,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)
@@ -265,6 +399,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
@@ -288,6 +473,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
@@ -303,6 +498,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
@@ -322,6 +544,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:
@@ -747,3 +978,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 5346d05..f296593 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 (>> 8.0.0~)
 Standards-Version: 4.3.0
 Homepage: http://www.logwatch.org/
@@ -10,8 +11,9 @@ 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
+Depends: ${perl:Depends}, ${misc:Depends}, postfix | mail-transport-agent
+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/dist.conf/logfiles/maillog.conf b/debian/dist.conf/logfiles/maillog.conf
index 3d9c07e..2c8635e 100644
--- a/debian/dist.conf/logfiles/maillog.conf
+++ b/debian/dist.conf/logfiles/maillog.conf
@@ -3,7 +3,6 @@
 # so we would otherwise report each event twice
 LogFile =
 LogFile = mail.log
-LogFile = mail.log.0
 LogFile = mail.log.1
 
 Archive =