Update to 1.2.1, a substantial update from 1.0.0.
Changes are listed here: http://www.exploits.org/nut/release/1.2/new-1.2.1.txt ok sturm@ Note: the initial checkin aborted half way through, before any log messages were generated. What you see here is the second half of the commit, the first half is already in-tree.
This commit is contained in:
marcm
parent
1ebedd66e9
commit
72af77da5c
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2002/10/14 16:14:33 marcm Exp $
|
||||
--- configure.in.orig Sat Sep 28 07:53:50 2002
|
||||
+++ configure.in Sat Sep 28 07:57:27 2002
|
||||
@@ -233,7 +233,17 @@ dnl
|
||||
[
|
||||
GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM"
|
||||
],,
|
||||
- [-lm -lpng -lz $LIBTTF $LIBXPM])
|
||||
+ [-lm -lpng -lz $LIBTTF $LIBXPM])
|
||||
+ fi
|
||||
+
|
||||
+ if test "$GFXLIBS" = "" ; then
|
||||
+ echo "Fine then... sheesh, trying again using $LIBTTF -ljpeg"
|
||||
+ unset ac_cv_lib_gd_gdImagePng
|
||||
+ AC_CHECK_LIB(gd, gdImagePng,
|
||||
+ [
|
||||
+ GFXLIBS="-lgd -lpng -lz $LIBTTF -ljpeg"
|
||||
+ ],,
|
||||
+ [-lgd -lpng -lz $LIBTTF -ljpeg])
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-include_config_h_in,v 1.1 2002/10/14 16:14:33 marcm Exp $
|
||||
--- include/config.h.in.orig Mon May 27 07:18:43 2002
|
||||
+++ include/config.h.in Mon Sep 30 11:02:00 2002
|
||||
$OpenBSD: patch-include_config_h_in,v 1.2 2003/01/17 06:23:43 marcm Exp $
|
||||
--- include/config.h.in.orig Sun Nov 17 07:55:46 2002
|
||||
+++ include/config.h.in Sun Dec 29 11:46:26 2002
|
||||
@@ -9,6 +9,9 @@
|
||||
/* path where configuration files get installed by default */
|
||||
#define CONFPATH "/usr/local/ups/etc"
|
||||
/* Default path for configuration files */
|
||||
#undef CONFPATH
|
||||
|
||||
+/* path where CGI configuration files are looked for by a chrooted Apache */
|
||||
+#define CGICONFPATH "/conf/nut"
|
||||
+
|
||||
/* state files created by the drivers go here */
|
||||
#define STATEPATH "/var/state/ups"
|
||||
/* Default path for UPS drivers */
|
||||
#undef DRVPATH
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: DEINSTALL-cgi,v 1.1 2002/10/14 16:14:33 marcm Exp $
|
||||
# $OpenBSD: DEINSTALL-cgi,v 1.2 2003/01/17 06:23:43 marcm Exp $
|
||||
#
|
||||
|
||||
set -e
|
||||
@ -9,8 +9,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
|
||||
FILES='
|
||||
hosts.conf
|
||||
multimon.conf
|
||||
upsset.conf
|
||||
upsstats-single.html.sample
|
||||
upsstats.html.sample
|
||||
'
|
||||
|
||||
WEBCONFDIR=${PREFIX}/conf/nut
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: INSTALL-cgi,v 1.1 2002/10/14 16:14:33 marcm Exp $
|
||||
# $OpenBSD: INSTALL-cgi,v 1.2 2003/01/17 06:23:43 marcm Exp $
|
||||
|
||||
P_NAME=nut-cgi
|
||||
|
||||
@ -9,8 +9,9 @@ DIRS='
|
||||
|
||||
FILES='
|
||||
hosts.conf
|
||||
multimon.conf
|
||||
upsset.conf
|
||||
upsstats-single.html
|
||||
upsstats.html
|
||||
'
|
||||
|
||||
set -e
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
| echo -n ' nut'
|
||||
| /usr/local/bin/upsdrvctl start > /dev/null
|
||||
| /usr/local/sbin/upsd > /dev/null 2>&1
|
||||
| /usr/local/sbin/upsmon > /dev/null
|
||||
| /usr/local/sbin/upsmon > /dev/null 2>&1
|
||||
| fi
|
||||
|
|
||||
| You may also be interested in the "-i" flag to upsd, see upsd(8).
|
||||
|
||||
@ -1,71 +1,80 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2002/10/14 16:14:33 marcm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2003/01/17 06:23:43 marcm Exp $
|
||||
@pkgcfl upsd-*
|
||||
bin/apcsmart
|
||||
bin/bcmxcp
|
||||
bin/belkin
|
||||
bin/bestferrups801-807
|
||||
bin/bestfortress
|
||||
bin/bestuferrups
|
||||
bin/bestups
|
||||
bin/cyberpower
|
||||
bin/etapro
|
||||
bin/everups
|
||||
bin/fentonups
|
||||
bin/genericups
|
||||
bin/hp
|
||||
bin/isbmex
|
||||
bin/liebert
|
||||
bin/masterguard
|
||||
bin/mge-ellipse
|
||||
bin/mge-utalk
|
||||
bin/microdowell
|
||||
bin/newapc
|
||||
bin/oneac
|
||||
bin/powercom
|
||||
bin/sec
|
||||
bin/sms
|
||||
bin/tripplite
|
||||
bin/upsc
|
||||
bin/upscmd
|
||||
bin/upsct
|
||||
bin/upsct2
|
||||
bin/upsdrvctl
|
||||
bin/upslog
|
||||
bin/upsrw
|
||||
bin/victronups
|
||||
man/man5/hosts.conf.5
|
||||
man/man5/multimon.conf.5
|
||||
man/man5/ups.conf.5
|
||||
man/man5/upsd.conf.5
|
||||
man/man5/upsd.users.5
|
||||
man/man5/upsmon.conf.5
|
||||
man/man5/upssched.conf.5
|
||||
man/man5/upsset.conf.5
|
||||
man/man5/upsstats.html.5
|
||||
man/man8/apcsmart.8
|
||||
man/man8/bcmxcp.8
|
||||
man/man8/belkin.8
|
||||
man/man8/bestferrups801-807.8
|
||||
man/man8/bestfortress.8
|
||||
man/man8/bestuferrups.8
|
||||
man/man8/bestups.8
|
||||
man/man8/cyberpower.8
|
||||
man/man8/etapro.8
|
||||
man/man8/everups.8
|
||||
man/man8/fentonups.8
|
||||
man/man8/genericups.8
|
||||
man/man8/hp.8
|
||||
man/man8/isbmex.8
|
||||
man/man8/liebert.8
|
||||
man/man8/masterguard.8
|
||||
man/man8/mge-ellipse.8
|
||||
man/man8/mge-utalk.8
|
||||
man/man8/microdowell.8
|
||||
man/man8/multimon.cgi.8
|
||||
man/man8/newapc.8
|
||||
man/man8/nutupsdrv.8
|
||||
man/man8/oneac.8
|
||||
man/man8/powercom.8
|
||||
man/man8/powernet.8
|
||||
man/man8/sec.8
|
||||
man/man8/sms.8
|
||||
man/man8/snmp-ups.8
|
||||
man/man8/tripplite.8
|
||||
man/man8/upsc.8
|
||||
man/man8/upscmd.8
|
||||
man/man8/upsct.8
|
||||
man/man8/upsct2.8
|
||||
man/man8/upsd.8
|
||||
man/man8/upsdrvctl.8
|
||||
man/man8/upsimage.cgi.8
|
||||
man/man8/upslog.8
|
||||
man/man8/upsmon.8
|
||||
man/man8/upsrw.8
|
||||
man/man8/upssched.8
|
||||
man/man8/upsset.cgi.8
|
||||
man/man8/upsstats.cgi.8
|
||||
@ -74,7 +83,7 @@ sbin/upsd
|
||||
sbin/upsmon
|
||||
sbin/upssched
|
||||
share/doc/nut/FAQ
|
||||
@comment share/doc/nut/README.OpenBSD
|
||||
share/doc/nut/README
|
||||
share/doc/nut/big-servers.txt
|
||||
share/doc/nut/cables/apc.txt
|
||||
share/doc/nut/cables/ge-imv-victron.txt
|
||||
@ -92,22 +101,15 @@ share/doc/nut/design.txt
|
||||
share/doc/nut/developers.txt
|
||||
share/doc/nut/driver.list
|
||||
share/doc/nut/drivers/README
|
||||
share/doc/nut/drivers/belkin.txt
|
||||
share/doc/nut/drivers/bestferrups801-807.txt
|
||||
share/doc/nut/drivers/dummycons.txt
|
||||
share/doc/nut/drivers/dummyups.txt
|
||||
share/doc/nut/drivers/generic-ups.txt
|
||||
share/doc/nut/drivers/mge-ellipse.txt
|
||||
share/doc/nut/drivers/mge-utalk.txt
|
||||
share/doc/nut/drivers/multilink.txt
|
||||
share/doc/nut/drivers/powercom.txt
|
||||
share/doc/nut/drivers/powernet.txt
|
||||
share/doc/nut/drivers/snmp-ups.txt
|
||||
share/doc/nut/new-drivers.txt
|
||||
share/doc/nut/pager.txt
|
||||
share/doc/nut/protocol.txt
|
||||
share/doc/nut/shutdown.txt
|
||||
share/doc/nut/tips.txt
|
||||
share/doc/nut/ssl.txt
|
||||
share/doc/nut/todo.txt
|
||||
share/doc/nut/upssched.txt
|
||||
share/examples/nut/ups.conf.sample
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PLIST-cgi,v 1.1 2002/10/14 16:14:33 marcm Exp $
|
||||
cgi-bin/nut/multimon.cgi
|
||||
@comment $OpenBSD: PLIST-cgi,v 1.2 2003/01/17 06:23:43 marcm Exp $
|
||||
cgi-bin/nut/upsimage.cgi
|
||||
cgi-bin/nut/upsset.cgi
|
||||
cgi-bin/nut/upsstats.cgi
|
||||
conf/nut/hosts.conf.sample
|
||||
conf/nut/multimon.conf.sample
|
||||
conf/nut/upsset.conf.sample
|
||||
conf/nut/upsstats-single.html.sample
|
||||
conf/nut/upsstats.html.sample
|
||||
@dirrm cgi-bin/nut
|
||||
|
||||
Loading…
Reference in New Issue
Block a user