update NUT to 2.6.1; bugfixes, cleanup, improvements and new device support.

This commit is contained in:
sthen 2011-06-02 10:37:08 +00:00
parent 9478051482
commit 35ac303ec8
6 changed files with 22 additions and 23 deletions

View File

@ -1,14 +1,11 @@
# $OpenBSD: Makefile,v 1.45 2011/03/09 23:32:20 sthen Exp $
# $OpenBSD: Makefile,v 1.46 2011/06/02 10:37:08 sthen Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
COMMENT-snmp= driver for monitoring UPS via SNMP
COMMENT-xml= driver for monitoring UPS via XML/HTTP
DISTNAME= nut-2.6.0
REVISION-main= 1
REVISION-snmp= 0
REVISION-cgi= 0
DISTNAME= nut-2.6.1
PKGNAME-main= ${DISTNAME}
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}

View File

@ -1,5 +1,5 @@
MD5 (nut-2.6.0.tar.gz) = Icr4KzTs1Gt4gcKxgj9eQQ==
RMD160 (nut-2.6.0.tar.gz) = 1C74Luw+5A+oQdkr9ADH9265zf4=
SHA1 (nut-2.6.0.tar.gz) = SreyIPUKCIpl5ZgxwhenvnFKGYw=
SHA256 (nut-2.6.0.tar.gz) = /rqiMLa18K0n14CFEEdSfTbIx6NOVXs4MtbVUXTXoNU=
SIZE (nut-2.6.0.tar.gz) = 1703273
MD5 (nut-2.6.1.tar.gz) = ieZAUnLMgsU9e4QWCUV2Gw==
RMD160 (nut-2.6.1.tar.gz) = /FxsMCj5orQWFdITvqEbXedzWEA=
SHA1 (nut-2.6.1.tar.gz) = gZg3glljG1DSPGzlpS7w5AEysz8=
SHA256 (nut-2.6.1.tar.gz) = 9cRrhWwM9bfw5LItgrZwr2TMmHF6kOqshyPdQCoYHAA=
SIZE (nut-2.6.1.tar.gz) = 1776645

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clients_Makefile_in,v 1.12 2011/03/09 11:00:55 sthen Exp $
--- clients/Makefile.in.orig Fri Jan 14 19:59:12 2011
+++ clients/Makefile.in Sat Feb 26 14:37:36 2011
@@ -364,10 +364,12 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
$OpenBSD: patch-clients_Makefile_in,v 1.13 2011/06/02 10:37:08 sthen Exp $
--- clients/Makefile.in.orig Wed Jun 1 13:00:01 2011
+++ clients/Makefile.in Thu Jun 2 09:20:57 2011
@@ -363,10 +363,12 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
upssched_SOURCES = upssched.c upssched.h
upssched_LDADD = ../common/libcommon.la ../common/libparseconf.la $(NETLIBS)
upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.14 2011/03/09 11:00:55 sthen Exp $
--- configure.orig Fri Jan 14 20:44:37 2011
+++ configure Sat Feb 26 14:37:36 2011
@@ -11540,7 +11540,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
$OpenBSD: patch-configure,v 1.15 2011/06/02 10:37:08 sthen Exp $
--- configure.orig Wed Jun 1 13:00:00 2011
+++ configure Thu Jun 2 09:20:58 2011
@@ -11505,7 +11505,7 @@ else
/* end confdefs.h. */
int

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-drivers_blazer_usb_c,v 1.1 2010/03/31 22:11:11 sthen Exp $
--- drivers/blazer_usb.c.orig Sat Mar 20 23:31:35 2010
+++ drivers/blazer_usb.c Sat Mar 20 23:31:48 2010
@@ -387,7 +387,9 @@ int blazer_command(const char *cmd, char *buf, size_t
$OpenBSD: patch-drivers_blazer_usb_c,v 1.2 2011/06/02 10:37:08 sthen Exp $
--- drivers/blazer_usb.c.orig Tue May 31 11:36:49 2011
+++ drivers/blazer_usb.c Thu Jun 2 09:20:58 2011
@@ -396,7 +396,9 @@ int blazer_command(const char *cmd, char *buf, size_t
case -ETIMEDOUT: /* Connection timed out */
case -EOVERFLOW: /* Value too large for defined data type */

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.9 2011/03/09 23:32:20 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.10 2011/06/02 10:37:08 sthen Exp $
@conflict upsd-*
@pkgpath sysutils/nut
@pkgpath sysutils/nut,no_cgi
@ -133,6 +133,8 @@ share/doc/nut/COPYING
share/doc/nut/ChangeLog
share/doc/nut/FAQ.html
share/doc/nut/INSTALL
share/doc/nut/LICENSE-GPL2
share/doc/nut/LICENSE-GPL3
share/doc/nut/MAINTAINERS
share/doc/nut/NEWS
share/doc/nut/README