Copy in changes from portage.

7 files changed, 187 insertions, 69 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e0d1fed..e12a376 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.4.4 (23 Jun 2010)
+*cups-1.3.11-r2 (23 Jun 2010)
+
+  23 Jun 2010; Daniel Solano Gómez <gentoo@sattvik.com>
+  -cups-1.3.10-r2.ebuild, cups-1.3.11-r1.ebuild, +cups-1.3.11-r2.ebuild,
+  +files/cups-1.3.11-str3200.patch, +files/cups-1.4.2-str3200.patch,
+  -cups-1.4.3.ebuild, +cups-1.4.4.ebuild:
+  Copy in changes from portage.
+
 *cups-1.4.3 (27 Apr 2010)
 
   27 Apr 2010; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.1.ebuild,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 388c47e..4d313fd 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,18 +1,19 @@
 AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
 AUX cups-1.3.10-str3178.patch 888 RMD160 ff061fc3500960f441c59896cdfe421d5f47f386 SHA1 fac5361b1172aba167d48988f874faa6faf1554a SHA256 e6550fad17017ac6897e6e9c70a4aafaaec5473c05a19e9e50277293cdc6aac6
+AUX cups-1.3.11-str3200.patch 1782 RMD160 6c9134d1bc90650b882e167a5ae118d0f239b7ae SHA1 adb5b0ef222ad5beb2424bcb93a3c891af6a744e SHA256 2ae6d48ce7071051120740d654787be1bba0258752f4844f55a18f8e03e062e6
 AUX cups-1.3.11-str3367-security-1.3v2.patch 12834 RMD160 e770139528cbdf918f5c9073fbea8b31f30cac0f SHA1 81825028af8021aff2e67a36d8e9aa71cbbb42f4 SHA256 d4d770ce17855293348059451909fecbcc9e968d6731ac73b8d81927e2afe134
 AUX cups-1.3.11-str3401-security-1.3v2-regression.patch 871 RMD160 bb08b55e8d61341e9eeecc8fe99ba743d38500dd SHA1 33a919f4ef5de3c780f6f35e68d096ccf8371718 SHA256 ab9f24c05a422995b9ee274f36ffa0a9a6dca4d55fde4830a31201d1e61bd756
 AUX cups-1.3.7-backend-https.patch 450 RMD160 9a1ad48d2be40c89510ccc512649f0a2eb5543b0 SHA1 d3dd55fcdee47855d6b7c1443adb6c2b3d8c9cdb SHA256 060f929ae3eae5dc411ce6352a0d50c3296b013974f034fc2ad8d6bb0c81b45a
 AUX cups-1.3.8-group_fix.patch 1755 RMD160 c26e4b0fb3d47b022200c4220807c0116038f0a6 SHA1 583055cdbad6bf32f380e3a2d03a933850e3db4e SHA256 c0160400b885f2c4b1a656473d01074a497c812db8effb54094d2fa936dd2c40
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.1-group_fix.patch 1752 RMD160 b2e8fde6ddc0e385e85ced4e38668bea23cde800 SHA1 241fa8f1220976cd69c447bc276d17d8808c8eed SHA256 625a5abff28d58ef0f747781777535549ddba77dd36f1cf72c3aea7a4fdafaab
+AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
 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
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
-DIST cups-1.4.3-source.tar.bz2 4461101 RMD160 6c5ab282405d6a1132163c727583f3a572307d88 SHA1 0dd9e3d709614d26cce77728b9263556c94c9559 SHA256 47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97
-EBUILD cups-1.3.10-r2.ebuild 8377 RMD160 f8fc53e54687346ff6d199945297e13e47c34a4a SHA1 921b568a256079876fd5d0f10b9f1a2185cb8cf0 SHA256 1fdbd5e6130d71cdad5c33b5ce21a363882503a95295d04a19778a70e167df71
-EBUILD cups-1.3.11-r1.ebuild 8596 RMD160 b0d66238eb7208a6a7e6a90d2840579efaeb8ef5 SHA1 6cd1234623797c01391176cb8947dbeb4873a579 SHA256 06473c41740c28f1dd655faa4e781519cc6b7888fbbb8c9812ddde3db74d71a3
-EBUILD cups-1.4.3.ebuild 5401 RMD160 c25fce6488bd72dc0f9eabb17688b3c7072da79b SHA1 9c4b67e5e4ae736333aebec481b9aa4fd67b8c86 SHA256 28b1473f495412940f0163b0bf9388d9789d9f4d777ccd272cac15001c277623
-MISC ChangeLog 681 RMD160 442c66d470742d1af2a2b0612e3c0cc3c1fb69e3 SHA1 4ac032055cb605ea25e9a2920a4fa8b2ad12451d SHA256 1112b4995c3eac3d7c04ca8937fd3b9caa991a466aba04756f183c865ed67edc
+DIST cups-1.4.4-source.tar.bz2 4472741 RMD160 1f486acda02e83b6824f8ca33b74c02ff3f01994 SHA1 3e179c007fa6cd6874b60ff18a6f48070547a00a SHA256 d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3
+EBUILD cups-1.3.11-r1.ebuild 8635 RMD160 d5f7b48e00bf6a290302b8f9dbf94495d4f5cc86 SHA1 c725476e845d59bfaf7e42e88d675fa99ef8d76b SHA256 71828af6b791d933c5e1b184d553d754c3b88ef9601426e9ba2f22b1e2e9408d
+EBUILD cups-1.3.11-r2.ebuild 8841 RMD160 382a8b8b898b5f8a0f8e351177b6dd76c39020d4 SHA1 0826eb4d361a0d64913254a6d6de17c5fe402744 SHA256 73a092a94de27ac5e6fd627434e31ffa8962e846060ebf9d1409ec044abdb76c
+EBUILD cups-1.4.4.ebuild 5400 RMD160 90b06cbfee318ca5cf9739de5d32ff9dfa1148e2 SHA1 4592083288218af2bbe7c5f22c76ba07d1479983 SHA256 f2692257285ffefab0da908a3dbcf918ed13f9c18fa49ca4e9e380f81ebeacd9
+MISC ChangeLog 1012 RMD160 6e50ae6161b3c213ed7a6f0755a3924efdc6e42c SHA1 8f46225d337ca42e6415a0ad11da7f07ed4f4bfe SHA256 165819adc1bc99942fdec9010916a8c91213cc3182f1476217d3bd0028839c1b
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.11-r1.ebuild b/net-print/cups/cups-1.3.11-r1.ebuild
index 00a265e..7efa522 100644
--- a/net-print/cups/cups-1.3.11-r1.ebuild
+++ b/net-print/cups/cups-1.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.10 2010/02/10 19:46:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.11 2010/03/08 22:20:59 reavertm Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -16,7 +16,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
 
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
@@ -30,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
-	app-text/libpaper
-	dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1"
-
+	zeroconf? (
+		!avahi? ( net-misc/mDNSResponder )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=app-text/poppler-0.12.3-r3[utils]
-	"
-
+"
 PDEPEND="
-	ppds? ( || (
-		(
+	app-text/ghostscript-gpl
+	>=app-text/poppler-0.12.3-r3[utils]
+	ppds? (
+		|| (
+			(
+				net-print/foomatic-filters-ppds
+				net-print/foomatic-db-ppds
+			)
 			net-print/foomatic-filters-ppds
 			net-print/foomatic-db-ppds
+			net-print/hplip
+			net-print/gutenprint
+			net-print/foo2zjs
+			net-print/cups-pdf
 		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
+	)
 	samba? ( >=net-fs/samba-3.0.8 )
-	app-text/ghostscript-gpl"
+"
 
 PROVIDE="virtual/lpr"
 
@@ -158,7 +169,7 @@ src_configure() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
-		--with-pdftops=pdftops \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
 		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
diff --git a/net-print/cups/cups-1.3.10-r2.ebuild b/net-print/cups/cups-1.3.11-r2.ebuild
index 95c3f37..ffa20dc 100644
--- a/net-print/cups/cups-1.3.10-r2.ebuild
+++ b/net-print/cups/cups-1.3.11-r2.ebuild
@@ -1,21 +1,30 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.10-r2.ebuild,v 1.9 2009/08/09 12:32:28 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.4 2010/03/08 22:20:59 reavertm Exp $
 
+EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
 
 MY_P=${P/_}
 
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
-SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl avahi dbus gnutls java jpeg kerberos ldap pam perl php png ppds python samba slp ssl static tiff X xinetd zeroconf"
 
-COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+COMMON_DEPEND="
+	app-text/libpaper
+	dev-libs/libgcrypt
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
@@ -29,38 +38,41 @@ COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 	png? ( >=media-libs/libpng-1.2.1 )
 	python? ( dev-lang/python )
 	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( !avahi? ( net-misc/mDNSResponder ) )
-	app-text/libpaper
-	dev-libs/libgcrypt"
-
-DEPEND="${COMMON_DEPEND}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1"
-
+	zeroconf? (
+		!avahi? ( net-misc/mDNSResponder )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
 	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
-	>=virtual/poppler-utils-0.4.3-r1
-	"
-
+"
 PDEPEND="
-	ppds? ( || (
-		(
+	app-text/ghostscript-gpl
+	>=app-text/poppler-0.12.3-r3[utils]
+	ppds? (
+		|| (
+			(
+				net-print/foomatic-filters-ppds
+				net-print/foomatic-db-ppds
+			)
 			net-print/foomatic-filters-ppds
 			net-print/foomatic-db-ppds
+			net-print/hplip
+			net-print/gutenprint
+			net-print/foo2zjs
+			net-print/cups-pdf
 		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		net-print/gutenprint
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
+	)
 	samba? ( >=net-fs/samba-3.0.8 )
-	virtual/ghostscript"
+"
 
 PROVIDE="virtual/lpr"
 
@@ -91,10 +103,7 @@ pkg_setup() {
 	enewgroup lpadmin 106
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# disable configure automagic for acl/attr, upstream bug STR #2723
 	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
 
@@ -105,12 +114,20 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.3.10-str3178.patch"
 	epatch "${FILESDIR}/${PN}-1.3.8-group_fix.patch"
 
+	# CVE-2009-2820: Several XSS flaws in forms processed by CUPS web interface
+	# upstream bug STR #3178 and STR #3401
+	epatch "${FILESDIR}/${PN}-1.3.11-str3367-security-1.3v2.patch"
+	epatch "${FILESDIR}/${PN}-1.3.11-str3401-security-1.3v2-regression.patch"
+	# CVE-2009-3553: Use-after-free (crash) due improper reference counting in abstract file descriptors handling interface
+	# upstream bug STR #3200
+	epatch "${FILESDIR}/${PN}-1.3.11-str3200.patch"
+
 	# cups does not use autotools "the usual way" and ship a static config.h.in
 	eaclocal
 	eautoconf
 }
 
-src_compile() {
+src_configure() {
 	# Fails to compile on SH
 	use sh && replace-flags -O? -O0
 
@@ -155,7 +172,7 @@ src_compile() {
 		--with-cups-group=lp \
 		--with-docdir=/usr/share/cups/html \
 		--with-languages=${LINGUAS} \
-		--with-pdftops=pdftops \
+		--with-pdftops=/usr/bin/pdftops \
 		--with-system-groups=lpadmin \
 		--with-xinetd=/etc/xinetd.d \
 		$(use_enable acl) \
@@ -182,8 +199,6 @@ src_compile() {
 	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
 	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
 	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -274,7 +289,7 @@ pkg_postinst() {
 		echo
 		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
 		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed -e \"s:net-print/cups$::\")"
 		echo
 		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
 		ewarn "symlinks installed by this package, it won't be needed on later merges."
diff --git a/net-print/cups/cups-1.4.3.ebuild b/net-print/cups/cups-1.4.4.ebuild
index a8dcea9..48f54bb 100644
--- a/net-print/cups/cups-1.4.3.ebuild
+++ b/net-print/cups/cups-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.3.ebuild,v 1.1 2010/03/31 23:01:18 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4.ebuild,v 1.1 2010/06/22 21:52:23 tgurr Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit autotools eutils flag-o-matic multilib pam versionator
 
 MY_P=${P/_}
 
-DESCRIPTION="The Common Unix Printing System."
+DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
 SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 
diff --git a/net-print/cups/files/cups-1.3.11-str3200.patch b/net-print/cups/files/cups-1.3.11-str3200.patch
new file mode 100644
index 0000000..84cdbd2
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.11-str3200.patch
@@ -0,0 +1,39 @@
+diff -up cups-1.3.7/scheduler/select.c.CVE-2009-3553 cups-1.3.7/scheduler/select.c
+--- cups-1.3.7/scheduler/select.c.CVE-2009-3553	2007-11-30 19:29:50.000000000 +0000
++++ cups-1.3.7/scheduler/select.c	2009-11-11 16:36:07.223893886 +0000
+@@ -477,7 +477,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+       (*(fdptr->read_cb))(fdptr->data);
+     }
+ 
+-    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
++    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+     {
+       cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
+ 	              fdptr->fd);
+@@ -537,7 +537,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+ 	  (*(fdptr->read_cb))(fdptr->data);
+ 	}
+ 
+-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
++	if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ 	{
+ 	  cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
+ 	        	  fdptr->fd);
+@@ -649,7 +649,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+         (*(fdptr->read_cb))(fdptr->data);
+       }
+ 
+-      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
++      if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
+       {
+         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
+ 	                fdptr->fd);
+@@ -719,7 +719,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+         (*(fdptr->read_cb))(fdptr->data);
+       }
+ 
+-      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
++      if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
+       {
+         cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...",
+ 	                fdptr->fd);
diff --git a/net-print/cups/files/cups-1.4.2-str3200.patch b/net-print/cups/files/cups-1.4.2-str3200.patch
new file mode 100644
index 0000000..47d9114
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.2-str3200.patch
@@ -0,0 +1,43 @@
+Index: scheduler/select.c
+===================================================================
+--- scheduler/select.c	(revision 8887)
++++ scheduler/select.c	(working copy)
+@@ -454,7 +454,7 @@
+     if (fdptr->read_cb && event->filter == EVFILT_READ)
+       (*(fdptr->read_cb))(fdptr->data);
+ 
+-    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
++    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+       (*(fdptr->write_cb))(fdptr->data);
+ 
+     release_fd(fdptr);
+@@ -499,7 +499,8 @@
+ 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->read_cb))(fdptr->data);
+ 
+-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
++	if (fdptr->use > 1 && fdptr->write_cb &&
++	    (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->write_cb))(fdptr->data);
+ 
+ 	release_fd(fdptr);
+@@ -590,7 +591,8 @@
+       if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
++      if (fdptr->use > 1 && fdptr->write_cb &&
++          (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);
+@@ -645,7 +647,8 @@
+       if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
++      if (fdptr->use > 1 && fdptr->write_cb &&
++          FD_ISSET(fdptr->fd, &cupsd_current_output))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);