[Pkg-nagios-changes] [pkg-nagios-plugins] 314/413: fix patches

[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 9d4ffeb978f3bdd8b57a3b3e3cb6a285b8499239
Author: Jan Wagner <waja at cyconet.org>
Date:   Thu Jun 14 06:36:25 2012 +0000

    fix patches
---
 .../10_check_dhcp_Fix-handling-of-pad-options.dpatch  |  9 +++++++--
 ...ck_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch | 19 +++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch b/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch
index daed958..2b96a5b 100644
--- a/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch
+++ b/debian/patches/10_check_dhcp_Fix-handling-of-pad-options.dpatch
@@ -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 @@ index 2a1875c..ac89274 100644
  		}
  
 -- 
-1.7.10.4
+1.7.10
 
diff --git a/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch b/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
index efa7900..e3a5f03 100644
--- a/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
+++ b/debian/patches/11_check_dhcp_Don-t-misinterpret-the-siaddr-field.dpatch
@@ -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 @@ index ac89274..b02ee49 100644
  	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
 

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