diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-07-27 13:19:41 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-07-27 13:19:41 +0000 |
| commit | 0a7994c3356168dd31c7cddd80d319b1ac43225b (patch) | |
| tree | 1ce362f4d12f935501ef61b6aecdf96821751fed | |
| parent | Fix the dialog popup about windows not supporting 'save current setup'. Bump (diff) | |
- update to 1.4.4
Notes
Notes:
svn path=/head/; revision=258327
| -rw-r--r-- | print/cups-base/Makefile | 3 | ||||
| -rw-r--r-- | print/cups-base/distinfo | 6 | ||||
| -rw-r--r-- | print/cups-base/files/patch-CVE-2009-3553 | 36 | ||||
| -rw-r--r-- | print/cups/Makefile | 2 |
4 files changed, 5 insertions, 42 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 1940a6f65121..7318f7a2e355 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cups -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 DISTVERSIONSUFFIX= -source PORTREVISION= 0 CATEGORIES= print @@ -89,7 +89,6 @@ USE_LDCONFIG= yes PKGMESSAGE= ${NONEXISTENT} DESCR= ${MASTERDIR}/pkg-descr.image .else -PORTREVISION= 1 CONFLICTS+= cupsddk-* CUPS_SUFFIX= -base LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \ diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index 3c7ea8638b9c..d45950a0ca13 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1,3 +1,3 @@ -MD5 (cups-1.4.3-source.tar.bz2) = e70b1c3f60143d7310c1d74c111a21ab -SHA256 (cups-1.4.3-source.tar.bz2) = 47a559b1c50192b94479ae7dab132ea0008727045d4993501cf0a6df0c64db97 -SIZE (cups-1.4.3-source.tar.bz2) = 4461101 +MD5 (cups-1.4.4-source.tar.bz2) = 8776403ad60fea9e85eab9c04d88560d +SHA256 (cups-1.4.4-source.tar.bz2) = d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3 +SIZE (cups-1.4.4-source.tar.bz2) = 4472741 diff --git a/print/cups-base/files/patch-CVE-2009-3553 b/print/cups-base/files/patch-CVE-2009-3553 deleted file mode 100644 index 34c698734be7..000000000000 --- a/print/cups-base/files/patch-CVE-2009-3553 +++ /dev/null @@ -1,36 +0,0 @@ -From b6b656f4b431574069d5b17dc6d3d44910269bb9 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <twaugh@redhat.com> -Date: Wed, 3 Feb 2010 16:07:11 +0000 -Subject: [PATCH] More complete fix for CVE-2009-3553. - ---- - scheduler/select.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/scheduler/select.c b/scheduler/select.c -index 21a6edc..a2451a5 100644 ---- scheduler/select.c -+++ scheduler/select.c -@@ -454,7 +454,8 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */ - if (fdptr->read_cb && event->filter == EVFILT_READ) - (*(fdptr->read_cb))(fdptr->data); - -- if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE) -+ if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE && -+ !cupsArrayFind(cupsd_inactive_fds, fdptr)) - (*(fdptr->write_cb))(fdptr->data); - - release_fd(fdptr); -@@ -500,7 +501,8 @@ cupsdDoSelect(long timeout) /* I - Timeout in seconds */ - (*(fdptr->read_cb))(fdptr->data); - - if (fdptr->use > 1 && fdptr->write_cb && -- (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP))) -+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) && -+ !cupsArrayFind(cupsd_inactive_fds, fdptr)) - (*(fdptr->write_cb))(fdptr->data); - - release_fd(fdptr); --- -1.6.6 - diff --git a/print/cups/Makefile b/print/cups/Makefile index 447766f4c7bb..997a7db4fdaa 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -8,7 +8,7 @@ # PORTNAME= cups -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.4 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty |