[csw-devel] SF.net SVN: gar:[6911] csw/mgar/pkg/cups/branches/cups-1.4

[wahwah at users.sourceforge.net]

Revision: 6911
          http://gar.svn.sourceforge.net/gar/?rev=6911&view=rev
Author:   wahwah
Date:     2009-10-19 15:17:41 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
cups-1.4.x: Version bump to 1.4.1, added a patch for usb-unix.c

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4/Makefile
    csw/mgar/pkg/cups/branches/cups-1.4/checksums

Added Paths:
-----------
    csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch

Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-19 14:03:35 UTC (rev 6910)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-19 15:17:41 UTC (rev 6911)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = cups
-GARVERSION = 1.4.0
+GARVERSION = 1.4.1
 CATEGORIES = net
 
 define BLURB
@@ -51,6 +51,7 @@
 PATCHFILES  = 0001-cswcups-for-service-name.patch
 PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
 PATCHFILES += 0003-Reference-counting-for-printers-only.patch
+PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
 
 PREREQUISITE_PKGS  = CSWggettext
 PREREQUISITE_PKGS += CSWjpeg

Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-10-19 14:03:35 UTC (rev 6910)
+++ csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-10-19 15:17:41 UTC (rev 6911)
@@ -1,7 +1,8 @@
 1e5e54a2b503cfdeeda1b683bcccab83  download/0001-cswcups-for-service-name.patch
 0da4ea6bf72d61adfc4316a738b90ab5  download/0002-Adding-the-refcount-member-to-mime_type_t.patch
 a80b8543633e2f9b3b1e531ac2289306  download/0003-Reference-counting-for-printers-only.patch
+193912518565c7052724420e7899930b  download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
 dec0baa8c3ec0e171183496da8f24323  download/CSWcupsclient.preinstall
 ca7718998e56c320c08a77cfefe046f6  download/CSWcupsd.postremove
 dec0baa8c3ec0e171183496da8f24323  download/CSWcupsd.preinstall
-bc5e777d4320cecdd1a64de8035171a8  download/cups-1.4.0-source.tar.bz2
+587a58039c112ecb3c932e048c8a7b01  download/cups-1.4.1-source.tar.bz2

Added: csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch	2009-10-19 15:17:41 UTC (rev 6911)
@@ -0,0 +1,25 @@
+From df22eb20fe2b75a3a39384c11fd57194a8977a27 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Mon, 19 Oct 2009 13:22:37 +0100
+Subject: [PATCH] Fix for usb-unix.c, from http://www.cups.org/str.php?L3332
+
+---
+ backend/usb-unix.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/backend/usb-unix.c b/backend/usb-unix.c
+index c749253..8ce92b9 100644
+--- a/backend/usb-unix.c
++++ b/backend/usb-unix.c
+@@ -560,7 +560,7 @@ open_device(const char *uri,		/* I - Device URI */
+  * 'side_cb()' - Handle side-channel requests...
+  */
+ 
+-static void
++static int				/* O - 0 on success, -1 on error */
+ side_cb(int         print_fd,		/* I - Print file */
+         int         device_fd,		/* I - Device file */
+         int         snmp_fd,		/* I - SNMP socket (unused) */
+-- 
+1.6.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.