cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.4.1, code cleanup and adds support for a bunch of new

Browse Source 
UPS and also now preliminary support for PDUs.

ok mbalmer (maintainer),
"commit and we fix in-tree if i run into issues" henning
This commit is contained in:
sthen 2009-04-03 15:40:12 +00:00
parent 8fb594a5c5
commit 94f09986bc
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysutils/nut/Makefile
View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.30 2008/11/13 13:15:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2009/04/03 15:40:12 sthen Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
COMMENT-snmp= driver for monitoring UPSs via SNMP
DISTNAME= nut-2.2.2
PKGNAME-main= ${DISTNAME}p1
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}p1
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}p0
DISTNAME= nut-2.4.1
PKGNAME-main= ${DISTNAME}
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}
CATEGORIES= sysutils
HOMEPAGE= http://www.networkupstools.org/
SHARED_LIBS+= upsclient 0.0
SHARED_LIBS+= upsclient 1.0
MAINTAINER= Marc Balmer <mbalmer@openbsd.org>
MASTER_SITES= ${HOMEPAGE}source/2.2/
MASTER_SITES= ${HOMEPAGE}source/2.4/
# GPL
# GPLv2+, some scripts (not packaged) are GPLv3+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

10
sysutils/nut/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nut-2.2.2.tar.gz) = Z3qEqD6b57yTYQQT7mljdQ==
RMD160 (nut-2.2.2.tar.gz) = TcHStyn8DgLAR1AIxEvGLhkB9wU=
SHA1 (nut-2.2.2.tar.gz) = 9UzJCbIpkx+5G0o2DwRHtTnU6ms=
SHA256 (nut-2.2.2.tar.gz) = WZ0AJLzBFhN6PrZQMNPbxxMqZPMKdxf3aoJU2FQ0Ius=
SIZE (nut-2.2.2.tar.gz) = 1184406
MD5 (nut-2.4.1.tar.gz) = YJ668hI/xxcdJabHQt19Zg==
RMD160 (nut-2.4.1.tar.gz) = 0EanEfuPlLGjZS3qd00gFoQpInI=
SHA1 (nut-2.4.1.tar.gz) = yOmZ2nGM/hQhGXfBndmwVc/G+to=
SHA256 (nut-2.4.1.tar.gz) = niRB4acEZidxXP544i+C97sFvzgHNfgDcxtk4GvRnzw=
SIZE (nut-2.4.1.tar.gz) = 1121152

10
sysutils/nut/patches/patch-clients_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-clients_Makefile_in,v 1.9 2008/09/27 17:30:08 martynas Exp $
--- clients/Makefile.in.orig Wed May 7 12:29:26 2008
+++ clients/Makefile.in Sat Sep 27 15:40:08 2008
@@ -329,10 +329,12 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
$OpenBSD: patch-clients_Makefile_in,v 1.10 2009/04/03 15:40:12 sthen Exp $
--- clients/Makefile.in.orig Tue Feb 17 09:24:09 2009
+++ clients/Makefile.in Wed Mar 18 21:27:43 2009
@@ -342,10 +342,12 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
upssched_SOURCES = upssched.c upssched.h
upssched_LDADD = ../common/libcommon.a $(NETLIBS) ../common/parseconf.o
upssched_LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS)
upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h
-upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS)
+upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS) -all-static

8
sysutils/nut/patches/patch-clients_upsset_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-clients_upsset_c,v 1.7 2008/09/08 19:38:30 martynas Exp $
--- clients/upsset.c.orig Fri Feb 22 21:21:11 2008
+++ clients/upsset.c Wed Aug 27 17:18:49 2008
$OpenBSD: patch-clients_upsset_c,v 1.8 2009/04/03 15:40:12 sthen Exp $
--- clients/upsset.c.orig Tue Feb 17 09:20:43 2009
+++ clients/upsset.c Wed Mar 18 21:27:43 2009
@@ -192,7 +192,7 @@ static void do_pickups(const char *currfunc)
char hostfn[SMALLBUF];
PCONF_CTX_t ctx;
@ -10,7 +10,7 @@ $OpenBSD: patch-clients_upsset_c,v 1.7 2008/09/08 19:38:30 martynas Exp $
printf("<FORM METHOD=\"POST\" ACTION=\"upsset.cgi\">\n");
@@ -990,7 +990,7 @@ static void check_conf(void)
@@ -981,7 +981,7 @@ static void check_conf(void)
char fn[SMALLBUF];
PCONF_CTX_t ctx;

10
sysutils/nut/patches/patch-clients_upsstats_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clients_upsstats_c,v 1.6 2008/09/08 19:38:30 martynas Exp $
--- clients/upsstats.c.orig Fri Feb 22 21:21:11 2008
+++ clients/upsstats.c Wed Aug 27 17:18:49 2008
@@ -825,7 +825,7 @@ static void display_template(const char *tfn)
$OpenBSD: patch-clients_upsstats_c,v 1.7 2009/04/03 15:40:12 sthen Exp $
--- clients/upsstats.c.orig Tue Feb 17 09:20:43 2009
+++ clients/upsstats.c Wed Mar 18 21:27:43 2009
@@ -835,7 +835,7 @@ static void display_template(const char *tfn)
{
char fn[SMALLBUF], buf[LARGEBUF];
@ -10,7 +10,7 @@ $OpenBSD: patch-clients_upsstats_c,v 1.6 2008/09/08 19:38:30 martynas Exp $
tf = fopen(fn, "r");
@@ -957,7 +957,7 @@ static void load_hosts_conf(void)
@@ -955,7 +955,7 @@ static void load_hosts_conf(void)
char fn[SMALLBUF];
PCONF_CTX_t ctx;

8
sysutils/nut/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2008/09/08 19:38:30 martynas Exp $
--- configure.orig Wed May 7 12:29:25 2008
+++ configure Wed Aug 27 17:18:49 2008
@@ -10326,7 +10326,7 @@ cat >>conftest.$ac_ext <<_ACEOF
$OpenBSD: patch-configure,v 1.12 2009/04/03 15:40:12 sthen Exp $
--- configure.orig Tue Feb 17 09:23:51 2009
+++ configure Wed Mar 18 21:27:43 2009
@@ -10506,7 +10506,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <openssl/ssl.h>
int

16
sysutils/nut/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2008/09/08 19:38:30 martynas Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2009/04/03 15:40:12 sthen Exp $
@conflict upsd-*
@pkgpath sysutils/nut
@pkgpath sysutils/nut,no_cgi
@ -6,7 +6,6 @@
@pkgpath sysutils/nut,no_cgi,snmp
@newuser ${NUT_USER}:${NUT_ID}:::UPS User:/var/empty:/sbin/nologin
%%SHARED%%
@bin bin/al175
@bin bin/apcsmart
@bin bin/bcmxcp
@bin bin/bcmxcp_usb
@ -15,7 +14,8 @@
@bin bin/bestfcom
@bin bin/bestuferrups
@bin bin/bestups
@bin bin/cpsups
@bin bin/blazer_ser
@bin bin/blazer_usb
@bin bin/cyberpower
@bin bin/dummy-ups
@bin bin/etapro
@ -30,14 +30,15 @@
@bin bin/metasys
@bin bin/mge-shut
@bin bin/mge-utalk
@bin bin/microdowell
@bin bin/netxml-ups
@bin bin/newmge-shut
@bin bin/nitram
@bin bin/oneac
@bin bin/optiups
@bin bin/powercom
@bin bin/powerpanel
@bin bin/rhino
@bin bin/richcomm_usb
@bin bin/safenet
@bin bin/skel
@bin bin/solis
@ -69,7 +70,6 @@ lib/pkgconfig/
@man man/man5/upssched.conf.5
@man man/man5/upsset.conf.5
@man man/man5/upsstats.html.5
@man man/man8/al175.8
@man man/man8/apcsmart.8
@man man/man8/bcmxcp.8
@man man/man8/bcmxcp_usb.8
@ -78,7 +78,7 @@ lib/pkgconfig/
@man man/man8/bestfcom.8
@man man/man8/bestuferrups.8
@man man/man8/bestups.8
@man man/man8/cpsups.8
@man man/man8/blazer.8
@man man/man8/cyberpower.8
@man man/man8/dummy-ups.8
@man man/man8/etapro.8
@ -93,14 +93,15 @@ lib/pkgconfig/
@man man/man8/metasys.8
@man man/man8/mge-shut.8
@man man/man8/mge-utalk.8
@man man/man8/microdowell.8
@man man/man8/netxml-ups.8
@man man/man8/nitram.8
@man man/man8/nutupsdrv.8
@man man/man8/oneac.8
@man man/man8/optiups.8
@man man/man8/powercom.8
@man man/man8/powerpanel.8
@man man/man8/rhino.8
@man man/man8/richcomm_usb.8
@man man/man8/safenet.8
@man man/man8/solis.8
@man man/man8/tripplite.8
@ -130,7 +131,6 @@ share/doc/nut/Makefile.am
share/doc/nut/Makefile.in
share/doc/nut/README
share/doc/nut/acpi.txt
share/doc/nut/al175-vars.txt
share/doc/nut/big-servers.txt
share/doc/nut/cables/
share/doc/nut/cables/apc-rs500-serial.txt