| 1 |
tgurr 09/11/30 22:00:56 |
| 2 |
|
| 3 |
Added: cups-1.4.2-str3200.patch cups-1.3.11-str3200.patch |
| 4 |
Log: |
| 5 |
Revbumps fixing security issue CVE-2009-3553. Fix linguas handling bug #293217 thanks to Rafał Mużyło, remove zeroconf of cups 1.4 since it's missing an avahi implementation, bug #293295. Remove old. |
| 6 |
(Portage version: 2.2_rc54/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-print/cups/files/cups-1.4.2-str3200.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/files/cups-1.4.2-str3200.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/files/cups-1.4.2-str3200.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: cups-1.4.2-str3200.patch |
| 15 |
=================================================================== |
| 16 |
Index: scheduler/select.c |
| 17 |
=================================================================== |
| 18 |
--- scheduler/select.c (revision 8887) |
| 19 |
+++ scheduler/select.c (working copy) |
| 20 |
@@ -454,7 +454,7 @@ |
| 21 |
if (fdptr->read_cb && event->filter == EVFILT_READ) |
| 22 |
(*(fdptr->read_cb))(fdptr->data); |
| 23 |
|
| 24 |
- if (fdptr->write_cb && event->filter == EVFILT_WRITE) |
| 25 |
+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE) |
| 26 |
(*(fdptr->write_cb))(fdptr->data); |
| 27 |
|
| 28 |
release_fd(fdptr); |
| 29 |
@@ -499,7 +499,8 @@ |
| 30 |
if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP))) |
| 31 |
(*(fdptr->read_cb))(fdptr->data); |
| 32 |
|
| 33 |
- if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) |
| 34 |
+ if (fdptr->use > 1 && fdptr->write_cb && |
| 35 |
+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) |
| 36 |
(*(fdptr->write_cb))(fdptr->data); |
| 37 |
|
| 38 |
release_fd(fdptr); |
| 39 |
@@ -590,7 +591,8 @@ |
| 40 |
if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP))) |
| 41 |
(*(fdptr->read_cb))(fdptr->data); |
| 42 |
|
| 43 |
- if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) |
| 44 |
+ if (fdptr->use > 1 && fdptr->write_cb && |
| 45 |
+ (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) |
| 46 |
(*(fdptr->write_cb))(fdptr->data); |
| 47 |
|
| 48 |
release_fd(fdptr); |
| 49 |
@@ -645,7 +647,8 @@ |
| 50 |
if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input)) |
| 51 |
(*(fdptr->read_cb))(fdptr->data); |
| 52 |
|
| 53 |
- if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output)) |
| 54 |
+ if (fdptr->use > 1 && fdptr->write_cb && |
| 55 |
+ FD_ISSET(fdptr->fd, &cupsd_current_output)) |
| 56 |
(*(fdptr->write_cb))(fdptr->data); |
| 57 |
|
| 58 |
release_fd(fdptr); |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.1 net-print/cups/files/cups-1.3.11-str3200.patch |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/files/cups-1.3.11-str3200.patch?rev=1.1&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/files/cups-1.3.11-str3200.patch?rev=1.1&content-type=text/plain |
| 66 |
|
| 67 |
Index: cups-1.3.11-str3200.patch |
| 68 |
=================================================================== |
| 69 |
diff -up cups-1.3.7/scheduler/select.c.CVE-2009-3553 cups-1.3.7/scheduler/select.c |
| 70 |
--- cups-1.3.7/scheduler/select.c.CVE-2009-3553 2007-11-30 19:29:50.000000000 +0000 |
| 71 |
+++ cups-1.3.7/scheduler/select.c 2009-11-11 16:36:07.223893886 +0000 |
| 72 |
@@ -477,7 +477,7 @@ cupsdDoSelect(long timeout) /* I - Time |
| 73 |
(*(fdptr->read_cb))(fdptr->data); |
| 74 |
} |
| 75 |
|
| 76 |
- if (fdptr->write_cb && event->filter == EVFILT_WRITE) |
| 77 |
+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE) |
| 78 |
{ |
| 79 |
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...", |
| 80 |
fdptr->fd); |
| 81 |
@@ -537,7 +537,7 @@ cupsdDoSelect(long timeout) /* I - Time |
| 82 |
(*(fdptr->read_cb))(fdptr->data); |
| 83 |
} |
| 84 |
|
| 85 |
- if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) |
| 86 |
+ if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) |
| 87 |
{ |
| 88 |
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...", |
| 89 |
fdptr->fd); |
| 90 |
@@ -649,7 +649,7 @@ cupsdDoSelect(long timeout) /* I - Time |
| 91 |
(*(fdptr->read_cb))(fdptr->data); |
| 92 |
} |
| 93 |
|
| 94 |
- if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) |
| 95 |
+ if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP))) |
| 96 |
{ |
| 97 |
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...", |
| 98 |
fdptr->fd); |
| 99 |
@@ -719,7 +719,7 @@ cupsdDoSelect(long timeout) /* I - Time |
| 100 |
(*(fdptr->read_cb))(fdptr->data); |
| 101 |
} |
| 102 |
|
| 103 |
- if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output)) |
| 104 |
+ if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output)) |
| 105 |
{ |
| 106 |
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDoSelect: Write on fd %d...", |
| 107 |
fdptr->fd); |
Archives