rpms/avarice/devel avarice-gcc44.patch,1.1,1.2 avarice.spec,1.7,1.8

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/avarice/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10542

Modified Files:
	avarice-gcc44.patch avarice.spec 
Log Message:
update patch0 from upstream

avarice-gcc44.patch:
 jtag2usb.cc |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: avarice-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/avarice/devel/avarice-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- avarice-gcc44.patch	29 Jan 2010 17:23:38 -0000	1.1
+++ avarice-gcc44.patch	22 Jun 2010 16:53:41 -0000	1.2
@@ -1,12 +1,40 @@
 diff -Naur avarice-2.10/src/jtag2usb.cc avarice-2.10-mod/src/jtag2usb.cc
 --- avarice-2.10/src/jtag2usb.cc	2007-02-18 00:41:46.000000000 +0200
-+++ avarice-2.10-mod/src/jtag2usb.cc	2010-01-29 08:33:08.000000000 +0200
-@@ -95,7 +95,7 @@
++++ avarice-2.10-mod/src/jtag2usb.cc	2010-06-22 17:58:04.000000000 +0300
+@@ -70,7 +70,7 @@
+   struct usb_bus *bus;
+   struct usb_device *dev;
+   usb_dev_handle *udev;
+-  char *serno, *cp2;
++  char *devnamecopy, *serno, *cp2;
+   u_int16_t pid;
+   size_t x;
+ 
+@@ -85,6 +85,9 @@
+       break;
+     }
+ 
++    devnamecopy = new char[x = strlen(jtagDeviceName) + 1];
++    memcpy(devnamecopy, jtagDeviceName, x);
++
+   /*
+    * The syntax for usb devices is defined as:
+    *
+@@ -95,7 +98,7 @@
     * right-to-left, so only the least significant nibbles need to be
     * specified.
     */
 -  if ((serno = strchr(jtagDeviceName, ':')) != NULL)
-+  if ((serno = strchr((char *)jtagDeviceName, ':')) != NULL)
++  if ((serno = strchr(devnamecopy, ':')) != NULL)
      {
        /* first, drop all colons there if any */
        cp2 = ++serno;
+@@ -159,6 +162,8 @@
+ 	    }
+ 	}
+     }
++
++  delete devnamecopy;
+   if (!found)
+   {
+     printf("did not find any%s USB device \"%s\"\n",


Index: avarice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avarice/devel/avarice.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- avarice.spec	22 Jun 2010 09:52:34 -0000	1.7
+++ avarice.spec	22 Jun 2010 16:53:41 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           avarice
 Version:        2.10
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Program for interfacing the Atmel JTAG ICE to GDB
 
 Group:          Applications/Engineering
@@ -45,6 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 22 2010 Lucian Langa <cooly at gnome.eu.org> - 2.10-4
+- use upstream patch0 to fix gcc issues
+
+* Tue Jun 22 2010 Lucian Langa <cooly at gnome.eu.org> - 2.10-3
+- bump rel to have a clean upgrade path
+
 * Tue Jun 22 2010 Lucian Langa <cooly at gnome.eu.org> - 2.10-2
 - add libusb-devel as BR (#483709)