Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt dependency and cgi hangup.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 69 insertions, 4 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 87102a5cd828..6b9afd014b6d 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.407 2011/04/30 15:10:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.408 2011/04/30 15:39:44 scarabeus Exp $
+
+*cups-1.4.6-r1 (30 Apr 2011)
+
+  30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cups-1.4.6.ebuild,
+  +cups-1.4.6-r1.ebuild, +files/cups-1.4.6-web-hang.patch:
+  Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt
+  dependency and cgi hangup.
 
   30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.3.11-r4.ebuild:
   Just enforce cups useflag to be enabled on ghostscript.cd
diff --git a/net-print/cups/cups-1.4.6.ebuild b/net-print/cups/cups-1.4.6-r1.ebuild
index 09331c95436d..003299e64e28 100644
--- a/net-print/cups/cups-1.4.6.ebuild
+++ b/net-print/cups/cups-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.3 2011/04/07 22:26:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.1 2011/04/30 15:39:44 scarabeus Exp $
 
 EAPI=3
 
@@ -26,7 +26,6 @@ done
 
 RDEPEND="
 	app-text/libpaper
-	dev-libs/libgcrypt
 	acl? (
 		kernel_linux? (
 			sys-apps/acl
@@ -44,7 +43,10 @@ RDEPEND="
 	png? ( >=media-libs/libpng-1.4.3 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
-		gnutls? ( net-libs/gnutls )
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
@@ -91,6 +93,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch"
 	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
+	# interface hangs using some browsers, bug #325871
+	epatch "${FILESDIR}/${PN}-1.4.6-web-hang.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
diff --git a/net-print/cups/files/cups-1.4.6-web-hang.patch b/net-print/cups/files/cups-1.4.6-web-hang.patch
new file mode 100644
index 000000000000..6ccf05ab1718
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.6-web-hang.patch
@@ -0,0 +1,54 @@
+Index: cgi-bin/html.c
+===================================================================
+--- cgi-bin/html.c	(revision 9428)
++++ cgi-bin/html.c	(working copy)
+@@ -1,9 +1,9 @@
+ /*
+  * "$Id: cups-1.4.6-web-hang.patch,v 1.1 2011/04/30 15:39:45 scarabeus Exp $"
+  *
+- *   HTML support functions for the Common UNIX Printing System (CUPS).
++ *   HTML support functions for CUPS.
+  *
+- *   Copyright 2007-2009 by Apple Inc.
++ *   Copyright 2007-2011 by Apple Inc.
+  *   Copyright 1997-2006 by Easy Software Products.
+  *
+  *   These coded instructions, statements, and computer programs are the
+@@ -208,31 +208,13 @@
+ int					/* O - 1 if multi-part supported, 0 otherwise */
+ cgiSupportsMultipart(void)
+ {
+-  const char	*user_agent;		/* User-Agent string */
+-  static int	supports_multipart = -1;/* Cached value */
++ /*
++  * Too many bug reports for browsers that don't support it, and too much pain
++  * to whitelist known-good browsers, so for now we just punt on multi-part
++  * support... :(
++  */
+ 
+-
+-  if (supports_multipart < 0)
+-  {
+-   /*
+-    * CUPS STR #3049: Apparently some browsers don't support multi-part
+-    * documents, which makes them useless for many web sites.  Rather than
+-    * abandoning those users, we'll offer a degraded single-part mode...
+-    *
+-    * Currently we know that anything based on Gecko, MSIE, and Safari all
+-    * work.  We'll add more as they are reported/tested.
+-    */
+-
+-    if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
+-        (strstr(user_agent, " Gecko/") != NULL ||
+-	 strstr(user_agent, " MSIE ") != NULL ||
+-	 strstr(user_agent, " Safari/") != NULL))
+-      supports_multipart = 1;
+-    else
+-      supports_multipart = 0;
+-  }
+-
+-  return (supports_multipart);
++  return (0);
+ }
+ 
+