Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2014-02-18 16:18:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut" Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2012-12-05 14:01:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2014-02-18 16:18:58.000000000 +0100 @@ -1,0 +2,66 @@ +Tue Nov 26 20:48:34 CET 2013 - [email protected] + +- Update to version 2.7.1: + For more see NEWS and UPGRADING in /usr/share/doc/packages/nut. + Potentially incompatible changes: + * First release after the transition from Subversion to Git. + * The linkman:apcsmart[8] driver has been replaced by a new + implementation. There is a new parameter, 'ttymode'. In case + of issues with this new version, users can revert to + apcsmart-old. + * The linkman:nutdrv_qx[8] driver will eventually supersede + blazer_ser and blazer_usb. Options are not exactly the same, + but are documented in the nutdrv_qx man page. + * Mozilla NSS support has been added. + * linkman:upsrw[8] now prints out the maximum size of + variables. + Other changes: + * Added a new driver, nutdrv_qx, for Megatec/Qx devices. This + driver will eventually replace the blazer_ser and blazer_usb + drivers. In particular, it adds support for Voltronic Power + devices. + * Increased USB_TIMEOUT to standards-compliant 5.000 seconds in + most drivers. This should reduce the number of timeouts on + low-speed USB 1.1 devices. + * Added many devices to the HCL. Of particular note are many + Tripp Lite USB HID PDC models which were tested against NUT by + Tripp Lite. + * Reworked some visual elements of the HCL. + * Also increased timeouts and added redundant commands to improve + reliability of mge-utalk driver. + * Added the apcupsd-ups driver to interoperate with apcupsd + installations. + * Added documentation on creating subdrivers for snmp-ups and + nutdrv_qx. + * Added new drivers for the Riello UPS product line + (riello_ser/riello_usb). + * Many improvements to the BCM/XCP. + * Added a few variables to the Powercom HID mappings. + * Updated the apcsmart driver, and renamed the previous driver to + apcsmart-old. + * Fixed the battery percentage calculation in the bestfcom + driver. + * libnutclient has been added as a C++ alternative to + libupsclient. + * Fix shutdown of Eaton HID, using usbhid-ups and mge-shut + * usbhid-ups: final fix for APC Back UPS ES. + * nut-scanner: fix crash + * IPMI support can handle more different versions of FreeIPMI + * Support power supplies scan over the network nut-scanner can + now scan for power supplies with IPMI over LAN. This is + currently limited to IPMI 1.5 only + * Improve systemd integration + * snmp-ups: Fixed a crash on outlet management, and added + delta_ups MIB support. Also fixed mappings for + upsBypassVoltage, upsBypassCurrent, and upsBypassPower in + three-phase IETF MIB. +- Enable FreeIPMI. + +------------------------------------------------------------------- +Tue Jan 29 21:14:30 CET 2013 - [email protected] + +- Turn systemd integration on (nut-systemd-dirs.patch). +- Fix README.SUSE. +- nut-preconfig.patch: Fix UID recommendation. + +------------------------------------------------------------------- Old: ---- nut-2.6.5.tar.gz nut-2.6.5.tar.gz.sig New: ---- nut-2.7.1.tar.gz nut-2.7.1.tar.gz.sig nut-driver nut-monitor nut-server nut-systemd-dirs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.XNDgJ0/_old 2014-02-18 16:18:58.000000000 +0100 +++ /var/tmp/diff_new_pack.XNDgJ0/_new 2014-02-18 16:18:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,8 +20,9 @@ BuildRequires: apache2-devel BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel +BuildRequires: gcc-c++ BuildRequires: gd-devel -BuildRequires: gpg-offline +BuildRequires: libcppunit-devel BuildRequires: libneon-devel BuildRequires: libopenssl-devel BuildRequires: libtool @@ -34,36 +35,48 @@ BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix -# For FreeIPMI support -%if 0%{?ENABLE_IPMI} +%if 0%{?suse_version} > 1230 +%ifarch %{ix86} x86_64 ia64 alpha BuildRequires: freeipmi-devel %endif -%if %suse_version > 1110 +%endif +%if 0%{?suse_version} > 1110 BuildRequires: powerman-devel # For doc build: BuildRequires: asciidoc BuildRequires: dblatex %endif +%if 0%{?suse_version} > 1210 +BuildRequires: systemd-devel +%endif +%if 0%{?suse_version} > 1220 +BuildRequires: gpg-offline +%endif Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) License: GPL-2.0+ Group: Hardware/UPS -Version: 2.6.5 +Version: 2.7.1 Release: 0 Url: http://www.networkupstools.org/ -Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz +Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz Source1: upsd.init Source2: README.SUSE Source3: upsd-early-powerdown.init Source5: nut.firewall.in Source7: nut.sleep -Source8: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz.sig +Source8: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz.sig Source9: %{name}.keyring +Source10: nut-driver +Source11: nut-server +Source12: nut-monitor Patch: nut-preconfig.patch # PATCH-FIX-OPENSUSE nut-hal.patch [email protected] -- Fix hal callouts path. Patch1: nut-hal.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch +# PATCH-FIX-UPSTREAM nut-systemd-dirs.patch [email protected] -- Fix systemd targets. +Patch7: nut-systemd-dirs.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -100,6 +113,11 @@ Enhances: %USBHIDDRIVERS # Package provides the only avalailable driver for other USB UPSes: Supplements: %USBNONHIDDRIVERS +%if %suse_version > 1210 +%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd) +%define systemdsystemdutildir %(pkg-config --variable=systemdutildir systemd) +%systemd_requires +%endif %description Core package of Network UPS Tools. @@ -175,9 +193,11 @@ /usr/share/doc/packages/nut. %prep +%if 0%{?gpg_verify:1} %gpg_verify %{S:8} +%endif %setup -q -cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} . +cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} %{S:10} %{S:11} %{S:12} . mv upsd-early-powerdown.init upsd-early-powerdown %patch %patch1 -p1 @@ -192,6 +212,7 @@ %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif +%patch7 -p1 sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in [ -f docs/nut-qa.txt ] dos2unix docs/nut-qa.txt @@ -204,7 +225,10 @@ --with-all\ --with-dev\ --without-hal\ -%if ! 0%{?ENABLE_IPMI} +%if 0%{?suse_version} <= 1230 + --without-ipmi\ +%endif +%ifnarch %{ix86} x86_64 ia64 alpha --without-ipmi\ %endif %if %suse_version <= 1110 @@ -261,10 +285,15 @@ %{__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/ +# It would be nice to use -m0644, but it will fail on brp-55-boot-scripts +install nut-driver nut-server nut-monitor $RPM_BUILD_ROOT/etc/init.d/ %pre usr/sbin/useradd -r -g %{GROUP} -s /bin/false \ -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : +%if %suse_version > 1210 +%service_add_pre nut-driver.service nut-server.service nut-monitor.service +%endif %post # Be sure that all files are owned by a dedicated user. @@ -307,9 +336,15 @@ rm -f %{_sysconfdir}/sysconfig/smartups # And finally trigger udev to set permissions according to newly installed rules files. /sbin/udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device +%if %suse_version > 1210 +%service_add_post nut-driver.service nut-server.service nut-monitor.service +%endif %preun %{stop_on_removal upsd} +%if %suse_version > 1210 +%service_del_preun nut-driver.service nut-server.service nut-monitor.service +%endif %postun %{restart_on_update upsd} @@ -327,6 +362,9 @@ fi fi %insserv_cleanup +%if %suse_version > 1210 +%service_del_postun nut-driver.service nut-server.service nut-monitor.service +%endif %post -n libupsclient1 -p /sbin/ldconfig @@ -360,7 +398,7 @@ %if %suse_version >= 1030 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %endif -%{_sysconfdir}/init.d/upsd +%{_sysconfdir}/init.d/* %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules @@ -378,6 +416,10 @@ %exclude %{MODELPATH}/snmp-ups %exclude %{MODELPATH}/netxml-ups %attr(700,%{USER},%{GROUP}) %{STATEPATH} +%if %suse_version > 1210 +%{systemdsystemunitdir}/*.service +%{systemdsystemdutildir}/system-shutdown/* +%endif %files drivers-net %defattr(-,root,root) ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.XNDgJ0/_old 2014-02-18 16:18:58.000000000 +0100 +++ /var/tmp/diff_new_pack.XNDgJ0/_new 2014-02-18 16:18:58.000000000 +0100 @@ -42,7 +42,8 @@ (see /usr/lib/ups/driver/ for possible drivers. Each driver has a man page. Many USB UPSes are usbhid-ups.) - Set port key to the device your UPS is connected to, - e.g. /dev/ttyS0 for first serial port (COM1) or /dev/hiddev0 + e.g. /dev/ttyS0 for first serial port (COM1) or + /dev/usb/hiddev0 for USB HID UPS. - Adjust desc key as you want. ++++++ nut-2.6.5.tar.gz -> nut-2.7.1.tar.gz ++++++ ++++ 70622 lines of diff (skipped) ++++++ nut-driver ++++++ #!/bin/false # This is a dummy init script for YaST runlevel editor # https://bugzilla.novell.com/show_bug.cgi?id=801542 # ### BEGIN INIT INFO # Provides: nut-driver # Required-Start: $network $syslog $remote_fs # Should-Start: $time ypbind sendmail # Required-Stop: $network $syslog $remote_fs # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Network UPS Tools - power device driver controller # Description: Network UPS Tools provides remote or local # monitoring of UPS. ### END INIT INFO ++++++ nut-monitor ++++++ #!/bin/false # This is a dummy init script for YaST runlevel editor # https://bugzilla.novell.com/show_bug.cgi?id=801542 # ### BEGIN INIT INFO # Provides: nut-monitor # Required-Start: $network $syslog $remote_fs nut-server # Should-Start: $time ypbind sendmail # Required-Stop: $network $syslog $remote_fs nut-server # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Network UPS Tools - power device monitor and shutdown controller # Description: Network UPS Tools provides remote or local # monitoring of UPS. ### END INIT INFO ++++++ nut-preconfig.patch ++++++ --- /var/tmp/diff_new_pack.XNDgJ0/_old 2014-02-18 16:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XNDgJ0/_new 2014-02-18 16:18:59.000000000 +0100 @@ -35,22 +35,6 @@ + upsmon slave --- conf/upsmon.conf.sample +++ conf/upsmon.conf.sample -@@ -21,13 +21,13 @@ - # user, since it creates an opportunity for an attack by changing the - # SHUTDOWNCMD to something malicious. - # --# For best results, you should create a new normal user like "nutmon", -+# For best results, you should create a new normal user like "@UPSD_USER@", - # and make it a member of a "nut" group or similar. Then specify it - # here and grant read access to the upsmon.conf for that group. - # - # This user should not have write access to upsmon.conf. - # --# RUN_AS_USER nutmon -+# RUN_AS_USER @UPSD_USER@ - - # -------------------------------------------------------------------------- - # MONITOR <system> <powervalue> <username> <password> ("master"|"slave") @@ -84,6 +84,8 @@ # MONITOR [email protected] 1 upsmon secretpass slave # MONITOR myups@localhost 1 upsmon pass master (or slave) ++++++ nut-server ++++++ #!/bin/false # This is a dummy init script for YaST runlevel editor # https://bugzilla.novell.com/show_bug.cgi?id=801542 # ### BEGIN INIT INFO # Provides: nut-server # Required-Start: $network $syslog $remote_fs nut-driver # Should-Start: $time ypbind sendmail # Required-Stop: $network $syslog $remote_fs nut-driver # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Network UPS Tools - power devices information server # Description: Network UPS Tools provides remote or local # monitoring of UPS. ### END INIT INFO ++++++ nut-systemd-dirs.patch ++++++ Index: nut-2.6.5/configure.in =================================================================== --- nut-2.6.5.orig/configure.in +++ nut-2.6.5/configure.in @@ -986,9 +986,13 @@ dnl Override installation directory, wit dnl prefix. This is needed for 'distcheck*' targets, otherwise dnl files will try to get intalled to the actual system directories if test -n "${systemdsystemunitdir}"; then - systemdsystemshutdowndir="${libdir}/systemd/system-shutdown" + systemdutildir=`$PKG_CONFIG --variable=systemdutildir systemd` + if test -n "${systemdutildir}"; then + systemdsystemshutdowndir="${systemdutildir}/system-shutdown" + else + systemdsystemshutdowndir="${systemdsystemunitdir}/system-shutdown" + fi AC_MSG_RESULT(using ${systemdsystemunitdir}) - systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`" else AC_MSG_RESULT(no) fi ++++++ upsd.init ++++++ --- /var/tmp/diff_new_pack.XNDgJ0/_old 2014-02-18 16:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XNDgJ0/_new 2014-02-18 16:18:59.000000000 +0100 @@ -29,7 +29,7 @@ # System startup script for NUT UPS daemon # # LSB compatible service control script; see http://www.linuxbase.org/spec/ -# +# ### BEGIN INIT INFO # Provides: ups # Required-Start: $network $syslog $remote_fs @@ -38,9 +38,11 @@ # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: UPS monitoring software (remote/local) +# Short-Description: UPS monitoring software (deprecated, remote/local) # Description: Network UPS Tools provides remote or local # monitoring of UPS. +# Deprecated. Please disable this service and enable nut-monitor +# and/or nut-server systemd services instead. ### END INIT INFO # # Note on runlevels: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
