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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 75 insertions, 9 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/Manifest b/net-print/cups/Manifest
index f01ce4e6d643..9cc12fbab1eb 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,18 +17,19 @@ AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860
 AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
 AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
 AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
+AUX cups-1.4.6-web-hang.patch 1749 RMD160 ff8d4cfa10a5de5a911c8672313904f50b13fd0f SHA1 f37a3fb7d71a6d56bbb3e5e7a8cf74ca8cb19276 SHA256 f49cef2ce1f2eecdd8ee07d85f306a19375f6d48510763aa51e96a0c54ad27c5
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
-EBUILD cups-1.4.6.ebuild 6238 RMD160 2f1102bcc99574bd5588fb97b842345c451df7cb SHA1 501d98c577bbdc5d876b0463d00a14711d0af6db SHA256 ce10e5f1586ec0b50623e9e9c364c5f18d46e03e3a9974f4cde34910e669495e
-MISC ChangeLog 60949 RMD160 5281f7440e70984ba63da384ec731453d228b8f6 SHA1 ab7f089ef8d7e01a9e7fe7befe57c90791d406ed SHA256 0f0f249c47a2e3caac1e68467e5b82ca1c031e3941052fafe2aaab01b6d977ee
+EBUILD cups-1.4.6-r1.ebuild 6349 RMD160 5631df63dac50c6285004a6b47a05e24473c6be7 SHA1 fc1b8762bc9a4147bbfa026306f4c7c821edf07e SHA256 5def3cc030593055a24b51e86d4e3afc262d27b3c77c18db2861491bad9cb003
+MISC ChangeLog 61213 RMD160 0a04d7b0e95913609fb8a9db8e9240b9e89c3617 SHA1 6508cfbbe91eb6d926d1d03d81e8728e756e243a SHA256 e16fa8133b646acb6dc5cb554091f30123f592f51df65d32f39cda3b9ba3e06e
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28Jm4ACgkQHB6c3gNBRYcOOQCggPgCZtL5Ut4NEypZE5jxuuye
-QfgAniEoNZKG8QDJz9eD3AAScMaW966P
-=K1wY
+iEYEARECAAYFAk28LS4ACgkQHB6c3gNBRYfRngCcCnecYmv/9sLpYmCLDThmLX4i
+HiUAnjyV2tCykOZpXMkCxLMfAjQGp/CA
+=ZHhu
 -----END PGP SIGNATURE-----
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);
+ }
+ 
+