[Pkg-nagios-changes] [pkg-nagios-plugins] 248/413: add the help output of -F

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit a38a26543bbcf8471cc5fbbdf264b6b46a9c0d5a
Author: Jan Wagner <waja at cyconet.org>
Date:   Mon Apr 19 09:02:51 2010 +0000

    add the help output of -F
---
 debian/changelog                         |  1 +
 debian/patches/00list                    |  1 +
 debian/patches/03_check_smtp_help.dpatch | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 372ec8c..1b98274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ nagios-plugins (1.4.14-5) UNRELEASED; urgency=low
     23_check_smb_password.dpatch, thanks Holger Weiss for notification
   * Update 39_check_ircd_fix_epn.dpatch with fix from upstream, thanks
     Holger Weiss
+  * Add 03_check_smtp_help.dpatch to add the help output of "-F" to check_smtp
 
  -- Jan Wagner <waja at cyconet.org>  Thu, 08 Apr 2010 23:54:05 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 83390b0..775f8c0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 02_check_icmp_links.dpatch
+03_check_smtp_help.dpatch
 06_checkircd.dpatch
 13_subst.in_again.dpatch
 18_check_game_cmdline.dpatch
diff --git a/debian/patches/03_check_smtp_help.dpatch b/debian/patches/03_check_smtp_help.dpatch
new file mode 100755
index 0000000..20a58cc
--- /dev/null
+++ b/debian/patches/03_check_smtp_help.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_check_smtp_help.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## DP: Add -F to help output (bugs.debian.org/578333)
+## DP: Upstream bug is: https://sourceforge.net/tracker/?func=detail&aid=2989193&group_id=29880&atid=397597
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.14~/plugins/check_smtp.c nagios-plugins-1.4.14/plugins/check_smtp.c
+--- nagios-plugins-1.4.14~/plugins/check_smtp.c	2009-06-06 09:04:49.000000000 +0200
++++ nagios-plugins-1.4.14/plugins/check_smtp.c	2010-04-19 10:54:02.000000000 +0200
+@@ -782,6 +782,8 @@
+   printf ("    %s\n", _("Expected response to command (may be used repeatedly)"));
+   printf (" %s\n", "-f, --from=STRING");
+   printf ("    %s\n", _("FROM-address to include in MAIL command, required by Exchange 2000")),
++  printf (" %s\n", "-F, --fqdn=STRING");
++  printf ("    %s\n", _("FQDN used for HELO"));
+ #ifdef HAVE_SSL
+   printf (" %s\n", "-D, --certificate=INTEGER");
+   printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
+@@ -823,8 +825,8 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-	printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
++  printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]\n", progname);
+   printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
+-  printf ("[-S] [-D days] [-v] [-4|-6]\n");
++  printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
+ }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git