[csw-devel] SF.net SVN: gar:[7248] csw/mgar/pkg/cups/trunk

[wahwah at users.sourceforge.net]

Revision: 7248
          http://gar.svn.sourceforge.net/gar/?rev=7248&view=rev
Author:   wahwah
Date:     2009-11-12 16:56:46 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
cups: Upgrade to 1.4.2

Modified Paths:
--------------
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/cups/trunk/checksums

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

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2009-11-12 16:23:05 UTC (rev 7247)
+++ csw/mgar/pkg/cups/trunk/Makefile	2009-11-12 16:56:46 UTC (rev 7248)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = cups
-GARVERSION = 1.4.1
+GARVERSION = 1.4.2
 CATEGORIES = net
 
 define BLURB
@@ -51,7 +51,6 @@
 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
 PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
 PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
 PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch

Modified: csw/mgar/pkg/cups/trunk/checksums
===================================================================
--- csw/mgar/pkg/cups/trunk/checksums	2009-11-12 16:23:05 UTC (rev 7247)
+++ csw/mgar/pkg/cups/trunk/checksums	2009-11-12 16:56:46 UTC (rev 7248)
@@ -1,11 +1,11 @@
-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
-bbf0295c76cd06b5311ac3a3467fd431  download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
-0dd35cc0938696577104852781ec1df6  download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch
-44ff410e237d6f4f9f0fe650ba2c7fa0  download/0007-Solaris-zone-support-in-init-script.patch
-cf6a3fe902545aac1ab2303e41c08a3e  download/CSWcupsclient.preinstall
-ca7718998e56c320c08a77cfefe046f6  download/CSWcupsd.postremove
-cf6a3fe902545aac1ab2303e41c08a3e  download/CSWcupsd.preinstall
-587a58039c112ecb3c932e048c8a7b01  download/cups-1.4.1-source.tar.bz2
+1e5e54a2b503cfdeeda1b683bcccab83  0001-cswcups-for-service-name.patch
+0da4ea6bf72d61adfc4316a738b90ab5  0002-Adding-the-refcount-member-to-mime_type_t.patch
+a80b8543633e2f9b3b1e531ac2289306  0003-Reference-counting-for-printers-only.patch
+193912518565c7052724420e7899930b  0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
+bbf0295c76cd06b5311ac3a3467fd431  0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
+0dd35cc0938696577104852781ec1df6  0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+44ff410e237d6f4f9f0fe650ba2c7fa0  0007-Solaris-zone-support-in-init-script.patch
+cf6a3fe902545aac1ab2303e41c08a3e  CSWcupsclient.preinstall
+ca7718998e56c320c08a77cfefe046f6  CSWcupsd.postremove
+cf6a3fe902545aac1ab2303e41c08a3e  CSWcupsd.preinstall
+d95e2d588e3d36e563027a963b117b1b  cups-1.4.2-source.tar.bz2

Deleted: csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch	2009-11-12 16:23:05 UTC (rev 7247)
+++ csw/mgar/pkg/cups/trunk/files/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch	2009-11-12 16:56:46 UTC (rev 7248)
@@ -1,25 +0,0 @@
-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.