rpms/cups/FC-5 cups-str2061.patch,NONE,1.1 cups.spec,1.226,1.227

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6752

Modified Files:
	cups.spec 
Added Files:
	cups-str2061.patch 
Log Message:
* Mon Oct 30 2006 Tim Waugh <twaugh at redhat.com>
- Fixed support for /dev/ttyUSB devices (bug #212577, STR #2061).
- Resolves: rhbz#212577

cups-str2061.patch:
 serial.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE cups-str2061.patch ---
--- cups-1.2.5/backend/serial.c.str2061	2006-10-30 16:46:28.000000000 +0000
+++ cups-1.2.5/backend/serial.c	2006-10-30 16:46:30.000000000 +0000
@@ -778,6 +778,14 @@
       printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
              device, i + 1);
     }
+
+    sprintf(device, "/dev/ttyUSB%d", i);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+    {
+	    close(fd);
+	    printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
+		   device, i + 1);
+    }
   }
 
   for (i = 0; i < 64; i ++)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- cups.spec	30 Oct 2006 16:51:19 -0000	1.226
+++ cups.spec	30 Oct 2006 16:52:07 -0000	1.227
@@ -39,6 +39,7 @@
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
 Patch42: cups-str2056.patch
+Patch43: cups-str2061.patch
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
@@ -133,6 +134,7 @@
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
 %patch42 -p1 -b .str2056
+%patch43 -p1 -b .str2061
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
 autoconf
@@ -407,6 +409,7 @@
 
 %changelog
 * Mon Oct 30 2006 Tim Waugh <twaugh at redhat.com>
+- Fixed support for /dev/ttyUSB devices (bug #212577, STR #2061).
 - Fixed parallel backend (bug #213021, STR #2056).
 
 * Mon Oct 23 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-1.1