pool/nut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nut?expand=0&rev=22

Browse Source
This commit is contained in:
OBS User unknown 2009-08-10 16:20:29 +00:00 committed by Git OBS Bridge
parent 80ba9c6a0e
commit f8a74dc14e
8 changed files with 76 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nut-2.2.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2a2d9ed1acd8b49f6898daf7c720199478111443708794c0b8e856d83a7f1f0
size 887444

3
nut-2.4.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cee0802b21d2fe5222115182fcaa94acbd87e96863e9ae60203f4ae168a3ea9c
size 878389

47
nut-hal.patch
View File

@ -1,33 +1,22 @@
--- scripts/hal/ups-nut-device.fdi
+++ scripts/hal/ups-nut-device.fdi
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
- <match key="info.bus" string="usb_device">
+ <match key="info.subsystem" string="usb_device">
<!-- MGE UPS SYSTEMS -->
<match key="usb_device.vendor_id" int="0x0463">
--- configure
+++ configure
@@ -9738,7 +9738,7 @@ echo $ECHO_N "checking for libhal Callou
if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal")
then
# For Debian
- HAL_CALLOUTS_PATH="${libdir}/hal"
+ HAL_CALLOUTS_PATH="${prefix}/lib/hal"
{ echo "$as_me:$LINENO: result: ${HAL_CALLOUTS_PATH}" >&5
echo "${ECHO_T}${HAL_CALLOUTS_PATH}" >&6; }
else # For RedHat
--- m4/nut_check_libhal.m4 --- m4/nut_check_libhal.m4
+++ m4/nut_check_libhal.m4 +++ m4/nut_check_libhal.m4
@@ -66,7 +66,7 @@ if test -z "${nut_have_libhal_seen}"; th @@ -79,6 +79,11 @@
if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal") if (test -z "$HAL_CALLOUTS_PATH")
then then
# For Debian # fallback to detecting the right path
- HAL_CALLOUTS_PATH="${libdir}/hal" + if (test -d "${prefix}/lib/hal")
+ HAL_CALLOUTS_PATH="${prefix}/lib/hal" + then
+ HAL_CALLOUTS_PATH="${prefix}/lib/hal"
+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
+ else
if (test -d "${libdir}/hal")
then
# For Debian
@@ -95,6 +100,7 @@
AC_MSG_RESULT(using default (${HAL_CALLOUTS_PATH}))
fi
fi
+ fi
else
AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
else # For RedHat fi
if (test -d "/usr/libexec")

22
nut-intptr.patch
View File

@ -1,22 +0,0 @@
main-hal.c: In function 'dbus_filter_function':
main-hal.c:553: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast
main-hal.c:559: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast
================================================================================
--- drivers/main-hal.c
+++ drivers/main-hal.c
@@ -550,13 +550,13 @@
if (b_enable==TRUE) {
if (upsh.instcmd("beeper.enable", NULL) != STAT_INSTCMD_HANDLED) {
- dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1);
+ dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1));
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
}
else {
if (upsh.instcmd("beeper.disable", NULL) != STAT_INSTCMD_HANDLED) {
- dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1);
+ dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1));
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
}

129
nut-libtool.patch
View File

@ -1,129 +0,0 @@
--- clients/Makefile.am
+++ clients/Makefile.am
@@ -35,7 +35,7 @@
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)
@@ -46,17 +46,5 @@
# not LDADD.
libupsclient_la_SOURCES = upsclient.c upsclient.h
-libupsclient_la_LIBADD = ../common/parseconf.lo
+libupsclient_la_LIBADD = ../common/libparseconf.la
libupsclient_la_LDFLAGS = -version-info 1:0:0
-
-# rules for cross-directory targets
-../common/libcommon.a: FORCE
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a)
-
-../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
-
-../common/parseconf.lo:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
-
-FORCE:
--- common/Makefile.am
+++ common/Makefile.am
@@ -3,17 +3,8 @@
AM_CFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libcommon.a
-libcommon_a_SOURCES = common.c ../include/nut_version.h
-libcommon_a_LIBADD = $(LIBOBJS) $(ALLOCA)
+libcommon_a_SOURCES = common.c state.c upsconf.c ../include/nut_version.h
+libcommon_a_LIBADD = libparseconf.la
-all: libcommon.a upsconf.o parseconf.o state.o parseconf.lo
-
-# Define a dummy library so that Automake builds rules for the
-# corresponding object files. This library is not actually built,
-EXTRA_LIBRARIES = libdummy.a
-libdummy_a_SOURCES = parseconf.c state.c upsconf.c
-
-../include/nut_version.h: FORCE
- (cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h)
-
-FORCE:
+noinst_LTLIBRARIES = libparseconf.la
+libparseconf_la_SOURCES = parseconf.c
--- drivers/Makefile.am
+++ drivers/Makefile.am
@@ -2,9 +2,8 @@
# by default, link programs in this directory with libcommon.a
#FIXME: SERLIBS is only useful for LDADD_DRIVERS_SERIAL not for LDADD_COMMON
-LDADD_COMMON = ../common/libcommon.a
-LDADD_DRIVERS = $(LDADD_COMMON) ../common/upsconf.o \
- ../common/parseconf.o ../common/state.o main.o dstate.o
+LDADD_COMMON = ../common/libcommon.a ../common/libparseconf.la
+LDADD_DRIVERS = $(LDADD_COMMON) main.o dstate.o
LDADD_HAL_DRIVERS = $(LDADD_COMMON) libnuthalmain.a
LDADD_DRIVERS_SERIAL = $(LDADD_DRIVERS) $(SERLIBS) serial.o
@@ -86,7 +85,7 @@
# upsdrvctl: the all-singing all-dancing driver control program
upsdrvctl_SOURCES = upsdrvctl.c
-upsdrvctl_LDADD = $(LDADD_COMMON) ../common/upsconf.o ../common/parseconf.o
+upsdrvctl_LDADD = $(LDADD_COMMON)
# serial drivers: all of them use standard LDADD and CFLAGS
al175_SOURCES = al175.c
@@ -226,18 +225,3 @@
libnuthalmain_a_SOURCES = main-hal.c dstate-hal.c
MOSTLYCLEANFILES = libnuthalmain.a
-
-# rules for cross-directory targets
-../common/libcommon.a: FORCE
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a)
-
-../common/upsconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
-
-../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
-
-../common/state.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
-
-FORCE:
--- server/Makefile.am
+++ server/Makefile.am
@@ -7,8 +7,7 @@
if WITH_SSL
AM_CFLAGS += $(LIBSSL_CFLAGS)
endif
-LDADD = ../common/libcommon.a ../common/state.o ../common/upsconf.o \
- ../common/parseconf.o $(NETLIBS)
+LDADD = ../common/libcommon.a ../common/libparseconf.la $(NETLIBS)
if WITH_SSL
LDADD += $(LIBSSL_LDFLAGS)
endif
@@ -22,19 +21,4 @@
netlist.h netmisc.h netset.h netuser.h ssl.h sstate.h stype.h upsd.h \
upstype.h user-data.h user.h
-sockdebug_SOURCES = sockdebug.c
-
-# rules for cross-directory targets
-../common/libcommon.a: FORCE
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a)
-
-../common/upsconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
-
-../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
-
-../common/state.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
-
-FORCE:
+sockdebug_SOURCES = sockdebug.c

8
nut-preconfig.patch
View File

@ -19,10 +19,10 @@
+ desc = "Local UPS" + desc = "Local UPS"
--- conf/upsd.users.sample --- conf/upsd.users.sample
+++ conf/upsd.users.sample +++ conf/upsd.users.sample
@@ -68,3 +68,13 @@ @@ -62,3 +62,13 @@
# The matching MONITOR line in your upsmon.conf would look like this: # The matching MONITOR line in your upsmon.conf would look like this:
# #
# MONITOR myups@myhost 1 monuser pass master (or slave) # MONITOR myups@localhost 1 upsmon pass master (or slave)
+ +
+[upsmaster] +[upsmaster]
+ password = @UPSD_INITIAL_MASTER_PASSWORD@ + password = @UPSD_INITIAL_MASTER_PASSWORD@
@ -51,9 +51,9 @@
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# MONITOR <system> <powervalue> <username> <password> ("master"|"slave") # MONITOR <system> <powervalue> <username> <password> ("master"|"slave")
@@ -83,6 +83,8 @@ @@ -84,6 +84,8 @@
# MONITOR myups@bigserver 1 monmaster blah master
# MONITOR su700@server.example.com 1 upsmon secretpass slave # MONITOR su700@server.example.com 1 upsmon secretpass slave
# MONITOR myups@localhost 1 upsmon pass master (or slave)
+MONITOR myups@localhost 1 upsmaster @UPSD_INITIAL_MASTER_PASSWORD@ master +MONITOR myups@localhost 1 upsmaster @UPSD_INITIAL_MASTER_PASSWORD@ master
+ +

38
nut.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Aug 7 15:13:55 CEST 2009 - sbrabec@suse.cz
- Updated to version 2.4.1:
* Support for new devices: MicroDowell Enterprise B8, B10, N8,
N11, N15, N20, N22, N30, N40, N50, N60 and HiBox ST.
* NUT-Monitor now better handles the ups.status field.
* Support for Power Distribution Units (PDUs), including: Eaton
ePDUs (Managed and Monitored), some Aphel models, some Raritan
PDUs, and the whole list of Powerman supported devices,
Chloride Desk Power 650, Cyber Power Systems Value
400E/600E/800E (USB models), Delta GES602N, Digitus DN-170020,
the whole Eaton ranges (mostly composed of MGE Office
Protection Systems and Powerware units) including BladeUPS,
Forza Power Technologies SL-1001, HP PowerTrust 2997A, HP R/T
2200 G2, Infosec XP 1000 and XP 500, Ippon Back Power Pro
(serial and USB), Kebo 1200D/D Series, Liebert PowerSure
Personal XT, MGE Office Protection Systems Protection Station,
Neus 400va and 600va, Phasak 400VA and 600VA, Plexus 500VA,
Powercom Black Knight PRO / King PRO and Imperial,
PowerKinetics BlackOut Buster, Sweex 1000 USB, UNITEK Alpha
500, WinPower CPM-800.
* NUT now embeds Python client support through the PyNUTClient
module and the NUT-Monitor application.
* The dummy-ups driver now support a "repeater" mode.
* tcp-wrappers support has been added to the upsd server.
* The nut.conf file has been introduced.
* NUT now ships a bash completion function for 'upsc' command.
* Many internal changes to improve maintenability:
* the USB information automatic extraction to generate the
various USB helper files,
* the upsdrv_info_t structure to track more driver
information, and remove the need for the upsdrv_banner()
function,
* common USB code refactoring, as it is done for the serial
functions.
* Tons of bugfixes, cleanup and improvements.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 14 10:03:39 CEST 2009 - coolo@novell.com Tue Jul 14 10:03:39 CEST 2009 - coolo@novell.com

25
nut.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package nut (Version 2.2.2) # spec file for package nut (Version 2.4.1)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,7 +18,7 @@
Name: nut Name: nut
BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel
# for directory ownership: # for directory ownership:
BuildRequires: pm-utils BuildRequires: pm-utils
License: GPL v2 or later License: GPL v2 or later
@ -27,8 +27,8 @@ Provides: smartups
Obsoletes: smartups Obsoletes: smartups
Conflicts: apcupsd Conflicts: apcupsd
Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring)
Version: 2.2.2 Version: 2.4.1
Release: 71 Release: 1
Url: http://www.networkupstools.org/ Url: http://www.networkupstools.org/
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: upsd.init Source1: upsd.init
@ -41,8 +41,6 @@ Patch: nut-preconfig.patch
Patch3: nut-notifyflag.patch Patch3: nut-notifyflag.patch
Patch4: nut-powersave.patch Patch4: nut-powersave.patch
Patch6: nut-udev.patch Patch6: nut-udev.patch
Patch8: nut-libtool.patch
Patch11: nut-intptr.patch
Patch12: nut-hal.patch Patch12: nut-hal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils /bin/chown PreReq: pwdutils /bin/chown
@ -60,11 +58,12 @@ Requires: nut-package = %{version}
%define QUOTE " %define QUOTE "
%define BACKSLASH \\ %define BACKSLASH \\
# Collect all devices listed in ups-nut-device.fdi: # Collect all devices listed in ups-nut-device.fdi:
%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | fgrep -a -A4 usb_device.vendor_id | tr '%{BACKSLASH}n' '-' | tr 'a-z' 'A-Z' | sed 's/--/%{BACKSLASH}n/g' | sed 's/^.*USB_DEVICE%{BACKSLASH}.VENDOR_ID%{QUOTE} INT=%{QUOTE}0X%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*USB_DEVICE%{BACKSLASH}.PRODUCT_ID%{QUOTE} INT=%{QUOTE}0X%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*INFO%{BACKSLASH}.ADDONS%{QUOTE} TYPE=%{QUOTE}STRLIST%{QUOTE}>%{BACKSLASH}%{LBRACE}[^<]*%{BACKSLASH}%{RBRACE}<.*$/%{BACKSLASH}3=modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/') %define USBHIDDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 USBHID-UPS | sed -n 's/.*SYSFS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, SYSFS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
%define USBNONHIDDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 _USB | sed -n 's/.*SYSFS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, SYSFS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
# Package provides driver for USB HID UPSes, but people can live with hal addon: # Package provides driver for USB HID UPSes, but people can live with hal addon:
Enhances: %(set -x ; echo %{QUOTE}%{USBDRIVERS}%{QUOTE} | sed -n s/^HALD-ADDON-USBHID-UPS=//p | tr '%{BACKSLASH}n' ' ') Enhances: %USBHIDDRIVERS
# Package provides the only avalailable driver for other USB UPSes: # Package provides the only avalailable driver for other USB UPSes:
Supplements: %(set -x ; echo %{QUOTE}%{USBDRIVERS}%{QUOTE} | sed '/^HALD-ADDON-USBHID-UPS=/d;s/^.*=//' | tr '%{BACKSLASH}n' ' ') Supplements: %USBNONHIDDRIVERS
%description %description
Core package of Network UPS Tools. Core package of Network UPS Tools.
@ -227,9 +226,7 @@ mv upsd-early-powerdown.init upsd-early-powerdown
%if %suse_version < 1030 %if %suse_version < 1030
%patch6 -R %patch6 -R
%endif %endif
%patch8
sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample
%patch11
%if %suse_version > 1030 %if %suse_version > 1030
%patch12 %patch12
%endif %endif
@ -240,7 +237,7 @@ sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in
%build %build
autoreconf -f -i autoreconf -f -i
%configure --disable-static --with-pic --libexecdir=%_prefix/lib \ %configure --disable-static --with-pic --libexecdir=%_prefix/lib\
--sysconfdir=%{CONFPATH}\ --sysconfdir=%{CONFPATH}\
--datadir=%{_datadir}/nut\ --datadir=%{_datadir}/nut\
--with-all\ --with-all\
@ -294,6 +291,8 @@ mkdir $RPM_BUILD_ROOT%{HTMLPATH}/nut $RPM_BUILD_ROOT%{CGIPATH}/nut
mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/ mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/
mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut
%{__rm} -f %{buildroot}%{_libdir}/*.la %{__rm} -f %{buildroot}%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d
install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/
%pre %pre
usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \
@ -406,6 +405,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.users %config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.users
%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsmon.conf %config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsmon.conf
%dir %{CONFPATH} %dir %{CONFPATH}
%config(noreplace) %{CONFPATH}/nut.conf
%config(noreplace) %{CONFPATH}/ups.conf %config(noreplace) %{CONFPATH}/ups.conf
%config(noreplace) %{CONFPATH}/upsset.conf %config(noreplace) %{CONFPATH}/upsset.conf
%config(noreplace) %{CONFPATH}/upssched.conf %config(noreplace) %{CONFPATH}/upssched.conf
@ -429,6 +429,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev
%dir %{_sysconfdir}/udev/rules.d %dir %{_sysconfdir}/udev/rules.d
%{_sysconfdir}/udev/rules.d/*.rules %{_sysconfdir}/udev/rules.d/*.rules
/etc/bash_completion.d/
%files cgi %files cgi
%defattr(-,root,root) %defattr(-,root,root)