kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- update to 1.4.4

Browse source
This commit is contained in:
Dirk Meyer 2010-07-27 13:19:41 +00:00
parent 929fbddecc
commit 0a7994c335
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258327
4 changed files with 5 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
print/cups-base/Makefile
View file

@ -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 \

6
print/cups-base/distinfo
View file

@ -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

36
print/cups-base/files/patch-CVE-2009-3553
View file

@ -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

2
print/cups/Makefile
View file

@ -8,7 +8,7 @@
#
PORTNAME= cups
PORTVERSION= 1.4.3
PORTVERSION= 1.4.4
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty