diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-12 23:16:14 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-12 23:16:14 +0000 |
commit | 9c7742789f8167ed1bed1129243b71706b4e8e8e (patch) | |
tree | 9f1a00c02b15a12e70f23794419e6a799f43fafa /sys-power/nut/files | |
parent | Version bump. (diff) | |
download | historical-9c7742789f8167ed1bed1129243b71706b4e8e8e.tar.gz historical-9c7742789f8167ed1bed1129243b71706b4e8e8e.tar.bz2 historical-9c7742789f8167ed1bed1129243b71706b4e8e8e.zip |
old
Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
Diffstat (limited to 'sys-power/nut/files')
-rw-r--r-- | sys-power/nut/files/lighttpd_nut.conf | 23 | ||||
-rw-r--r-- | sys-power/nut/files/nut-2.0.5-bcmxcp-3phase.patch | 91 | ||||
-rwxr-xr-x | sys-power/nut/files/upsd.rc6 | 35 | ||||
-rwxr-xr-x | sys-power/nut/files/upsdrv.rc6-r1 | 21 | ||||
-rwxr-xr-x | sys-power/nut/files/upsmon.rc6 | 20 | ||||
-rw-r--r-- | sys-power/nut/files/upsstats-upsset-link-2.0.5.patch | 15 |
6 files changed, 0 insertions, 205 deletions
diff --git a/sys-power/nut/files/lighttpd_nut.conf b/sys-power/nut/files/lighttpd_nut.conf deleted file mode 100644 index 7e5d4d1843cc..000000000000 --- a/sys-power/nut/files/lighttpd_nut.conf +++ /dev/null @@ -1,23 +0,0 @@ -############################################################################### -# Lighttpd configuration for using NUT under Gentoo Linux. -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/lighttpd_nut.conf,v 1.1 2006/05/18 23:28:07 robbat2 Exp $ -############################################################################### - -# Simple copy this to /etc/lighttpd/ and include it in your lighttpd.conf. -# It will make NUT available at http://$HOST/nut/ - -server.modules += ("mod_cgi") - -# If you want to limit it to some host, uncomment the host check and modify it to your needs. -# $HTTP["host"] == "www2.example.org" { -alias.url += ( "/nut/" => "/usr/share/nut/" ) -$HTTP["url"] =~ "^/nut/" { - dir-listing.activate = "disable" - cgi.assign = ( ".cgi" => "" ) - index-file.names = ( "upsstats.cgi" ) -} -# } - -# vim: set ft=conf foldmethod=marker et : diff --git a/sys-power/nut/files/nut-2.0.5-bcmxcp-3phase.patch b/sys-power/nut/files/nut-2.0.5-bcmxcp-3phase.patch deleted file mode 100644 index 98f023e444c0..000000000000 --- a/sys-power/nut/files/nut-2.0.5-bcmxcp-3phase.patch +++ /dev/null @@ -1,91 +0,0 @@ -Signed-off-by: Kjell Claesson <kjell.claesson@epost.tidanet.se> -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Date: Sun, 25 Feb 2007 11:08:33 +0100 - -Patch from upstream developer (Kjell) for bcmxcp on Compaq and HP -hardware, due to 3-phase configuration bug. - ---- nut-2.0.5.orig/drivers/bcmxcp.c 2006-12-14 20:06:19.000000000 +0100 -+++ nut-2.0.5/drivers/bcmxcp.c 2007-01-22 22:55:41.000000000 +0100 -@@ -57,6 +57,7 @@ - char *ABMStatus[4] = {"Charging", "Discharging", "Floating", "Resting"}; - unsigned char AUTHOR[4] = {0xCF, 0x69, 0xE8, 0xD5}; /* Autorisation command */ - int nphases = 0; -+char *cpu_name[] = {"Cont:", "Inve:", "Rect:", "Netw:", "Disp:"}; - - /* get_word funktion from nut driver metasys.c */ - int get_word(const unsigned char *buffer) /* return an integer reading a word in the supplied buffer */ -@@ -727,23 +728,11 @@ - unsigned char answer[256]; - char *pTmp, sValue[17]; - int iRating = 0, iIndex = 0, res, len; -- int voltage = 0; -+ int voltage = 0, ncpu = 0, buf; - - /* Set driver version info */ - dstate_setinfo("driver.version.internal", "%s", DRV_VERSION); - -- /* Get information on Phases from UPS */ -- res = command_read_sequence(PW_UPS_TOP_DATA_REQ, answer); -- if (res <= 0) -- fatal_with_errno("Could not communicate with the ups"); -- -- nphases = (answer[0] & 0x0F) +1; -- dstate_setinfo("input.phases", "%d", nphases); -- -- -- /* Init BCM/XCP <-> NUT meter map */ -- init_meter_map(); -- - /* Init BCM/XCP alarm descriptions */ - init_alarm_map(); - -@@ -761,15 +750,26 @@ - /* Get number of CPU's in ID block */ - len = answer[iIndex++]; - -+ buf = len * 11; -+ pTmp = xmalloc(buf+1); -+ -+ pTmp[0] = 0; - /* If there is one or more CPU number, get it */ - if (len > 0) { - do { -- /* Get the ups firmware. The major number is in the last byte, the minor is in the first */ -- dstate_setinfo("ups.firmware", "%02x.%02x", (unsigned char)answer[iIndex+1], -- (unsigned char)answer[iIndex]); -+ if ((answer[iIndex] != 0x00) || (answer[iIndex+1] != 0x00)) { -+ /* Get the ups firmware. The major number is in the last byte, the minor is in the first */ -+ snprintfcat(pTmp, buf+1, "%s%02x.%02x ", cpu_name[ncpu], answer[iIndex+1], answer[iIndex]); -+ } - iIndex += 2; - len--; -- } while ((strcmp("00.00", dstate_getinfo("ups.firmware")) == 0) && len > 0); -+ ncpu++; -+ -+ } while ((len > 0) && (ncpu <= 5)); -+ -+ dstate_setinfo("ups.firmware", "%s", pTmp); -+ -+ free(pTmp); - - /* Increment index to point at end of CPU bytes. */ - iIndex += len * 2; -@@ -786,8 +786,15 @@ - } - dstate_setinfo("ups.power.nominal", "%d", iRating); - -- /* Skip UPS' number of phases and phase angle, as NUT do not care */ -- iIndex += 2; -+ /* Get information on Phases from UPS */ -+ nphases = (answer[iIndex++]); -+ dstate_setinfo("output.phases", "%d", nphases); -+ -+ /* Init BCM/XCP <-> NUT meter map */ -+ init_meter_map(); -+ -+ /* Skip UPS' phase angle, as NUT do not care */ -+ iIndex += 1; - - /* Get length of UPS description */ - len = answer[iIndex++]; diff --git a/sys-power/nut/files/upsd.rc6 b/sys-power/nut/files/upsd.rc6 deleted file mode 100755 index 0cb34f620878..000000000000 --- a/sys-power/nut/files/upsd.rc6 +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsd.rc6,v 1.3 2007/10/09 00:42:45 robbat2 Exp $ - -opts="reload" -pidfile=/var/lib/nut/upsd.pid - -depend() { - need net upsdrv - before upsmon -} - -start() { - ebegin "Starting upsd" - # clean up first - pkill -u root -x upsd - sleep 1s - rm -f ${pidfile} - # now start up - start-stop-daemon --start --quiet --exec /usr/sbin/upsd - eend $? -} - -stop() { - ebegin "Stopping upsd" - start-stop-daemon --stop --quiet --pidfile ${pidfile} - eend $? -} - -reload() { - ebegin "Reloading upsd" - start-stop-daemon --stop --signal HUP --oknodo --quiet --pidfile ${pidfile} - eend $? -} diff --git a/sys-power/nut/files/upsdrv.rc6-r1 b/sys-power/nut/files/upsdrv.rc6-r1 deleted file mode 100755 index fef39d17ac91..000000000000 --- a/sys-power/nut/files/upsdrv.rc6-r1 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsdrv.rc6-r1,v 1.1 2006/05/15 23:43:08 robbat2 Exp $ - -depend() { - need net - before upsd -} - -start() { - ebegin "Starting UPS drivers" - /usr/sbin/upsdrvctl start - eend $? "Failed to start UPS drivers!" -} - -stop() { - ebegin "Stopping UPS drivers" - /usr/sbin/upsdrvctl stop - eend $? "Failed to stop UPS drivers!" -} diff --git a/sys-power/nut/files/upsmon.rc6 b/sys-power/nut/files/upsmon.rc6 deleted file mode 100755 index ba488c7d8ce5..000000000000 --- a/sys-power/nut/files/upsmon.rc6 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/upsmon.rc6,v 1.1 2006/05/15 23:43:08 robbat2 Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting upsmon" - start-stop-daemon --start --quiet --exec /usr/sbin/upsmon - eend $? -} - -stop() { - ebegin "Stopping upsmon" - start-stop-daemon --stop --quiet --pidfile /var/run/upsmon.pid - eend $? -} diff --git a/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch b/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch deleted file mode 100644 index db48b1aa3eae..000000000000 --- a/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Date: Sat, 24 Feb 2007 18:43:09 -0800 - -Include a link to the upsset page from the stats page. - ---- nut-2.0.5.orig/conf/upsstats.html 2006-11-07 18:08:45.000000000 -0800 -+++ nut-2.0.5/conf/upsstats.html 2007-02-24 18:41:06.000000000 -0800 -@@ -177,6 +177,7 @@ - - </td></tr> - </table> -+<p style="text-align: center"><a href="upsset.cgi">Settings & Commands</a></p> - - <hr /><div><small> - <a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="float:right" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" height="31" width="88"/></a> |