[Pkg-nagios-changes] [pkg-nagios] r1895 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

Author: waja
Date: 2010-04-19 09:02:51 +0000 (Mon, 19 Apr 2010)
New Revision: 1895

Added:
   nagios-plugins/trunk/debian/patches/03_check_smtp_help.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
add the help output of -F

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-04-12 14:58:18 UTC (rev 1894)
+++ nagios-plugins/trunk/debian/changelog	2010-04-19 09:02:51 UTC (rev 1895)
@@ -14,6 +14,7 @@
     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
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2010-04-12 14:58:18 UTC (rev 1894)
+++ nagios-plugins/trunk/debian/patches/00list	2010-04-19 09:02:51 UTC (rev 1895)
@@ -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

Added: nagios-plugins/trunk/debian/patches/03_check_smtp_help.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/03_check_smtp_help.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/03_check_smtp_help.dpatch	2010-04-19 09:02:51 UTC (rev 1895)
@@ -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");
+ }
+ 


Property changes on: nagios-plugins/trunk/debian/patches/03_check_smtp_help.dpatch
___________________________________________________________________
Added: svn:executable
   + *