Author: pluto Date: Sat Nov 6 14:32:36 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix rare gpf in blazer_status() parser, release 2.
---- Files affected: packages/nut: nut.spec (1.157 -> 1.158) , nut-blazer-parser.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nut/nut.spec diff -u packages/nut/nut.spec:1.157 packages/nut/nut.spec:1.158 --- packages/nut/nut.spec:1.157 Thu Jul 15 09:57:28 2010 +++ packages/nut/nut.spec Sat Nov 6 15:32:31 2010 @@ -14,7 +14,7 @@ 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 @@ -29,6 +29,7 @@ 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 @@ -193,6 +194,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build cp -f /usr/share/automake/config.sub . @@ -470,6 +472,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.158 2010/11/06 14:32:31 pluto +- fix rare gpf in blazer_status() parser, release 2. + Revision 1.157 2010/07/15 07:57:28 arekm - up to 2.4.3 ================================================================ Index: packages/nut/nut-blazer-parser.patch diff -u /dev/null packages/nut/nut-blazer-parser.patch:1.1 --- /dev/null Sat Nov 6 15:32:36 2010 +++ packages/nut/nut-blazer-parser.patch Sat Nov 6 15:32:31 2010 @@ -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; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut.spec?r1=1.157&r2=1.158&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
