[csw-devel] SF.net SVN: gar:[6920] csw/mgar/pkg/cups/branches
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Oct 20 20:11:20 CEST 2009
Revision: 6920
http://gar.svn.sourceforge.net/gar/?rev=6920&view=rev
Author: wahwah
Date: 2009-10-20 18:11:20 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
cups-1.4.0: Created a branch for 1.4.0 specifically, added testing patches for http://www.cups.org/str.php?L3381
Modified Paths:
--------------
csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile
csw/mgar/pkg/cups/branches/cups-1.4.0/checksums
Added Paths:
-----------
csw/mgar/pkg/cups/branches/cups-1.4.0/
csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch
csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch
Property changes on: csw/mgar/pkg/cups/branches/cups-1.4.0
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile 2009-10-20 00:54:29 UTC (rev 6914)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile 2009-10-20 18:11:20 UTC (rev 6920)
@@ -3,7 +3,7 @@
# $Id$
GARNAME = cups
-GARVERSION = 1.4.1
+GARVERSION = 1.4.0
CATEGORIES = net
define BLURB
@@ -51,7 +51,9 @@
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 += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
+PATCHFILES += 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch
+PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
PREREQUISITE_PKGS = CSWggettext
PREREQUISITE_PKGS += CSWjpeg
Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums 2009-10-20 00:54:29 UTC (rev 6914)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums 2009-10-20 18:11:20 UTC (rev 6920)
@@ -1,8 +1,9 @@
-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
-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
+2fd940524ebf6d6c0c22f4e52e253911 0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch
+0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+dec0baa8c3ec0e171183496da8f24323 CSWcupsclient.preinstall
+ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove
+dec0baa8c3ec0e171183496da8f24323 CSWcupsd.preinstall
+bc5e777d4320cecdd1a64de8035171a8 cups-1.4.0-source.tar.bz2
Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-GNUTLS_E_INVALID_SESSION-to-EIO-in-http_read.patch 2009-10-20 18:11:20 UTC (rev 6920)
@@ -0,0 +1,35 @@
+From 101afaf697b8cbd8d0194febbba3ea94d99086ab Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 20 Oct 2009 15:05:58 +0200
+Subject: [PATCH] Mapping GNUTLS_E_INVALID_SESSION to EIO in http_read_ssl
+
+---
+ cups/http.c | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/cups/http.c b/cups/http.c
+index 840e3fc..47b9c0a 100644
+--- a/cups/http.c
++++ b/cups/http.c
+@@ -2719,7 +2719,17 @@ http_read_ssl(http_t *http, /* I - Connection to server */
+ return (SSL_read((SSL *)(http->tls), buf, len));
+
+ # elif defined(HAVE_GNUTLS)
+- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
++ int bytes;
++ bytes = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
++ if (bytes < 0) {
++ if (bytes == GNUTLS_E_INVALID_SESSION) {
++ errno = EIO; /* Not sure which value to map it to. */
++ } else if (bytes < 0 && !errno) {
++ /* Shouldn't happen! Need a warning or an error, or something similar. */
++ DEBUG_printf(("gnutls_record_recv() returned a negative number but errno=0."));
++ }
++ }
++ return bytes;
+
+ # elif defined(HAVE_CDSASSL)
+ int result; /* Return value */
+--
+1.6.5
+
Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch 2009-10-20 18:11:20 UTC (rev 6920)
@@ -0,0 +1,25 @@
+From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 20 Oct 2009 13:35:40 +0200
+Subject: [PATCH] Fail compilation if no SSL impl chosen
+
+---
+ cups/http.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/cups/http.c b/cups/http.c
+index 8b767c9..840e3fc 100644
+--- a/cups/http.c
++++ b/cups/http.c
+@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http, /* I - Connection to server */
+ }
+
+ return (result);
++# else
++# error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set."
+ # endif /* HAVE_LIBSSL */
+ }
+ #endif /* HAVE_SSL */
+--
+1.6.5
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list