Bug 222237 - net-mgmt/monitoring-plugins: Extend the mailq to support opensmtp
Summary: net-mgmt/monitoring-plugins: Extend the mailq to support opensmtp
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Mathieu Arnold
URL: https://reviews.freebsd.org/D12322
Keywords: feature, patch, patch-ready
Depends on:
Blocks:
 
Reported: 2017-09-11 20:13 UTC by Mahdi Mokhtari
Modified: 2017-09-14 12:00 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (mat)

Attachments
Patch regarding to the review [adds opensmtp support] (1.82 KB, patch)
2017-09-12 11:29 UTC, Mahdi Mokhtari 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mahdi Mokhtari freebsd_committer freebsd_triage 2017-09-11 20:13:45 UTC 
This patch [at the review] extend the pattern of `opt_M` to include "opensmtp" and also adds new case to `if conditions` and therefore extends the mailq to support opensmtp.
Comment 1 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-12 11:26:25 UTC 
I cannot see a patch here. Could you please attach the patch to the PR?
Comment 2 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-09-12 11:29:17 UTC 
Created attachment 186294 [details]
Patch regarding to the review [adds opensmtp support]

Sorry I thought Linking to the Phabricator review is enough ``:-]
BTW, the patch is attached :)
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-12 12:53:07 UTC 
Mmmm, oh, I did not see the review link.  But the fact remains, it is a pain to extract a diff from a review, as you can't use fetch on the "download diff" link, for some reason.
Comment 4 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-09-12 12:59:19 UTC 
(In reply to Mathieu Arnold from comment #3)
Hmm, yeah :D
I usually add a .diff to the Phabricator link and it works :)
But BTW, I attached the patch here too :D
Comment 5 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-13 12:49:42 UTC 
Do you have links to the issues opened upstream ? So that I can track when the patch can be removed ?
Comment 6 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-13 13:08:26 UTC 
Found it.

The patch is very quite different from what went in upstream. Is there a good reason to have a patch so different ?
Comment 7 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-09-13 15:49:52 UTC 
(In reply to Mathieu Arnold from comment #6)
Hmm, I think maybe you found something different?
Here is the upstream --> https://github.com/monitoring-plugins/monitoring-plugins/pull/1495
Comment 8 Mahdi Mokhtari freebsd_committer freebsd_triage 2017-09-13 15:50:23 UTC 
(In reply to Mahdi Mokhtari from comment #7)
It's not that different (basically it's the same)...
Comment 9 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-14 11:29:13 UTC 
Since v2.2, upstream got an opensmtpd and a opensmtp, I was looking at the last commit which added opensmtp*d*, and missed the "d" in it.
Comment 10 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-14 11:32:03 UTC 
(it is all confusing because the commit message that adds "opensmtp" contains about "opensmtpd")
Comment 11 FiLiS 2017-09-14 11:39:30 UTC 
The patch is for opensmtpd, the parameter is just called "opensmtp" instead of "opensmtpd".
Where in 2.2 is there already opensmtp[d] support in mailq?
Comment 12 Mathieu Arnold freebsd_committer freebsd_triage 2017-09-14 11:53:01 UTC 
Found out what was wrong.
I managed to get nagios-plugins (which already has opensmtp and opensmtpd support) in my monitoring-plugins git repository.
So, now that I have unscrambled everything, I see that monitoring-plugins still has the issue open and nagios-plugins has it committed in, ready for a future release.
Comment 13 FiLiS 2017-09-14 11:54:39 UTC 
Ah, yes, Filias committed the patch to both, nagios-plugins and monitoring-plugins.
Comment 14 commit-hook freebsd_committer freebsd_triage 2017-09-14 11:59:13 UTC 
A commit references this bug:

Author: mat
Date: Thu Sep 14 11:58:58 UTC 2017
New revision: 449835
URL: https://svnweb.freebsd.org/changeset/ports/449835

Log:
  Add support for opensmtp in check_mailq.

  PR:		222237
  Submitted by:	mmokhi
  Obtained from:	https://github.com/nagios-plugins/nagios-plugins/commit/d56818f5121b05439c7b7a1655d96ab39e066797
  Obtained from:	https://github.com/monitoring-plugins/monitoring-plugins/pull/1495
  Sponsored by:	Absolight

Changes:
  head/net-mgmt/monitoring-plugins/Makefile
  head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__mailq.pl
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl