pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/37301: Patch to update sysutils/ups-nut to 2.2.0
>Number: 37301
>Category: pkg
>Synopsis: Updates sysutils/ups-nut to 2.2.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Nov 08 06:45:00 +0000 2007
>Originator: Jason White
>Release: NetBSD 3.1
>Organization:
Jason White <jdw-pkgsrc%menelos.com@localhost> Jabber: jdwhite(jabber.org)
http://jdwhite.menelos.com/ jason.d.white(gmail.com)
PGP KeyID: 0x5290E477
>Environment:
System: NetBSD bender.menelos.com 3.1 NetBSD 3.1 (BENDER_XEN2_DOMU) #0: Sat Nov
18 20:00:43 CST 2006 root@smeghead:/usr/obj/i386/BENDER_XEN2_DOMU i386
Architecture: i386
Machine: i386
>Description:
Included patch updates package sysutils/ups-nut from 2.0.4 -> 2.2.0.
This will also deprecate the following packages:
sysutils/ups-nut-cgi
sysutils/ups-nut-snmp
sysutils/ups-nut-usb
Version 2.2.0 no longer contains individual build and install targets for
cgi/snmp/usb. Instead, this functionality is now enabled via configure
arguments. Because of this, I've added package options for each of these
three features, but none are enabled by default.
Also included in the patch is an 'options.description' file for inclusion
into the global file.
Changelog: http://www.networkupstools.org/source/2.2/ChangeLog
--
Only in ups-nut: .cvsignore
Common subdirectories: ups-nut.orig/CVS and ups-nut/CVS
diff -u ups-nut.orig/DESCR ups-nut/DESCR
--- ups-nut.orig/DESCR 2006-05-12 23:13:26.000000000 -0500
+++ ups-nut/DESCR 2007-11-07 20:55:49.000000000 -0600
@@ -1,5 +1,7 @@
-This is a developing project to monitor a large assortment of UPS hardware.
+The primary goal of the Network UPS Tools (NUT) project is to provide
+reliable monitoring of UPS hardware and ensure safe shutdowns of the
+systems which are connected.
+
Network communications are used so that multiple systems can monitor a
single physical UPS and shut down together if necessary without any
-special "sharing hardware" on the UPS itself. CGI scripts are in the
-ups-nut-cgi package.
+special "sharing hardware" on the UPS itself.
diff -u ups-nut.orig/MESSAGE ups-nut/MESSAGE
--- ups-nut.orig/MESSAGE 2006-05-12 23:13:26.000000000 -0500
+++ ups-nut/MESSAGE 2007-11-06 22:38:08.000000000 -0600
@@ -5,4 +5,8 @@
If upgrading from a prior version, refer to
${NUT_DOCDIR}/UPGRADING for more information.
+ Driver changes occurred in version 2.2.
+ If upgrading from a prior version, refer to
+ ${NUT_DOCDIR}/UPGRADING for more information.
+
===========================================================================
diff -u ups-nut.orig/Makefile ups-nut/Makefile
--- ups-nut.orig/Makefile 2007-07-05 05:20:01.000000000 -0500
+++ ups-nut/Makefile 2007-11-08 00:22:49.000000000 -0600
@@ -1,10 +1,34 @@
# $NetBSD: Makefile,v 1.48 2007/07/04 20:55:01 jlam Exp $
-.include "Makefile.common"
-
+DISTNAME= nut-2.2.0
PKGNAME= ups-${DISTNAME}
+CATEGORIES= sysutils
+MASTER_SITES= http://www.networkupstools.org/source/2.2/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.networkupstools.org/
COMMENT= Network UPS Tools
+.include "options.mk"
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake
+PLIST_SRC+= ${.CURDIR}/PLIST
+CHECK_PORTABILITY_SKIP+= packaging/mandriva/upsmon
+
+PKG_SYSCONFSUBDIR?= nut
+NUT_CONFDIR= ${PKG_SYSCONFDIR}
+NUT_DATADIR= ${PREFIX}/share/nut
+NUT_DOCDIR= ${PREFIX}/share/doc/nut
+NUT_DRVDIR= ${PREFIX}/libexec/nut
+NUT_EGDIR= ${PREFIX}/share/examples/nut
+NUT_STATEDIR?= ${VARBASE}/db/nut
+NUT_CGIDIR= ${PREFIX}/libexec/cgi-bin/nut
+
+CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR:Q}
+CONFIGURE_ARGS+= --datadir=${NUT_DATADIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+= --with-statepath=${NUT_STATEDIR:Q}
CONFIGURE_ARGS+= --with-user=${NUT_USER:Q}
CONFIGURE_ARGS+= --with-group=${NUT_GROUP:Q}
CONFIGURE_ARGS+= --with-drvpath=${NUT_DRVDIR:Q}
@@ -17,6 +41,7 @@
PKG_GROUPS_VARS+= NUT_GROUP
PKG_USERS_VARS+= NUT_USER
BUILD_DEFS+= NUT_STATEDIR
+BUILD_DEFS+= VARBASE
FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q}
FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR:Q}
@@ -31,35 +56,35 @@
PKG_HOME.${NUT_USER}= ${NUT_STATEDIR}
PKG_SHELL.${NUT_USER}= ${SH}
-CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
-CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \
- ${NUT_CONFDIR}/upssched.conf
-
-CONF_FILES_PERMS= ${NUT_EGDIR}/upsd.conf.sample \
+CONF_FILES+= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
+CONF_FILES_PERMS+= ${NUT_EGDIR}/upssched.conf.sample \
+ ${NUT_CONFDIR}/upssched.conf \
+ ${ROOT_USER} ${NUT_GROUP} 0640
+CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.conf.sample \
${NUT_CONFDIR}/upsd.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${ROOT_USER} ${NUT_GROUP} 0640
CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.users.sample \
${NUT_CONFDIR}/upsd.users \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${ROOT_USER} ${NUT_GROUP} 0640
CONF_FILES_PERMS+= ${NUT_EGDIR}/upsmon.conf.sample \
${NUT_CONFDIR}/upsmon.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${ROOT_USER} ${NUT_GROUP} 0640
RCD_SCRIPTS= ups upsd upsdriver upslog upsmon
OWN_DIRS= ${NUT_CONFDIR}
OWN_DIRS_PERMS= ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770
pre-install:
- ${MKDIR} ${NUT_STATEDIR}
- ${MKDIR} ${NUT_DRVDIR}
- ${CHOWN} ${NUT_USER} ${NUT_STATEDIR}
+ mkdir ${NUT_STATEDIR}
+ mkdir ${NUT_DRVDIR}
+ chown ${NUT_USER} ${NUT_STATEDIR}
${INSTALL_DATA_DIR} ${NUT_EGDIR}
post-install:
${INSTALL_DATA_DIR} ${NUT_DOCDIR}
${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables
${INSTALL_DATA_DIR} ${NUT_DOCDIR}/drivers
- for f in CHANGES COPYING CREDITS NEWS README INSTALL UPGRADING; do \
+ for f in AUTHORS COPYING INSTALL MAINTAINERS NEWS README UPGRADING; do \
${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \
done
${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
Only in ups-nut.orig/: Makefile.common
diff -u ups-nut.orig/PLIST ups-nut/PLIST
--- ups-nut.orig/PLIST 2006-08-16 04:42:43.000000000 -0500
+++ ups-nut/PLIST 2007-11-07 02:56:01.000000000 -0600
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.20 2006/08/15 12:26:07 ghen Exp $
+@comment $NetBSD$
bin/upsc
bin/upscmd
bin/upslog
bin/upsrw
+bin/upssched-cmd
+libexec/nut/al175
libexec/nut/apcsmart
libexec/nut/bcmxcp
libexec/nut/belkin
@@ -10,16 +12,13 @@
libexec/nut/bestfcom
libexec/nut/bestuferrups
libexec/nut/bestups
-libexec/nut/blazer
libexec/nut/cpsups
libexec/nut/cyberpower
-libexec/nut/esupssmart
+libexec/nut/dummy-ups
libexec/nut/etapro
libexec/nut/everups
-libexec/nut/fentonups
libexec/nut/gamatronic
libexec/nut/genericups
-libexec/nut/ippon
libexec/nut/isbmex
libexec/nut/liebert
libexec/nut/masterguard
@@ -27,13 +26,15 @@
libexec/nut/metasys
libexec/nut/mge-shut
libexec/nut/mge-utalk
-libexec/nut/mustek
+libexec/nut/newmge-shut
+libexec/nut/nitram
libexec/nut/oneac
+libexec/nut/optiups
libexec/nut/powercom
-libexec/nut/powermust
+libexec/nut/powerpanel
libexec/nut/rhino
libexec/nut/safenet
-libexec/nut/sms
+libexec/nut/skel
libexec/nut/solis
libexec/nut/tripplite
libexec/nut/tripplitesu
@@ -45,6 +46,7 @@
man/man5/upsd.users.5
man/man5/upsmon.conf.5
man/man5/upssched.conf.5
+man/man8/al175.8
man/man8/apcsmart.8
man/man8/bcmxcp.8
man/man8/belkin.8
@@ -54,25 +56,26 @@
man/man8/bestups.8
man/man8/cpsups.8
man/man8/cyberpower.8
+man/man8/dummy-ups.8
man/man8/etapro.8
man/man8/everups.8
-man/man8/fentonups.8
man/man8/gamatronic.8
man/man8/genericups.8
-man/man8/ippon.8
man/man8/isbmex.8
man/man8/liebert.8
man/man8/masterguard.8
+man/man8/megatec.8
man/man8/metasys.8
man/man8/mge-shut.8
man/man8/mge-utalk.8
-man/man8/mustek.8
+man/man8/nitram.8
man/man8/nutupsdrv.8
man/man8/oneac.8
+man/man8/optiups.8
man/man8/powercom.8
-man/man8/powermust.8
+man/man8/powerpanel.8
+man/man8/rhino.8
man/man8/safenet.8
-man/man8/sms.8
man/man8/solis.8
man/man8/tripplite.8
man/man8/tripplitesu.8
@@ -89,14 +92,16 @@
sbin/upsd
sbin/upsmon
sbin/upssched
-share/doc/nut/CHANGES
+share/doc/nut/AUTHORS
share/doc/nut/COPYING
-share/doc/nut/CREDITS
share/doc/nut/FAQ
share/doc/nut/INSTALL
+share/doc/nut/MAINTAINERS
share/doc/nut/NEWS
share/doc/nut/README
share/doc/nut/UPGRADING
+share/doc/nut/acpi.txt
+share/doc/nut/al175-vars.txt
share/doc/nut/big-servers.txt
share/doc/nut/cables/apc-rs500-serial.txt
share/doc/nut/cables/apc.txt
@@ -117,9 +122,11 @@
share/doc/nut/driver.list
share/doc/nut/hid-subdrivers.txt
share/doc/nut/ideas.txt
+share/doc/nut/macros.txt
share/doc/nut/megatec.txt
share/doc/nut/new-drivers.txt
share/doc/nut/new-names.txt
+share/doc/nut/nut-hal.txt
share/doc/nut/osd-notify.txt
share/doc/nut/pager.txt
share/doc/nut/powersaving.txt
@@ -142,9 +149,11 @@
share/nut/cmdvartab
share/nut/driver.list
@dirrm share/nut
+@exec ${MKDIR} %D/share/examples/nut
@dirrm share/examples/nut
@exec ${MKDIR} %D/share/doc/nut/drivers
@dirrm share/doc/nut/drivers
@dirrm share/doc/nut/cables
@dirrm share/doc/nut
@dirrm libexec/nut
+@dirrm etc/nut
Only in ups-nut: PLIST.cgi
Only in ups-nut: PLIST.snmp
Only in ups-nut: PLIST.usb
diff -u ups-nut.orig/distinfo ups-nut/distinfo
--- ups-nut.orig/distinfo 2007-11-07 16:10:02.000000000 -0600
+++ ups-nut/distinfo 2007-11-07 20:42:42.000000000 -0600
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.25 2006/08/15 12:26:07 ghen Exp $
-SHA1 (nut-2.0.4.tar.gz) = 31e2464a0f868c7d04d052ee558e52956220ccba
-RMD160 (nut-2.0.4.tar.gz) = 7368967572bd8b2361c6fdd642308ecbb661a994
-Size (nut-2.0.4.tar.gz) = 699424 bytes
-SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
-SHA1 (patch-ab) = 2a5ad1397736f8119532d756afe31dd523a23813
+SHA1 (nut-2.2.0.tar.gz) = b8017300d41c0a7a946034cf0bdb92ad8b7367a9
+RMD160 (nut-2.2.0.tar.gz) = d4e0e50239ba2b020060445869b6d364a56092f4
+Size (nut-2.2.0.tar.gz) = 1173801 bytes
+SHA1 (patch-aa) = 7af88d1a45ef5b661d423a15ec65e1c1c0cd68d3
+SHA1 (patch-ab) = 4b2ce75b4f52df2343a7acac871a5b4ade0449a9
Common subdirectories: ups-nut.orig/files and ups-nut/files
Only in ups-nut: options.description
Only in ups-nut: options.mk
Common subdirectories: ups-nut.orig/patches and ups-nut/patches
>Fix:
Unknown
>Unformatted:
Home |
Main Index |
Thread Index |
Old Index