Ubuntu
monitoring-plugins package

Merge ~bryce/ubuntu/+source/monitoring-plugins:merge-v2.3.2-1-lunar into ubuntu/+source/monitoring-plugins:debian/sid

  1. Git
  2. lp:~bryce/ubuntu/+source/monitoring-plugins
  3. merge-v2.3.2-1-lunar
  4. Merge into 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: dad1d00273d297fec28b928f099469de32554ab1
Proposed branch: ~bryce/ubuntu/+source/monitoring-plugins:merge-v2.3.2-1-lunar
Merge into: ubuntu/+source/monitoring-plugins:debian/sid
Diff against target: 241 lines (+180/-1)
5 files modified
debian/changelog (+89/-0)
debian/control (+2/-1)
debian/patches/check_http_socket_timeouts.patch (+29/-0)
debian/patches/exclude-tmpfs-squashfs-tracefs.patch (+55/-0)
debian/patches/series (+5/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Andreas Hasenack (community) Approve
Canonical Server Reporter Pending
Review via email: mp+434457@code.staging.launchpad.net

Description of the change

Merge with Debian's package, bringing in the new upstream point release.

I merged together Miriam and my changes for the tmpfs patch, as you can see in the logical delta. The revised patch was forwarded upstream but still seems not to have been accepted.

Release Notes: https://www.monitoring-plugins.org/news/release-2-3-2.html
Bug: https://bugs.launchpad.net/ubuntu/+source/monitoring-plugins/+bug/1946874
PPA: https://launchpad.net/~bryce/+archive/ubuntu/monitoring-plugins-merge-v2.3.2-1

    $ sudo add-apt-repository -yus ppa:bryce/monitoring-plugins-merge-v2.3.2-1
    $ sudo apt-get install monitoring-plugins

All builds in the PPA have succeeded, but the arm builds are still publishing atm.

Usual tags pushed for review:
  - tags/old/debian 18b35f8
  - tags/new/debian 799ac15
  - tags/old/ubuntu c495492
  - tags/logical/2.3.1-1ubuntu4 141e666
  - tags/reconstruct/2.3.1-1ubuntu4 38e5223
  - tags/split/2.3.1-1ubuntu4 d35b528

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

There is a tiny bit wrong in the logical tag.

When diffing logical/2.3.1-1ubuntu4 against old/ubuntu, one expects to only see d/changelog and d/control changes, but here we also get:
diff --git a/debian/patches/exclude-tmpfs-squashfs-tracefs.patch b/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
index e9200dc..1216bae 100644
--- a/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
+++ b/debian/patches/exclude-tmpfs-squashfs-tracefs.patch
@@ -10,7 +10,7 @@ Author: Bryce Harrington <email address hidden>
 Bug-Ubuntu: https://bugs.launchpad.net/nagios-charm/+bug/1827159
             https://bugs.launchpad.net/ubuntu/+source/monitoring-plugins/+bug/1940916
 Forwarded: yes, https://github.com/monitoring-plugins/monitoring-plugins/pull/1749
-Last-Update: 2019-11-07
+Last-Update: 2022-02-16
 ---
  plugins/check_disk.c | 3 +++
  1 file changed, 3 insertions(+)

If you look at that patch in pkg/ubuntu/devel (the current package in the archive), the Last-Update bit is 2019-11-07:
$ git show pkg/ubuntu/devel:debian/patches/exclude-tmpfs-squashfs-tracefs.patch | grep Last-Update:
Last-Update: 2019-11-07

I think you meant to update the date in this merge, but "logical" should reflect the state as it is was in the archive at that version.

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

The rest is ok, so the logical tag bit I mentioned before is minor, and doesn't affect the outcome of the merge. Up to you if you want to fix it.

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 :

Wow, I didn't think anyone would catch that, sharp eyes!

Yes, I noticed that when Miriam fixed the patch she didn't update the Last-Updated date in the header, so fixed that to when she changed it. So, technically that's an update from this merge, but certainly not worth mentioning in the changelog. I wasn't sure if that would be appropriate to include in logical changes or inappropriate, and defaulted to being lazy. :-)

Thanks for the review, I'll push this directly.

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

Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/monitoring-plugins
Vcs-Git-Commit: dad1d00273d297fec28b928f099469de32554ab1
Vcs-Git-Ref: refs/heads/merge-v2.3.2-1-lunar
$ dput ubuntu ../monitoring-plugins_2.3.2-1ubuntu1_source.changes
D: Setting host argument.
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 monitoring-plugins_2.3.2-1ubuntu1.dsc: done.
  Uploading monitoring-plugins_2.3.2.orig.tar.gz: done.
  Uploading monitoring-plugins_2.3.2-1ubuntu1.debian.tar.xz: done.
  Uploading monitoring-plugins_2.3.2-1ubuntu1_source.buildinfo: done.
  Uploading monitoring-plugins_2.3.2-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