From 6d1c1453ac23858cc57dd01f0c6db9d8f24c3de3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pawe=C5=82=20Sikora?= <pluto@pld-linux.org>
Date: Sat, 6 Nov 2010 14:32:31 +0000
Subject: [PATCH] - fix rare gpf in blazer_status() parser, release 2.

Changed files:
    nut-blazer-parser.patch -> 1.1
    nut.spec -> 1.158
---
 nut-blazer-parser.patch | 14 ++++++++++++++
 nut.spec                |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 nut-blazer-parser.patch

diff --git a/nut-blazer-parser.patch b/nut-blazer-parser.patch
new file mode 100644
index 0000000..654ac44
--- /dev/null
+++ b/nut-blazer-parser.patch
@@ -0,0 +1,14 @@
+--- nut-2.4.3/drivers/blazer.c.orig	2010-02-11 22:43:23.000000000 +0100
++++ nut-2.4.3/drivers/blazer.c	2010-11-05 18:48:21.171067449 +0100
+@@ -211,6 +211,11 @@
+ 		dstate_setinfo(status[i].var, status[i].fmt, status[i].conv(val, NULL));
+ 	}
+ 
++	if (!val) {
++		upsdebugx(2, "%s: parsing failed", __func__);
++		return -1;
++	}
++
+ 	if (strspn(val, "01") != 8) {
+ 		upsdebugx(2, "Invalid status [%s]", val);
+ 		return -1;
diff --git a/nut.spec b/nut.spec
index 31e516d..e7b3d90 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,7 +13,7 @@ Summary:	Network UPS Tools
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.4.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.networkupstools.org/source/2.4/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Patch2:		%{name}-smartdp-load.patch
 Patch3:		%{name}-upssched-cmd-sysconf.patch
 Patch4:		%{name}-hal-paths.patch
 Patch5:		%{name}-matrix.patch
+Patch6:		%{name}-blazer-parser.patch
 URL:		http://www.networkupstools.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -192,6 +193,7 @@ Pliki do integracji NUT-a z HAL-em.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
-- 
2.44.0