From c2a7c47a090ca1160712cbb9809ab4938a47945f Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Mon, 7 Dec 2009 16:20:32 +0000
Subject: [PATCH] net-print/cups: add missing file

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1661 6952d904-891a-0410-993b-d76249ca496b
---
 net-print/cups/ChangeLog                      |  4 ++
 net-print/cups/Manifest                       |  3 +-
 net-print/cups/files/cups-1.4.2-str3200.patch | 43 +++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 net-print/cups/files/cups-1.4.2-str3200.patch

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e0c7c22..fd4d623 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.344 2009/03/09 18:42:27 armin76 Exp $
 
+  07 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/cups-1.4.2-str3200.patch:
+  add missing file
+
   05 Dec 2009; Mario Fetka <mario.fetka@gmail.com> +cups-1.4.2-r1.ebuild:
   Bump
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 3350332..3572f4a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,6 +6,7 @@ AUX cups-1.3.9-ldap-draft-1.patch 3443 RMD160 a8d6cdc180c7a3dc4747e91d2b0b662978
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.1-ldap-draft-1.patch 4396 RMD160 f6140f19d5c5496db0510ad0b4216edab0ab4d40 SHA1 73dab3605113feafa67c3f0be4e04eb0a6fedde7 SHA256 2559de7e1beef5afc9a62032b60b95fcc36cf222d83063e2116a07e07c217159
 AUX cups-1.4.1-usb-function-decl.patch 767 RMD160 12c0bc2ff991f2c0edb4be92fde4db58116b6ca5 SHA1 9b1486f153cc32ee206d927d7d186c76099a7cef SHA256 dc32eb0658dbd263b6361ca6d55bf977fb04b604042041987db69ffb2f840e41
+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
@@ -20,5 +21,5 @@ EBUILD cups-1.3.9-r1.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424
 EBUILD cups-1.3.9-r2.ebuild 8724 RMD160 2fadb7b929fa65fad0aab8df9e23a59f47843424 SHA1 9c3d039bb8941370f280915dded0c2467b573509 SHA256 823b083c2c1670f3dc069c70b07d408d96e92e567822106dac4e3613ed0b1588
 EBUILD cups-1.4.1.ebuild 5228 RMD160 4fecb94344765ca29d0f12fc624ddd11b0a44aa7 SHA1 3cea580ca9e54c72b8643f36e613ca5a1ddec9ec SHA256 cc80002f6484e01713e5a4ed250573d5d212fa348bb7baff269f47a7b24038a7
 EBUILD cups-1.4.2-r1.ebuild 5413 RMD160 746e9d89ce2822c549de1fce1684d737ae9f6e58 SHA1 19c681876e7e2178f2bdb9b8b0dbd4d3a5d0687e SHA256 fc227b009a5da41f9c6d89d3b04793d93dc72315c85c0c2dfdf0c1c7361fec31
-MISC ChangeLog 51471 RMD160 6eb4c487216fa0f9e2fdd259a6072c290e443026 SHA1 6bffe1a92ca4b93bcf427b0251538ba6dfff7018 SHA256 dff48aaf1b1ec5856add6d3edcf8292c31ba518e68301a27b576bbeddf15b21a
+MISC ChangeLog 51577 RMD160 f4c711e52baa6e117b7ab7e853286cf502acffed SHA1 751cdd9ac873d4ce261f36252d8b0fcf7d00404e SHA256 37248ae8d51694d108fd8fbeedb31a98f236b9f6e2a4ad9cb2bd4280d6d1e051
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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);