[Pkg-nagios-changes] [pkg-nagios-plugins] 42/413: few fixes

[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 98af9a058a3b590cd273f64d8528af1f5981a128
Author: Sean Finney <seanius at debian.org>
Date:   Fri Nov 17 08:37:39 2006 +0000

    few fixes
---
 debian/changelog                           | 18 ++++++++++-----
 debian/patches/00list                      |  3 ++-
 debian/patches/24_check_ups.dpatch         | 36 ------------------------------
 debian/patches/26_implicit-basename.dpatch | 18 +++++++++++++++
 debian/patches/27_is_hostname.dpatch       | 19 ++++++++++++++++
 5 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dfc4f0b..1cfea5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-nagios-plugins (1.4.4-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- sean finney <seanius at debian.org>  Wed,  1 Nov 2006 23:00:13 +0100
+nagios-plugins (1.4.4-2) unstable; urgency=low
+
+  * fix for implicit definition of basename function, thanks to
+    dann frazier for finding it (closes: #396814). 
+    patch: 26_implicit-basename.dpatch
+  * aparently the check_ups fix caused problems as well as solved them.
+    until we ge a real fix for the problem i'm reverting the patch.
+    thanks to Michael Bussmann (closes: #398767).
+  * add '-' to allowable characters in is_hostname.  thanks again to
+    Michael Bussmann (closes: #398767).
+    patch: 27_is_hostname.dpatch
+
+ -- sean finney <seanius at debian.org>  Fri, 17 Nov 2006 09:37:17 +0100
 
 nagios-plugins (1.4.4-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 66ab61c..f917557 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,5 +4,6 @@
 18_check_game_cmdline.dpatch
 22_check_smb_hostaddress.dpatch
 23_check_axis.dpatch
-24_check_ups.dpatch
 25_check_tcp-expect.dpatch
+26_implicit-basename.dpatch
+27_is_hostname.dpatch
diff --git a/debian/patches/24_check_ups.dpatch b/debian/patches/24_check_ups.dpatch
deleted file mode 100755
index 105b970..0000000
--- a/debian/patches/24_check_ups.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 24_check_ups.dpatch by  <seanius at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad nagios-plugins-1.4.4~/plugins/check_ups.c nagios-plugins-1.4.4/plugins/check_ups.c
---- nagios-plugins-1.4.4~/plugins/check_ups.c	2006-06-18 21:36:48.000000000 +0200
-+++ nagios-plugins-1.4.4/plugins/check_ups.c	2006-11-01 20:17:30.000000000 +0100
-@@ -393,13 +393,13 @@
- 	/*  char command[MAX_INPUT_BUFFER]; */
- 	char temp_buffer[MAX_INPUT_BUFFER];
- 	char send_buffer[MAX_INPUT_BUFFER];
--	char *ptr;
-+	char *ptr, *end = NULL;
- 	int len;
- 
- 	*buf=0;
- 	
- 	/* create the command string to send to the UPS daemon */
--	sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname);
-+	sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname);
- 
- 	/* send the command to the daemon and get a response back */
- 	if (process_tcp_request
-@@ -433,6 +433,9 @@
- 	}
- 
- 	ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;
-+	end = strchr(ptr, '\n');
-+	if (end)
-+		*end = 0;
- 	len = strlen(ptr);
- 	if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {
- 		printf ("%s\n", _("Error: unable to parse variable"));
diff --git a/debian/patches/26_implicit-basename.dpatch b/debian/patches/26_implicit-basename.dpatch
new file mode 100755
index 0000000..814bb02
--- /dev/null
+++ b/debian/patches/26_implicit-basename.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 26-implicit-basename.dpatch by  <seanius at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.4~/plugins/check_procs.c nagios-plugins-1.4.4/plugins/check_procs.c
+--- nagios-plugins-1.4.4~/plugins/check_procs.c	2006-10-19 02:25:16.000000000 +0200
++++ nagios-plugins-1.4.4/plugins/check_procs.c	2006-11-17 09:26:57.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include "utils.h"
+ 
+ #include <pwd.h>
++#include <dirname.h>
+ 
+ int process_arguments (int, char **);
+ int validate_arguments (void);
diff --git a/debian/patches/27_is_hostname.dpatch b/debian/patches/27_is_hostname.dpatch
new file mode 100755
index 0000000..11daa8a
--- /dev/null
+++ b/debian/patches/27_is_hostname.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 27_is_hostname.dpatch by  <seanius at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.4~/plugins-scripts/utils.pm.in nagios-plugins-1.4.4/plugins-scripts/utils.pm.in
+--- nagios-plugins-1.4.4~/plugins-scripts/utils.pm.in	2006-10-19 20:44:53.000000000 +0200
++++ nagios-plugins-1.4.4/plugins-scripts/utils.pm.in	2006-11-17 09:36:05.000000000 +0100
+@@ -76,7 +76,7 @@
+ 
+ sub is_hostname {
+ 	my $host1 = shift;
+-	if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*)$/) {
++	if ($host1 && $host1 =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*)$/) {
+ 		return 1;
+ 	}else{
+ 		return 0;

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