Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Mon Aug 10 18:20:24 CEST 2009. -------- --- nut/nut.changes 2009-07-14 10:03:56.000000000 +0200 +++ nut/nut.changes 2009-08-07 15:24:46.000000000 +0200 @@ -1,0 +2,38 @@ +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. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nut-2.2.2.tar.bz2 nut-intptr.patch nut-libtool.patch New: ---- nut-2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.A9IAet/_old 2009-08-10 18:19:16.000000000 +0200 +++ /var/tmp/diff_new_pack.A9IAet/_new 2009-08-10 18:19:16.000000000 +0200 @@ -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. # @@ -18,7 +18,7 @@ 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: BuildRequires: pm-utils License: GPL v2 or later @@ -27,8 +27,8 @@ Obsoletes: smartups Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version: 2.2.2 -Release: 71 +Version: 2.4.1 +Release: 1 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -41,8 +41,6 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch -Patch8: nut-libtool.patch -Patch11: nut-intptr.patch Patch12: nut-hal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown @@ -60,11 +58,12 @@ %define QUOTE " %define BACKSLASH \\ # 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: -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: -Supplements: %(set -x ; echo %{QUOTE}%{USBDRIVERS}%{QUOTE} | sed '/^HALD-ADDON-USBHID-UPS=/d;s/^.*=//' | tr '%{BACKSLASH}n' ' ') +Supplements: %USBNONHIDDRIVERS %description Core package of Network UPS Tools. @@ -227,9 +226,7 @@ %if %suse_version < 1030 %patch6 -R %endif -%patch8 sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample -%patch11 %if %suse_version > 1030 %patch12 %endif @@ -240,7 +237,7 @@ %build autoreconf -f -i -%configure --disable-static --with-pic --libexecdir=%_prefix/lib \ +%configure --disable-static --with-pic --libexecdir=%_prefix/lib\ --sysconfdir=%{CONFPATH}\ --datadir=%{_datadir}/nut\ --with-all\ @@ -294,6 +291,8 @@ mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/ mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut %{__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 usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ @@ -406,6 +405,7 @@ %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 @@ -429,6 +429,7 @@ %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/*.rules +/etc/bash_completion.d/ %files cgi %defattr(-,root,root) ++++++ nut-2.2.2.tar.bz2 -> nut-2.4.1.tar.bz2 ++++++ ++++ 114458 lines of diff (skipped) ++++++ nut-hal.patch ++++++ --- /var/tmp/diff_new_pack.A9IAet/_old 2009-08-10 18:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.A9IAet/_new 2009-08-10 18:19:18.000000000 +0200 @@ -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 -@@ -66,7 +66,7 @@ if test -z "${nut_have_libhal_seen}"; th - if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal") +@@ -79,6 +79,11 @@ + if (test -z "$HAL_CALLOUTS_PATH") then - # For Debian -- HAL_CALLOUTS_PATH="${libdir}/hal" -+ HAL_CALLOUTS_PATH="${prefix}/lib/hal" + # fallback to detecting the right path ++ if (test -d "${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}) - else # For RedHat - if (test -d "/usr/libexec") + fi ++++++ nut-preconfig.patch ++++++ --- /var/tmp/diff_new_pack.A9IAet/_old 2009-08-10 18:19:18.000000000 +0200 +++ /var/tmp/diff_new_pack.A9IAet/_new 2009-08-10 18:19:19.000000000 +0200 @@ -19,10 +19,10 @@ + desc = "Local UPS" --- 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: # - # MONITOR myups@myhost 1 monuser pass master (or slave) + # MONITOR myups@localhost 1 upsmon pass master (or slave) + +[upsmaster] + password = @UPSD_INITIAL_MASTER_PASSWORD@ @@ -51,9 +51,9 @@ # -------------------------------------------------------------------------- # MONITOR <system> <powervalue> <username> <password> ("master"|"slave") -@@ -83,6 +83,8 @@ - # MONITOR myups@bigserver 1 monmaster blah master +@@ -84,6 +84,8 @@ # 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 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org