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

Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: e1df0b24deddb7054fb2859e961698cfe3778334
Proposed branch: ~bryce/ubuntu/+source/logwatch:merge-v7.7-1-lunar
Merge into: ubuntu/+source/logwatch:debian/sid
Diff against target: 1154 lines (+898/-2)
16 files modified
debian/changelog (+518/-0)
debian/control (+4/-2)
debian/patches/0010-zz-zfs-detect-zfs-location.patch (+42/-0)
debian/patches/0014-zz-sys-Suppress-warnings-if-Sys-CPU-or-Sys-MemInfo-a.patch (+52/-0)
debian/patches/0015-pam_unix-Ignore-issues-about-etc-securetty-being-mis.patch (+44/-0)
debian/patches/fix-typo-extreme-networks.patch (+20/-0)
debian/patches/series (+7/-0)
debian/tests/apparmor-unmatched-entries (+41/-0)
debian/tests/basic-checks (+34/-0)
debian/tests/control (+15/-0)
debian/tests/data/su-l (+2/-0)
debian/tests/data/unmatched-entries-apparmor_kern.log (+14/-0)
debian/tests/detail (+16/-0)
debian/tests/packages-and-report (+36/-0)
debian/tests/su-l-check (+37/-0)
debian/tests/syntax-check (+16/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Andreas Hasenack (community) Approve
Canonical Server Reporter Pending
Review via email: mp+434459@code.staging.launchpad.net

Description of the change

Merge with Debian's package. Previously we'd forwarded a bunch of our delta upstream; what remains is what wasn't accepted. At some point we should take another look at what remains and how to get it taken.

There is an odd autopkgtest failure, though I haven't isolated it as a regression of this release vs. a pre-existing issue or a non-issue:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-lunar-bryce-logwatch-merge-v7.7-1/?format=plain)
  logwatch @ amd64:
    14.12.22 08:37:26 Log 🗒️ ✅ Triggers: logwatch/7.7-1ubuntu1~lunar2
  logwatch @ arm64:
    14.12.22 08:41:29 Log 🗒️ ✅ Triggers: logwatch/7.7-1ubuntu1~lunar2
  logwatch @ armhf:
    14.12.22 08:43:45 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar2
      packages-and-report FAIL 🟥
  logwatch @ ppc64el:
    14.12.22 08:28:38 Log 🗒️ ✅ Triggers: logwatch/7.7-1ubuntu1~lunar2
  logwatch @ s390x:
    14.12.22 08:37:55 Log 🗒️ ✅ Triggers: logwatch/7.7-1ubuntu1~lunar2

The armhf failure I suspect is a flaky test, and I'm re-running that one.

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

    $ sudo add-apt-repository -yus ppa:bryce/logwatch-merge-v7.7-1
    $ sudo apt-get install <package>

Usual tags pushed for review:
  - tags/old/debian 90c98cf
  - tags/new/debian 54cf7c3
  - tags/old/ubuntu aafb324
  - tags/logical/7.5.6-1ubuntu1 0e1524f
  - tags/reconstruct/7.5.6-1ubuntu1 57a691a
  - tags/split/7.5.6-1ubuntu1 a17cd07

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote (last edit ):

There is an odd autopkgtest failure, though I haven't isolated it as a regression of this release vs. a pre-existing issue or a non-issue:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-lunar-bryce-logwatch-merge-v7.7-1/?format=plain)
  logwatch @ amd64:
    10.12.22 09:50:17 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar1
      basic-checks PASS 🟩
      syntax-check FAIL 🟥
      detail PASS 🟩
      su-l-check PASS 🟩
      apparmor-unmatched-entries PASS 🟩
      packages-and-report PASS 🟩
  logwatch @ arm64:
    10.12.22 09:57:52 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar1
      basic-checks PASS 🟩
      syntax-check FAIL 🟥
      detail PASS 🟩
      su-l-check PASS 🟩
      apparmor-unmatched-entries PASS 🟩
      packages-and-report PASS 🟩
  logwatch @ armhf:
    10.12.22 09:10:10 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar1
      basic-checks PASS 🟩
      syntax-check FAIL 🟥
      detail PASS 🟩
      su-l-check PASS 🟩
      apparmor-unmatched-entries PASS 🟩
      packages-and-report FAIL 🟥
  logwatch @ ppc64el:
    10.12.22 09:50:40 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar1
      basic-checks PASS 🟩
      syntax-check FAIL 🟥
      detail PASS 🟩
      su-l-check PASS 🟩
      apparmor-unmatched-entries PASS 🟩
      packages-and-report PASS 🟩
  logwatch @ s390x:
    10.12.22 09:55:46 Log 🗒️ ❌ Triggers: logwatch/7.7-1ubuntu1~lunar1
      basic-checks PASS 🟩
      syntax-check FAIL 🟥
      detail PASS 🟩
      su-l-check PASS 🟩
      apparmor-unmatched-entries PASS 🟩
      packages-and-report PASS 🟩

The error is as follows:

String found where operator expected at /usr/share/logwatch/scripts/services/extreme-networks line 36, near "Logwatch ':all'"
 (Do you need to predeclare Logwatch?)
No such class use at /usr/share/logwatch/scripts/services/extreme-networks line 36, near "my use"
syntax error at /usr/share/logwatch/scripts/services/extreme-networks line 36, near "my use Logwatch "
BEGIN not safe after errors--compilation aborted at /usr/share/logwatch/scripts/services/extreme-networks line 37.
autopkgtest [09:24:24]: test syntax-check: -----------------------]
syntax-check FAIL non-zero exit status 253

Revision history for this message
Bryce Harrington (bryce) wrote (last edit ):

The aforementioned issue was literally just a typo in the upstream codebase. Props to Autopkgtest!

The fix is trivial and I've forwarded it upstream:
https://sourceforge.net/p/logwatch/patches/77/

The branch and PPA are likewise updated. I'll update the description with the new autopkgtest results once they're available. (Hopefully I can assume they'll pass cleanly this time.)

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Tests are better, but packages-and-report is failing in armhf.

As for the delta, I would suggest starting with the DEP8 one, which is large (but easy to maintain). And, as your latest fix confirms, the DEP8 tests are very useful.

+1 when the armhf test passes. If it's flaky, maybe something can be done to make it more resilient?

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve
Revision history for this message
Bryce Harrington (bryce) wrote :

I've run the armhf tests a few times and they all fail in packages-and-report. But the error is odd:

autopkgtest [16:01:35]: test packages-and-report: [-----------------------
Checking section SSHD exists in logwatch report for package openssh-server
Number of lines for the report:
autopkgtest [16:01:38]: test packages-and-report: -----------------------]

Maybe the sshd service simply isn't present on armhf? In any case, it looks like this test case has always failed on armhf, and doesn't hold up acceptance of the package:

  https://autopkgtest.ubuntu.com/packages/l/logwatch/lunar/armhf

I'll proceed with the upload, and file a bug for the wayward issue.

I checked and found that Miriam already forwarded the dep8 tests to Debian (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996893) but no response from them yet.

Revision history for this message
Bryce Harrington (bryce) wrote :

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/logwatch
Vcs-Git-Commit: e1df0b24deddb7054fb2859e961698cfe3778334
Vcs-Git-Ref: refs/heads/merge-v7.7-1-lunar

$ dput ubuntu ../logwatch_7.7-1ubuntu1_source.changes
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading logwatch_7.7-1ubuntu1.dsc: done.
  Uploading logwatch_7.7.orig.tar.gz: done.
  Uploading logwatch_7.7-1ubuntu1.debian.tar.xz: done.
  Uploading logwatch_7.7-1ubuntu1_source.buildinfo: done.
  Uploading logwatch_7.7-1ubuntu1_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches