Add patch which fixes bug #285003

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 341a4374cbc6..c4bf9e15e52f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.365 2009/09/13 10:57:01 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.366 2009/09/17 15:36:38 lack Exp $
+
+  17 Sep 2009; Jim Ramsay <lack@gentoo.org> cups-1.4.1.ebuild,
+  +files/cups-1.4.1-usb-function-decl.patch:
+  Add patch which fixes bug #285003
 
 *cups-1.4.1 (13 Sep 2009)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0a37d3ff56c8..bc84f2c7de9e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -3,6 +3,7 @@ AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f38
 AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
 AUX cups-1.3.9-CVE-2008-5286.patch 761 RMD160 7abe5d746cc2c8135e946de492b767137204345a SHA1 1e904c63e5bb2ef2e6f9792e3b2c3bcb89cdc6e8 SHA256 e85dc13164dd1c7b7fa978aeb5b6df886d9595319aab5fadde57e35d0259aee3
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
+AUX cups-1.4.1-usb-function-decl.patch 767 RMD160 12c0bc2ff991f2c0edb4be92fde4db58116b6ca5 SHA1 9b1486f153cc32ee206d927d7d186c76099a7cef SHA256 dc32eb0658dbd263b6361ca6d55bf977fb04b604042041987db69ffb2f840e41
 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.10-source.tar.bz2 3778970 RMD160 9c8f5366f84b5f9087f7a29bace677db309a933f SHA1 48689f07104106216d35198cc90ed56df33faf38 SHA256 9701a545a6a05a991beeb49b41fbb4d450c3bdbb4eb74b132b0d2988640bb566
@@ -10,6 +11,6 @@ DIST cups-1.3.11-source.tar.bz2 3799424 RMD160 aa263fe29350cee307bbd72ef2f5cb061
 DIST cups-1.4.1-source.tar.bz2 4449577 RMD160 d6db8ff3c7b0e56e147d227dcac0c8ca92f190cf SHA1 e53cadf8d9fa5b52b224fc29364a879feb0f3508 SHA256 cff66f14ca2099c977d693136b8f1b4c5d2d66e4471d67fa4114653852c2d3ba
 EBUILD cups-1.3.10-r2.ebuild 8327 RMD160 c57cc5891706083bd14d5744f2ac88ffe521b3a1 SHA1 7ff39f3f4617d8fbc84f54a5e066683f3aa1637c SHA256 2e41ddbc8507ae58c7147b05e2bf1eef95f1e0b0da969a245f978f8830c6fa54
 EBUILD cups-1.3.11.ebuild 8335 RMD160 33780184fe8b641b4524233241b6ceaa3de2c753 SHA1 9d91933399d990bc7cb188e801f857bf52810b89 SHA256 7896241625562878e3a38c32e34c95b277d5233543493151b9f7e1b2d0a00462
-EBUILD cups-1.4.1.ebuild 5076 RMD160 23cd6b10a5d2f887d6ef620a20ec1f43b764422c SHA1 4bed8485b37b0017e078563e5c0b5d964812b233 SHA256 5d71e839df3e359396876267601a5cad62627dfd2202a2aa6d38c1fb9dd292d8
-MISC ChangeLog 54102 RMD160 4612b1e732bb0f5b5f605795bf89a4436ebda90e SHA1 dbaf9d06665ca511b87c90b455d3590377c398f8 SHA256 a7098d8189b4a605c2ac338681095fdcf1f863ca7194d25a9c73fd53041e4b98
+EBUILD cups-1.4.1.ebuild 5133 RMD160 e13cd2960602d473a678516f341ff5dd1e107c3f SHA1 0ba1098ff2ae0883fe2d2699cea76227ef0bb2f0 SHA256 68bc06ea2102efd12a18e6926fb363c0f0e160cfd5884353b0baf351016b6e15
+MISC ChangeLog 54246 RMD160 3c281c87610222b59e9aa0b75c17b8a40b347e00 SHA1 07775fb7ae35daae8ef5f2df21d49928b908597a SHA256 799c4037a0f9a29f2f70b37ae31229503e6c26d63dd4b8cbd6779860ae1f4dac
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.4.1.ebuild b/net-print/cups/cups-1.4.1.ebuild
index 1a0643cac600..7496ff8715a5 100644
--- a/net-print/cups/cups-1.4.1.ebuild
+++ b/net-print/cups/cups-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.1.ebuild,v 1.1 2009/09/13 10:57:01 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.1.ebuild,v 1.2 2009/09/17 15:36:38 lack Exp $
 
 EAPI="2"
 
@@ -66,6 +66,7 @@ pkg_setup() {
 src_prepare() {
 	# create a missing symlink to allow https printing via IPP, bug #217293
 	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
+	epatch "${FILESDIR}/${PN}-1.4.1-usb-function-decl.patch"
 }
 
 src_configure() {
diff --git a/net-print/cups/files/cups-1.4.1-usb-function-decl.patch b/net-print/cups/files/cups-1.4.1-usb-function-decl.patch
new file mode 100644
index 000000000000..3953d92f86da
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.1-usb-function-decl.patch
@@ -0,0 +1,25 @@
+From 484851e02cc5a9b702e0f226f20a0d33325d9dee Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Mon, 14 Sep 2009 17:34:36 +0100
+Subject: [PATCH] Fixed side_cb function declaration in usb-unix.c.
+
+---
+ 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 c47910d..a00f1ad 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
+ side_cb(int         print_fd,		/* I - Print file */
+         int         device_fd,		/* I - Device file */
+         int         snmp_fd,		/* I - SNMP socket (unused) */
+-- 
+1.6.4.2
+