Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Mon Jun 20 14:13:22 CEST 2011.
-------- --- nut/nut.changes 2011-02-09 15:22:57.000000000 +0100 +++ nut/nut.changes 2011-06-17 15:39:57.000000000 +0200 @@ -1,0 +2,26 @@ +Thu Jun 16 18:47:47 CEST 2011 - [email protected] + +- Upgrade to version 2.6.1 (bnc#698152): + * NUT now propose a variable to expose UPS efficiency. + * Various recent USB regressions have been definitely fixed. + * NUT now propose a variable to expose UPS efficiency. + * Support for new devices: Eaton Ellipse ECO, Powerware 9140, + Eaton 5 PX, and ambient sensor on Eaton ePDU managed, GE EP + series, Inform Sinus SS 210, IPAR Mini Energy ME 800, Mustek + Yukai PowerMust 1000 USB, Numeric 3000 SW, SVEN Power Pro+ + series (recent models), Vivaldi EA200 LED. + * Improved Liebert ESP II support, PowerCom BNT 1500A and + BNT-other, blazer + * apcsmart has more improved UPS poweroff support and options. + * usbhid-ups has completed a bit supported variables for APC and + Eaton/MGE. + * Documentation updates. +- Drop nut-hal and merge nut-classic back to nut (bnc#697028). + +------------------------------------------------------------------- +Tue Jun 14 20:10:53 CEST 2011 - [email protected] + +- Fixed command order during hibernate to prevent UPS communication + locks and failures (bnc#660236). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nut-2.6.0.tar.bz2 nut-disable-hal-hid-ups.fdi New: ---- nut-2.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.svIMvp/_old 2011-06-20 14:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.svIMvp/_new 2011-06-20 14:07:22.000000000 +0200 @@ -18,23 +18,24 @@ 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 powerman-devel tcpd-devel +BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix +# For doc build: +BuildRequires: asciidoc dblatex License: GPLv2+ Group: Hardware/UPS Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version: 2.6.0 -Release: 6 +Version: 2.6.1 +Release: 1 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init Source2: README.SUSE Source3: upsd-early-powerdown.init Source5: nut.firewall.in -Source6: nut-disable-hal-hid-ups.fdi Source7: nut.sleep Patch: nut-preconfig.patch # PATCH-FIX-OPENSUSE nut-hal.patch [email protected] -- Fix hal callouts path. @@ -46,8 +47,12 @@ Obsoletes: smartups < %version Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: pwdutils /bin/chown -Requires: nut-package = %{version} +PreReq: pwdutils /bin/chown %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum +Requires: powersave %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink +# for update from openSUSE <= 11.3, SLE <= 11 +Provides: nut-classic <= %{version} +Obsoletes: nut-classic <= %{version} +Obsoletes: nut-hal <= %{version} %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX) %define CGIPATH %{apache_serverroot}/cgi-bin %define HTMLPATH %{apache_serverroot}/htdocs @@ -81,14 +86,14 @@ License: GPLv2+ Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS -Requires: %{name}-classic = %{version} -Enhances: %{name}-classic +Requires: %{name} = %{version} +Enhances: %{name} # for update from openSUSE <= 10.3, SLE <= 10 Provides: nut:%{MODELPATH}/snmp-ups %description drivers-net Networking drivers for the Network UPS Tools. You will need them -altogether with nut-classic to provide UPS networking support. +together with nut to provide UPS networking support. Network UPS Tools is a collection of programs which provide a common interface for monitoring and administering UPS hardware. @@ -110,85 +115,13 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. -%package classic -License: GPLv2+ -Summary: Network UPS Tools Classic Package (Monitoring Server) -Group: Hardware/UPS -Requires: %{name} = %{version} -Provides: nut-package = %{version} -Conflicts: %{name}-hal -Requires: %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink -PreReq: %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum -Requires: powersave -# for update from openSUSE <= 10.3, SLE <= 10 -Provides: nut:%{_sbindir}/upsmon - -%description classic -Classic package of Network UPS Tools. - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -This is the standard installation that uses a layered approach to -connect all of the NUT parts. - -Drivers are provided for a wide assortment of equipment. They -understand the specific language of each UPS and map it back to a -compatibility layer. This means both an expensive "smart" protocol UPS -and a simple "power strip" model can be handled transparently. - -This information is cached by the network server upsd, which then -answers queries from the clients. upsd contains a number of access -control features to limit the abilities of the clients. Only -authorized hosts may monitor or control your UPS hardware if you wish. -Since the notion of monitoring over the network is built into the -software, you can hang many systems off one large UPS and they will all -shut down together. - -Clients such as upsmon check on the status of the hardware and do -things when necessary. The most important task is shutting down the -operating system cleanly before the UPS runs out of power. Other -programs are also provided to log UPS status regularly, monitor status -through your web browser, and more. - -Detailed information about supported hardware can be found in -/usr/share/doc/packages/nut. - -%package hal -License: GPLv2+ -Summary: Network UPS Tools Support for HAL (HAL/D-BUS Integration) -Group: Hardware/UPS -Requires: %{name} = %{version} -Provides: nut-package = %{version} -Conflicts: %{name}-classic -Requires: hal >= 0.5.8 - -%description hal -HAL package of Network UPS Tools is intended for use with supported USB -devices on HAL enabled desktops (Gnome and KDE). - -Using this approach, you don't have to configure NUT files, nor to -manually start components, nor to install a specific NUT client. - -Upon plugging your USB UPS, the right driver will be automatically -launched, and the according Power Manager GUI will pop up. - -Note that this feature is still beta and incomplete. But it represents -a major evolution, and a huge user experience improvement! - -Network UPS Tools is a collection of programs which provide a common -interface for monitoring and administering UPS hardware. - -Detailed information about supported hardware can be found in -/usr/share/doc/packages/nut. - %package cgi License: GPLv2+ Summary: Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS -Requires: %{name}-classic = %{version} -Enhances: %{name}-classic -Supplements: packageand(%{name}-classic:apache2) +Requires: %{name} = %{version} +Enhances: %{name} +Supplements: packageand(%{name}:apache2) # for update from openSUSE <= 10.3, SLE <= 10 Provides: nut:/srv/www/cgi-bin/upsstats.cgi @@ -219,7 +152,6 @@ %prep %setup -q cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} . -cp -a %{S:6} 20-nut-disable-hal-hid-ups.fdi mv upsd-early-powerdown.init upsd-early-powerdown %patch %patch1 -p1 @@ -246,6 +178,7 @@ --datadir=%{_datadir}/nut\ --with-all\ --with-dev\ + --without-hal\ --with-linux-hiddev=%{_includedir}/linux/hiddev.h\ --with-htmlpath=%{HTMLPATH}\ --with-cgipath=%{CGIPATH}\ @@ -279,8 +212,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services cp nut.firewall $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %endif -mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty -install -m 644 20-nut-disable-hal-hid-ups.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/ %if %suse_version >= 1030 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/pm-utils/sleep.d install nut.sleep $RPM_BUILD_ROOT%{_prefix}/lib/pm-utils/sleep.d/99nut @@ -305,16 +236,6 @@ %post # Be sure that all files are owned by a dedicated user. bin/chown -R %{USER}:%{GROUP} %{STATEPATH} - -%post -n libupsclient1 -p /sbin/ldconfig - -%postun -n libupsclient1 -p /sbin/ldconfig - -%pre classic -usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ - -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : - -%post classic %{fillup_and_insserv -f -n upsd} # Generate initial passwords. if usr/bin/fgrep -q "password = @UPSD_INITIAL_MASTER_PASSWORD@" %{CONFPATH}/{upsmon.conf,upsd.users} ; then @@ -352,10 +273,10 @@ # %{_sysconfdir}/sysconfig/smartups was last present in SuSE Linux 10.0 rm -f %{_sysconfdir}/sysconfig/smartups -%preun classic +%preun %{stop_on_removal upsd} -%postun classic +%postun %{restart_on_update upsd} # Remove HALT_POWERDOWN_INSERT if test $1 -eq 0 -a ! -f %{_sysconfdir}/init.d/upsd ; then @@ -372,51 +293,25 @@ fi %insserv_cleanup +%post -n libupsclient1 -p /sbin/ldconfig + +%postun -n libupsclient1 -p /sbin/ldconfig + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README README.SUSE UPGRADING upsd-early-powerdown docs/*.txt docs/cables -%dir %{_prefix}/lib/ups +/bin/* +/etc/bash_completion.d/ +%{_bindir}/* %{_datadir}/nut -%{_datadir}/hal/fdi/policy/20thirdparty/20-nut-disable-hal-hid-ups.fdi +%doc %{_mandir}/man5/*.* %doc %{_mandir}/man8/*.* -%exclude %doc %{_mandir}/man8/ups*.* %exclude %doc %{_mandir}/man8/netxml-ups*.* %exclude %doc %{_mandir}/man8/snmp-ups*.* -%attr(700,%{USER},%{GROUP}) %{STATEPATH} -%dir %{MODELPATH} -%{MODELPATH}/* -%exclude %{MODELPATH}/snmp-ups -%exclude %{MODELPATH}/netxml-ups - -%files drivers-net -%defattr(-,root,root) -%{MODELPATH}/snmp-ups -%{MODELPATH}/netxml-ups -%doc %{_mandir}/man8/netxml-ups*.* -%doc %{_mandir}/man8/snmp-ups*.* - -%files -n libupsclient1 -%defattr(-,root,root) -%{_libdir}/*.so.* - -%files classic -%defattr(-,root,root) -%config(noreplace) %{CONFPATH}/hosts.conf -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.conf -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.users -%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsmon.conf -%dir %{CONFPATH} -%config(noreplace) %{CONFPATH}/nut.conf -%config(noreplace) %{CONFPATH}/ups.conf -%config(noreplace) %{CONFPATH}/upsset.conf -%config(noreplace) %{CONFPATH}/upssched.conf -%{_bindir}/* -/bin/* -%doc %{_mandir}/man5/*.* -%doc %{_mandir}/man8/ups*.* +%dir %{_prefix}/lib/ups %if %suse_version >= 1030 %{_prefix}/lib/pm-utils/sleep.d/99nut %else @@ -433,7 +328,31 @@ %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules -/etc/bash_completion.d/ +%config(noreplace) %{CONFPATH}/hosts.conf +%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.conf +%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsd.users +%config(noreplace) %attr(600,%{USER},root) %{CONFPATH}/upsmon.conf +%dir %{CONFPATH} +%config(noreplace) %{CONFPATH}/nut.conf +%config(noreplace) %{CONFPATH}/ups.conf +%config(noreplace) %{CONFPATH}/upsset.conf +%config(noreplace) %{CONFPATH}/upssched.conf +%dir %{MODELPATH} +%{MODELPATH}/* +%exclude %{MODELPATH}/snmp-ups +%exclude %{MODELPATH}/netxml-ups +%attr(700,%{USER},%{GROUP}) %{STATEPATH} + +%files drivers-net +%defattr(-,root,root) +%{MODELPATH}/snmp-ups +%{MODELPATH}/netxml-ups +%doc %{_mandir}/man8/netxml-ups*.* +%doc %{_mandir}/man8/snmp-ups*.* + +%files -n libupsclient1 +%defattr(-,root,root) +%{_libdir}/*.so.* %files cgi %defattr(-,root,root) @@ -442,15 +361,6 @@ %config(noreplace) %{CONFPATH}/upsstats-single.html %config(noreplace) %{CONFPATH}/upsstats.html -%files hal -%defattr(-,root,root) -%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi -%if %suse_version < 1120 -%{_libdir}/hal/* -%else -%{_prefix}/lib/hal/* -%endif - %files devel %defattr(-,root,root) %{_includedir}/*.h ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.svIMvp/_old 2011-06-20 14:07:22.000000000 +0200 +++ /var/tmp/diff_new_pack.svIMvp/_new 2011-06-20 14:07:22.000000000 +0200 @@ -1,19 +1,11 @@ COnfiguration and use of NUT in SuSE -You have two basic ways to install nut: +NUT in openSUSE comes in several packages: -- nut-hal - HAL addon, which will provide handling of USB UPS devices - via the standard HAL power management, allowing to reuse power - management tools of desktop systems. - It needs no configuration and no special setup. On the other hand, - it supports only locally attached USB UPS. - -- nut-classic - Uses dedicated UPS daemon, which works with all types of - connection, features UPS monitoring and network UPS management. - It is not integrated with desktop power management and you need - dedicated tool for monitoring your UPSes. +- nut - The core package. It features UPS monitoring and network UPS + management. -And two additional packages: +and two additional packages: - nut-drivers-net - two additional drivers for network communication of UPS daemons. You will need for advanced configuration (e. g. if you @@ -22,13 +14,7 @@ - nut-cgi provides support for monitoring UPS web pages using apache web browser. Predefined address is http://localhost/nut/index.html -nut-hal Configuration - -If your device is an USB UPS attached locally, nut-hal needs no -configuration. Otherwise you need to use nut-classic. - - -nut-classic Configuration +nut Configuration NUT is pre-configured to use a local or remote UPS as far as possible. But it still requires a minimal manual configuration before the first ++++++ nut-2.6.0.tar.bz2 -> nut-2.6.1.tar.bz2 ++++++ ++++ 13283 lines of diff (skipped) ++++++ nut.sleep ++++++ --- /var/tmp/diff_new_pack.svIMvp/_old 2011-06-20 14:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.svIMvp/_new 2011-06-20 14:07:23.000000000 +0200 @@ -4,11 +4,12 @@ case "$1" in hibernate) + stopservice upsd + sleep 2 if test -n "$POWERDOWNFLAG" -a -f "$POWERDOWNFLAG" ; then export UPSD_POWERDOWN_CONDITION=1 /etc/init.d/upsd try-powerdown fi - stopservice upsd ;; suspend) stopservice upsd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
