From 0ef129fa86040e4fbd1ceb0d08d38c2e29e2dae1 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Tue, 5 Dec 2006 18:25:10 +0000 Subject: [PATCH] crap, i never committed the changes for 1.5.1 even though i uploaded it. "whoops" my bad. --- debian/changelog | 14 ++++++++--- debian/patches/00list | 2 +- .../patches/27_check_radius_segfault.dpatch | 23 +++++++++++++++++++ debian/patches/27_is_hostname.dpatch | 19 --------------- 4 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 debian/patches/27_check_radius_segfault.dpatch delete mode 100755 debian/patches/27_is_hostname.dpatch diff --git a/debian/changelog b/debian/changelog index c098b64..340e10c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -nagios-plugins (1.4.4-3) UNRELEASED; urgency=low +nagios-plugins (1.4.5-1) unstable; urgency=low - * NOT RELEASED YET + * new upstream (bugfix only) release. the following patches + have been obsoleted: + - 27_is_hostname.dpatch + * fix for segfaulting check_radius plugin, thanks to Yasper + Casper for finding it (closes: #399532, #379788). + patch: 27_check_radius_segfault.dpatch + * regarding the fix for check_ups in the previous patch: both + the bug number and the attribution were incorrect. thanks are + due to Robbert Kouprie (closes: #398780). - -- sean finney Fri, 17 Nov 2006 09:42:43 +0100 + -- sean finney Mon, 20 Nov 2006 20:31:23 +0100 nagios-plugins (1.4.4-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index f917557..9a9b14b 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -6,4 +6,4 @@ 23_check_axis.dpatch 25_check_tcp-expect.dpatch 26_implicit-basename.dpatch -27_is_hostname.dpatch +27_check_radius_segfault.dpatch diff --git a/debian/patches/27_check_radius_segfault.dpatch b/debian/patches/27_check_radius_segfault.dpatch new file mode 100644 index 0000000..ae1e81a --- /dev/null +++ b/debian/patches/27_check_radius_segfault.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 27_check_radius_segfault.dpatch by Yasper Casper +## + +@DPATCH@ +diff -urNad nagios-plugins-1.4.5~/plugins/check_radius.c nagios-plugins-1.4.5/plugins/check_radius.c +--- nagios-plugins-1.4.5~/plugins/check_radius.c 2006-10-20 01:53:28.000000000 +0200 ++++ nagios-plugins-1.4.5/plugins/check_radius.c 2006-11-20 20:38:49.000000000 +0100 +@@ -137,6 +137,14 @@ + rc_read_dictionary (rc_conf_str (str))) + die (STATE_UNKNOWN, _("Config file error")); + ++ /* Initialize Value Pair to prevent segfault on rc_avpair_add. ++ * debugging on radiuslib-ng show that the mem isn't allocated, ++ * and some random memory is in the USER-PASSWORD pair. ++ * So, after initialization, the password is filled with the correct values ++ */ ++ data.send_pairs = NULL; ++ data.receive_pairs = NULL; ++ + service = PW_AUTHENTICATE_ONLY; + + if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) && diff --git a/debian/patches/27_is_hostname.dpatch b/debian/patches/27_is_hostname.dpatch deleted file mode 100755 index 11daa8a..0000000 --- a/debian/patches/27_is_hostname.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 27_is_hostname.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@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;