[Pkg-nagios-changes] [pkg-nagios] r2065 - nagios-plugins/trunk/debian/patches

[Jan Wagner]

Author: waja
Date: 2012-06-14 06:36:25 +0000 (Thu, 14 Jun 2012)
New Revision: 2065

Modified:
   nagios-plugins/trunk/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch
   nagios-plugins/trunk/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
Log:
fix patches

Modified: nagios-plugins/trunk/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch	2012-06-14 06:21:23 UTC (rev 2064)
+++ nagios-plugins/trunk/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch	2012-06-14 06:36:25 UTC (rev 2065)
@@ -4,10 +4,15 @@
 ## From: Holger Weiss <holger at zedat.fu-berlin.de>
 ## Date: Wed, 13 Jun 2012 12:36:42 +0200
 ## Subject: [PATCH] check_dhcp: Fix handling of "pad" options
-## X-Git-Url: http://nagiosplug.git.sourceforge.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=patch;h=d796c16327e6e315dd528f17e8bd597c5f506730
+## X-Git-Url: https://github.com/nagios-plugins/nagios-plugins/commit/f091d59e0f9abec9304d9d230fafc2dec001baba.patch
 ##
 ## DP: Don't let "pad" options[*] terminate the parsing of DHCP options. This bug was triggered by using check_dhcp against Windows 2003 DHCP servers (see #3503921). [*] Cf. RFC 2132, 3.1.
 
+---
+ NEWS                      |    1 +
+ plugins-root/check_dhcp.c |    7 ++++---
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
 diff --git a/NEWS b/NEWS
 index 7452a6b..b138084 100644
 --- a/NEWS
@@ -46,5 +51,5 @@
  		}
  
 -- 
-1.7.10.4
+1.7.10
 

Modified: nagios-plugins/trunk/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch	2012-06-14 06:21:23 UTC (rev 2064)
+++ nagios-plugins/trunk/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch	2012-06-14 06:36:25 UTC (rev 2065)
@@ -4,26 +4,21 @@
 ## From: Holger Weiss <holger at zedat.fu-berlin.de>
 ## Date: Thu, 14 Jun 2012 00:39:55 +0200
 ## Subject: [PATCH] check_dhcp: Don't misinterpret the "siaddr" field
-## X-Git-Url: http://nagiosplug.git.sourceforge.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=patch;h=d796c16327e6e315dd528f17e8bd597c5f506730
+## X-Git-Url: https://github.com/nagios-plugins/nagios-plugins/commit/4d5276273287ef59881b541ba96279e91974a4b2.patch
 ##
 ## DP: RFC 2131 (2.) says: "DHCP clarifies the interpretation of the 'siaddr' field as the address of the server to use in the next step of the client's bootstrap process."  So, we shouldn't interpret this field as the DHCP server's own address.  (#3503921 - Jason Ellison)
 
 @DPATCH@
 
-diff --git a/THANKS.in b/THANKS.in
-index 32a8868..943acdb 100644
---- a/THANKS.in
-+++ b/THANKS.in
-@@ -273,3 +273,4 @@ Jason Lunn
- Alex Griffin
- Marc Remy
- Matej Vela
-+Jason Ellison
+---
+ plugins-root/check_dhcp.c |   13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
 diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
 index ac89274..b02ee49 100644
 --- a/plugins-root/check_dhcp.c
 +++ b/plugins-root/check_dhcp.c
-@@ -141,7 +141,7 @@ typedef struct dhcp_packet_struct{
+@@ -141,7 +141,7 @@
          u_int16_t flags;                /* flags */
          struct in_addr ciaddr;          /* IP address of this machine (if we already have one) */
          struct in_addr yiaddr;          /* IP address of this machine (offered by the DHCP server) */
@@ -58,5 +53,5 @@
  	new_offer->server_address=serv_ident.s_addr?serv_ident:source;
  	new_offer->offered_address=offer_packet->yiaddr;
 -- 
-1.7.10.4
+1.7.10