rpms/nut/EL-5 nut-2.2.0-trippliteusb_476850.patch, NONE, 1.1 nut.spec, 1.51, 1.52

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/nut/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28565

Modified Files:
	nut.spec 
Added Files:
	nut-2.2.0-trippliteusb_476850.patch 
Log Message:
fix #476850 - tripplite_usb driver segfaults when UPS on battery


nut-2.2.0-trippliteusb_476850.patch:

--- NEW FILE nut-2.2.0-trippliteusb_476850.patch ---
diff -up nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850 nut-2.2.0/drivers/tripplite_usb.c
--- nut-2.2.0/drivers/tripplite_usb.c.trippliteusb_476850	2007-06-23 05:36:15.000000000 +0200
+++ nut-2.2.0/drivers/tripplite_usb.c	2009-01-05 16:41:02.050817936 +0100
@@ -25,7 +25,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#define DRV_VERSION "0.11"
+#define DRV_VERSION "0.11.1"
 
 /* % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % 
  *
@@ -355,8 +355,6 @@ static int reconnect_ups(void)
 		upsdebugx(2, "= device has been disconnected, try to reconnect =");
 		upsdebugx(2, "==================================================");
 
-		upsdrv_cleanup();
-
 		if ((hd = HIDOpenDevice(&udev, &curDevice, reopen_matcher, MODE_REOPEN)) == NULL) {
 			upslogx(LOG_INFO, "Reconnecting to UPS failed; will retry later...");
 			dstate_datastale();
@@ -509,12 +507,10 @@ void usb_comm_fail(int res, const char *
 		case -EBUSY:
 			upslogx(LOG_WARNING, "%s: Device claimed by another process", msg);
 			fatalx(EXIT_FAILURE, "Terminating: EBUSY");
-			upsdrv_cleanup();
 			break;
 
 		default:
 			upslogx(LOG_WARNING, "%s: Device detached? (error %d: %s)", msg, res, usb_strerror());
-			upsdrv_cleanup();
 
 			upslogx(LOG_NOTICE, "Reconnect attempt #%d", ++try);
 			hd = NULL;


Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/EL-5/nut.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nut.spec	9 Sep 2008 15:07:22 -0000	1.51
+++ nut.spec	5 Jan 2009 15:45:51 -0000	1.52
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 5.2%{?dist}
+Release: 6%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 #Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
 Patch4: nut-2.2.0-wrongssl.patch
+Patch5: nut-2.2.0-trippliteusb_476850.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib shadow-utils
 Requires(post): fileutils chkconfig /sbin/service
@@ -90,6 +91,7 @@
 #%patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
 %patch4 -p1 -b .wrongssl
+%patch5 -p1 -b .trippliteusb_476850
 
 %build
 %configure \
@@ -297,6 +299,9 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Mon Jan 05 2009 Michal Hlavinka <mhlavink at redhat.com> 2.2.0-6
+- fix #476850 - tripplite_usb driver segfaults when UPS on battery
+
 * Tue Sep 08 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5.2
 - fix #461574 - add MODEL variable to sysconfig for initscripts compatibility