rpms/cups/FC-5 cups-direct-usb.patch, NONE, 1.1 cups.spec, 1.139, 1.140
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 4 15:20:29 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv14756
Modified Files:
cups.spec
Added Files:
cups-direct-usb.patch
Log Message:
* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).
cups-direct-usb.patch:
usb-unix.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cups-direct-usb.patch ---
--- cups-1.2rc1/backend/usb-unix.c.direct-usb 2006-04-04 15:57:47.000000000 +0100
+++ cups-1.2rc1/backend/usb-unix.c 2006-04-04 15:58:26.000000000 +0100
@@ -431,7 +431,7 @@
if (!strncmp(uri, "usb:/dev/", 9))
#ifdef __linux
- return (-1); /* Do not allow direct devices anymore */
+ return (open(uri + 4, O_RDWR | O_EXCL));
else if (!strncmp(uri, "usb://", 6))
{
/*
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- cups.spec 3 Apr 2006 12:53:44 -0000 1.139
+++ cups.spec 4 Apr 2006 15:20:26 -0000 1.140
@@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2
-Release: 0.2.%{beta}.2.5
+Release: 0.2.%{beta}.2.6
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -40,6 +40,7 @@
Patch17: cups-1.1.19-no_rpath.patch
Patch18: cups-language.patch
Patch19: cups-gnome.patch
+Patch20: cups-direct-usb.patch
Patch22: cups-dest-cache-v2.patch
Patch24: cups-maxlogsize.patch
Patch28: cups-no-propagate-ipp-port.patch
@@ -137,6 +138,7 @@
%patch17 -p1 -b .no_rpath
%patch18 -p1 -b .language
%patch19 -p1 -b .gnome
+%patch20 -p1 -b .direct-usb
%patch22 -p1 -b .dest-cache-v2
%patch24 -p1 -b .maxlogsize
%patch28 -p1 -b .no-propagate-ipp-port
@@ -387,6 +389,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Tue Apr 4 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.6
+- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again (bug #186880).
+
* Sun Apr 2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.5
- Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).
More information about the fedora-cvs-commits
mailing list