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

update to nut-2.7.1

Browse Source
This commit is contained in:
sthen 2014-01-07 21:55:54 +00:00
parent 65ee3daecf
commit 4aa281acdf
11 changed files with 78 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysutils/nut/Makefile
View File

@ -1,22 +1,20 @@
# $OpenBSD: Makefile,v 1.73 2013/07/18 07:58:12 sthen Exp $
# $OpenBSD: Makefile,v 1.74 2014/01/07 21:55:54 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.5
REVISION-main= 3
REVISION-cgi= 1
REVISION-xml= 1
DISTNAME= nut-2.7.1
PKGNAME-main= ${DISTNAME}
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}
PKGNAME-xml= ${DISTNAME:S/-/-xml-/}
SHARED_LIBS += upsclient 2.0 # 2.0
SHARED_LIBS += nutscan 1.0 # 1.0
SHARED_LIBS += upsclient 2.0 # .3.1
SHARED_LIBS += nutclient 0.0 # .0.0
SHARED_LIBS += nutscan 1.0 # .1.0
CATEGORIES= sysutils
HOMEPAGE= http://www.networkupstools.org/
@ -27,14 +25,14 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
COMMON += c crypto pthread
WANTLIB-main += ${COMMON} ltdl m ssl usb usb-1.0 wrap
WANTLIB-main += ${COMMON} ltdl m ssl stdc++ usb usb-1.0 wrap
WANTLIB-xml += ${COMMON} ${MODGETTEXT_WANTLIB} asn1 expat gssapi krb5 neon ssl z proxy
WANTLIB-xml += com_err heimbase roken wind
WANTLIB-cgi += ${COMMON} ${MODGETTEXT_WANTLIB} X11 expat fontconfig
WANTLIB-cgi += freetype gd jpeg m png ssl upsclient xcb z
WANTLIB-snmp += ${COMMON} m netsnmp
MASTER_SITES= ${HOMEPAGE}source/2.6/
MASTER_SITES= ${HOMEPAGE}source/2.7/
MODULES= devel/gettext \
lang/python
@ -81,8 +79,7 @@ CONFIGURE_ARGS+= --without-neon
MULTI_PACKAGES+= -xml
.endif
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
devel/libtool,-ltdl \
LIB_DEPENDS-main= devel/libtool,-ltdl \
devel/libusb-compat
RUN_DEPENDS-main= # empty

4
sysutils/nut/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nut-2.6.5.tar.gz) = YY33HPHKbjcA0dPCgnc6LeyF+fIDJMDTI0yCTpf+uT8=
SIZE (nut-2.6.5.tar.gz) = 2038832
SHA256 (nut-2.7.1.tar.gz) = cabXOtbZEICBJrp/IX7BFCoMZwnGOiKgmecziWCyx5g=
SIZE (nut-2.7.1.tar.gz) = 2259721

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

@ -1,7 +1,7 @@
$OpenBSD: patch-clients_Makefile_in,v 1.17 2012/08/09 12:05:16 sthen Exp $
--- clients/Makefile.in.orig Wed Aug 8 20:35:50 2012
+++ clients/Makefile.in Thu Aug 9 01:35:52 2012
@@ -391,10 +391,12 @@ upsmon_SOURCES = upsmon.c upsmon.h upsclient.h
$OpenBSD: patch-clients_Makefile_in,v 1.18 2014/01/07 21:55:54 sthen Exp $
--- clients/Makefile.in.orig Wed Nov 20 19:55:13 2013
+++ clients/Makefile.in Thu Nov 21 22:08:48 2013
@@ -437,10 +437,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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.20 2012/08/09 12:05:16 sthen Exp $
--- configure.orig Wed Aug 8 20:35:49 2012
+++ configure Thu Aug 9 01:35:52 2012
@@ -10446,7 +10446,8 @@ if test -z "${nut_have_libwrap_seen}"; then
$OpenBSD: patch-configure,v 1.21 2014/01/07 21:55:54 sthen Exp $
--- configure.orig Wed Nov 20 19:55:12 2013
+++ configure Thu Nov 21 22:08:48 2013
@@ -10761,7 +10761,8 @@ if test -z "${nut_have_libwrap_seen}"; then
for ac_header in tcpd.h
do :
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.20 2012/08/09 12:05:16 sthen Exp $
"
if test "x$ac_cv_header_tcpd_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
@@ -10545,6 +10546,7 @@ else
@@ -10860,6 +10861,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-drivers_blazer_usb_c,v 1.5 2012/08/09 12:05:16 sthen Exp $
--- drivers/blazer_usb.c.orig Tue Jul 31 18:38:59 2012
+++ drivers/blazer_usb.c Thu Aug 9 01:35:52 2012
@@ -439,7 +439,9 @@ int blazer_command(const char *cmd, char *buf, size_t
$OpenBSD: patch-drivers_blazer_usb_c,v 1.6 2014/01/07 21:55:54 sthen Exp $
--- drivers/blazer_usb.c.orig Sun Nov 17 19:27:38 2013
+++ drivers/blazer_usb.c Thu Nov 21 22:08:48 2013
@@ -443,7 +443,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 */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-drivers_libusb_c,v 1.1 2010/03/31 22:11:11 sthen Exp $
--- drivers/libusb.c.orig Sat Mar 20 23:31:09 2010
+++ drivers/libusb.c Sat Mar 20 23:31:21 2010
@@ -376,7 +376,9 @@ static int libusb_strerror(const int ret, const char *
$OpenBSD: patch-drivers_libusb_c,v 1.2 2014/01/07 21:55:54 sthen Exp $
--- drivers/libusb.c.orig Wed Jul 31 21:41:31 2013
+++ drivers/libusb.c Thu Nov 21 22:08:48 2013
@@ -375,7 +375,9 @@ static int libusb_strerror(const int ret, const char *
return 0;
case -EOVERFLOW: /* Value too large for defined data type */

13
sysutils/nut/patches/patch-drivers_nutdrv_qx_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-drivers_nutdrv_qx_c,v 1.1 2014/01/07 21:55:54 sthen Exp $
--- drivers/nutdrv_qx.c.orig Fri Nov 22 09:45:50 2013
+++ drivers/nutdrv_qx.c Fri Nov 22 09:46:00 2013
@@ -1759,7 +1759,9 @@ static int qx_command(const char *cmd, char *buf, size
case -ETIMEDOUT: /* Connection timed out */
case -EOVERFLOW: /* Value too large for defined data type */
+#ifdef EPROTO
case -EPROTO: /* Protocol error */
+#endif
default:
break;
}

13
sysutils/nut/patches/patch-drivers_riello_usb_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-drivers_riello_usb_c,v 1.1 2014/01/07 21:55:54 sthen Exp $
--- drivers/riello_usb.c.orig Fri Nov 22 09:45:50 2013
+++ drivers/riello_usb.c Fri Nov 22 09:46:07 2013
@@ -355,7 +355,9 @@ int riello_command(uint8_t *cmd, uint8_t *buf, uint16_
case -ETIMEDOUT: /* Connection timed out */
case -EOVERFLOW: /* Value too large for defined data type */
+#ifdef EPROTO
case -EPROTO: /* Protocol error */
+#endif
default:
break;
}

10
sysutils/nut/patches/patch-drivers_usbhid-ups_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-drivers_usbhid-ups_c,v 1.5 2012/08/09 12:05:16 sthen Exp $
--- drivers/usbhid-ups.c.orig Tue Jul 31 18:38:59 2012
+++ drivers/usbhid-ups.c Thu Aug 9 01:35:52 2012
@@ -933,7 +933,7 @@ void upsdrv_initups(void)
$OpenBSD: patch-drivers_usbhid-ups_c,v 1.6 2014/01/07 21:55:54 sthen Exp $
--- drivers/usbhid-ups.c.orig Fri Jul 26 20:41:10 2013
+++ drivers/usbhid-ups.c Thu Nov 21 22:08:48 2013
@@ -941,7 +941,7 @@ void upsdrv_initups(void)
regular expression (USB) or device_path (SHUT) */
ret = comm_driver->open(&udev, &curDevice, subdriver_matcher, &callback);
if (ret < 1)
@ -10,7 +10,7 @@ $OpenBSD: patch-drivers_usbhid-ups_c,v 1.5 2012/08/09 12:05:16 sthen Exp $
hd = &curDevice;
@@ -1261,7 +1261,9 @@ static bool_t hid_ups_walk(walkmode_t mode)
@@ -1269,7 +1269,9 @@ static bool_t hid_ups_walk(walkmode_t mode)
case -ETIMEDOUT: /* Connection timed out */
case -EOVERFLOW: /* Value too large for defined data type */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-include_common_h,v 1.5 2008/01/30 20:55:59 mbalmer Exp $
--- include/common.h.orig Sun May 27 16:07:56 2007
+++ include/common.h Wed Aug 1 12:59:20 2007
@@ -82,6 +82,9 @@ void syslogbit_set(void);
$OpenBSD: patch-include_common_h,v 1.6 2014/01/07 21:55:54 sthen Exp $
--- include/common.h.orig Wed Nov 20 19:53:31 2013
+++ include/common.h Thu Nov 21 22:08:48 2013
@@ -88,6 +88,9 @@ void syslogbit_set(void);
/* Return the default path for the directory containing configuration files */
const char * confpath(void);

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.18 2012/08/09 12:05:16 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.19 2014/01/07 21:55:54 sthen Exp $
@conflict nut-<2.6.2p0
@conflict nut-scanner-*
@conflict upsd-*
@ -9,8 +9,10 @@
@pkgpath sysutils/nut,no_cgi,snmp
@newgroup ${NUT_USER}:${NUT_ID}
@newuser ${NUT_USER}:${NUT_ID}:${NUT_ID}:daemon:UPS User:/var/empty:/sbin/nologin
@bin bin/al175
@bin bin/apcsmart
@bin bin/apcsmart-old
@bin bin/apcupsd-ups
@bin bin/bcmxcp
@bin bin/bcmxcp_usb
@bin bin/belkin
@ -38,6 +40,7 @@
@bin bin/mge-utalk
@bin bin/microdowell
@bin bin/nut-scanner
@bin bin/nutdrv_qx
@bin bin/oldmge-shut
@bin bin/oneac
@bin bin/optiups
@ -45,6 +48,8 @@
@bin bin/powerpanel
@bin bin/rhino
@bin bin/richcomm_usb
@bin bin/riello_ser
@bin bin/riello_usb
@bin bin/safenet
@bin bin/skel
@bin bin/solis
@ -65,6 +70,9 @@ bin/upssched-cmd
@comment html/header.html
@comment html/index.html
html/nut-banner.png
lib/libnutclient.a
lib/libnutclient.la
@lib lib/libnutclient.so.${LIBnutclient_VERSION}
lib/libnutscan.a
lib/libnutscan.la
@lib lib/libnutscan.so.${LIBnutscan_VERSION}
@ -80,8 +88,10 @@ lib/libupsclient.la
@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-old.8
@man man/man8/apcsmart.8
@man man/man8/apcupsd-ups.8
@man man/man8/bcmxcp.8
@man man/man8/bcmxcp_usb.8
@man man/man8/belkin.8
@ -90,7 +100,8 @@ lib/libupsclient.la
@man man/man8/bestfortress.8
@man man/man8/bestuferrups.8
@man man/man8/bestups.8
@man man/man8/blazer.8
@man man/man8/blazer_ser.8
@man man/man8/blazer_usb.8
@man man/man8/clone.8
@man man/man8/dummy-ups.8
@man man/man8/etapro.8
@ -108,6 +119,7 @@ lib/libupsclient.la
@man man/man8/microdowell.8
@man man/man8/nut-recorder.8
@man man/man8/nut-scanner.8
@man man/man8/nutdrv_qx.8
@man man/man8/nutupsdrv.8
@man man/man8/oneac.8
@man man/man8/optiups.8
@ -115,6 +127,8 @@ lib/libupsclient.la
@man man/man8/powerpanel.8
@man man/man8/rhino.8
@man man/man8/richcomm_usb.8
@man man/man8/riello_ser.8
@man man/man8/riello_usb.8
@man man/man8/safenet.8
@man man/man8/solis.8
@man man/man8/tripplite.8