Hello community, here is the log from the commit of package nut for openSUSE:11.3 checked in at Mon Jun 20 23:48:16 CEST 2011.
-------- --- old-versions/11.3/all/nut/nut.changes 2009-08-07 15:24:46.000000000 +0200 +++ 11.3/nut/nut.changes 2011-06-20 21:25:59.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jun 14 20:10:53 CEST 2011 - [email protected] + +- Fixed command order during hibernate to prevent UPS communication + locks and failures (bnc#660236). + +------------------------------------------------------------------- +Fri Mar 18 13:51:05 MSK 2011 - [email protected] + +- Fixed: + * nut-powercom.c.patch: allow redefining types[type].name in powercom.c only if type not defined in config file. + Needed for correct work with IMP-425AP. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/nut Destination is old-versions/11.3/UPDATES/all/nut calling whatdependson for 11.3-i586 New: ---- nut-powercom.c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.SoNSkf/_old 2011-06-20 23:19:03.000000000 +0200 +++ /var/tmp/diff_new_pack.SoNSkf/_new 2011-06-20 23:19:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package nut (Version 2.4.1) +# spec file for package nut # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -28,7 +28,7 @@ Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.4.1 -Release: 1 +Release: 6.<RELEASE2> Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -42,6 +42,7 @@ Patch4: nut-powersave.patch Patch6: nut-udev.patch Patch12: nut-hal.patch +Patch13: nut-powercom.c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown Requires: nut-package = %{version} @@ -230,6 +231,7 @@ %if %suse_version > 1030 %patch12 %endif +%patch13 %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif ++++++ nut-powercom.c.patch ++++++ --- drivers/powercom.c 2009-02-17 12:20:48.000000000 +0300 +++ drivers/powercom.c 2010-03-02 15:48:25.354735038 +0300 @@ -852,21 +852,30 @@ /* setup flow control */ types[type].flowControl.setup_flow_control(); - if (!strncmp(types[type].name, "BNT",3) || !strcmp(types[type].name, "KIN") || !strcmp(types[type].name, "IMP")){ + if (getval("type") == NULL){ if (!ups_getinfo()) return; if (raw_data[UPSVERSION]==0xFF){ types[type].name="IMP"; - model=IMPmodels[raw_data[MODELNUMBER]/16]; } if (raw_data[MODELNAME]==0x42){ if (!strcmp(types[type].name, "BNT-other")) types[type].name="BNT-other"; else types[type].name="BNT"; - model=BNTmodels[raw_data[MODELNUMBER]/16]; } if (raw_data[MODELNAME]==0x4B){ types[type].name="KIN"; + } + } + if (!strncmp(types[type].name, "BNT",3) || !strcmp(types[type].name, "KIN") || !strcmp(types[type].name, "IMP")){ + if (!ups_getinfo()) return; + if (!strcmp(types[type].name, "IMP")){ + model=IMPmodels[raw_data[MODELNUMBER]/16]; + } + if (!strncmp(types[type].name, "BNT",3)){ + model=BNTmodels[raw_data[MODELNUMBER]/16]; + } + if (!strcmp(types[type].name, "KIN")){ model=KINmodels[raw_data[MODELNUMBER]/16]; } linevoltage=voltages[raw_data[MODELNUMBER]%16]; ++++++ nut.sleep ++++++ --- /var/tmp/diff_new_pack.SoNSkf/_old 2011-06-20 23:19:04.000000000 +0200 +++ /var/tmp/diff_new_pack.SoNSkf/_new 2011-06-20 23:19:04.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]
