head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.8 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.6 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.2 pkgsrc-2011Q2-base:1.5 pkgsrc-2010Q3:1.4.0.4 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.2 pkgsrc-2010Q2-base:1.4 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2010.11.12.08.59.42; author sbd; state dead; branches; next 1.4; 1.4 date 2010.06.16.21.15.18; author sbd; state Exp; branches; next 1.3; 1.3 date 2010.06.16.18.18.26; author drochner; state Exp; branches; next 1.2; 1.2 date 2000.07.12.20.09.39; author jlam; state dead; branches; next 1.1; 1.1 date 99.11.29.02.18.54; author jlam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.11.29.02.18.54; author jlam; state Exp; branches; next ; desc @@ 1.5 log @using wildcards with 'cvs delete' dose not work\! @ text @$NetBSD: patch-ba,v 1.4 2010/06/16 21:15:18 sbd Exp $ Incorporate 0001-More-complete-fix-for-CVE-2009-3553.patch from http://www.cups.org/str.php?L3490 "CVE-2010-0302: Incomplete fix for CVE-2009-3553 (STR #3200)" --- scheduler/select.c.orig 2010-01-14 22:40:19.000000000 +0000 +++ scheduler/select.c @@@@ -454,7 +454,8 @@@@ cupsdDoSelect(long timeout) /* I - Time 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 - Time (*(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.4 log @Add patch comments to patch-b? @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.3 2010/06/16 18:18:26 drochner Exp $ @ 1.3 log @add some patches from upstream to fix security problems: -use-after-free problem (CVE-2010-0302) -information disclosure (CVE-2010-1748) -unchecked memory allocation is texttops -file overwrite problem (I didn't find references from cups patches to CVE #s, or vice versa, so the CVE #s are not certain.) The missing http session check problem (CVE-2010-0540?) is not fixed, this would be a large patch affecting tens of files. bump PKGREVISION @ text @d1 5 a5 1 $NetBSD$ @ 1.2 log @Update CUPS to 1.1. Remove most of the patches; I worked closely with the author to make this package compile more seamlessly on BSD systems, and in particular with the NetBSD pkgsrc software collection. CUPS 1.1 is the newest production (stable) release of CUPS. It provides many new features from the 1.0.x releases, including a new Level 3 PostScript RIP, a new PDF filter, EPSON printer drivers, IPP/1.1 support, banner page support, and LPD client support. Binaries for several platforms are also available. Major changes in v1.1 include: - The text filter now embeds missing fonts. - Integrated Xpdf's pdftops filter into CUPS, which is a lightweight and reliable replacement for Ghostscript's PDF support. - The web administration interface now allows you to set the default banner pages. - Images can now be positioned on the page using the new "position" option. - Updated the serial, parallel, and usb backends to do multiple writes and ignore ioctl() errors as needed; this should fix problems with serial printing on old serial drivers and with the UltraSPARC parallel port driver under Solaris 2.7. - Now propagate LD_LIBRARY_PATH to child processes from cupsd. - Queued remote jobs recreate remote printers as needed when the scheduler is started. - Deleting a printer also purges all jobs on that printer. - Old job and control files that don't belong to a printer are automatically deleted. - cups-lpd now supports options set with lpoptions. - The IPP backend now switches to IPP/1.0 if a 1.1 request fails. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1 1999/11/29 02:18:54 jlam Exp $ d3 20 a22 67 --- systemv/Makefile.orig Thu Aug 12 09:11:02 1999 +++ systemv/Makefile Sun Nov 28 21:06:29 1999 @@@@ -45,16 +45,13 @@@@ # install: - -$(MKDIR) $(BINDIR) - -$(MKDIR) $(LIBDIR) - $(CP) accept lpadmin $(SBINDIR) + -$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR) + -$(BSD_INSTALL_DATA_DIR) $(LIBDIR) + $(LIBTOOL) $(BSD_INSTALL_PROGRAM) accept lpadmin $(SBINDIR) -$(LN) accept $(SBINDIR)/reject - -$(LN) $(SBINDIR)/lpadmin $(LIBDIR) - -$(LN) $(SBINDIR)/accept $(LIBDIR) - -$(LN) $(SBINDIR)/accept $(LIBDIR)/reject -$(LN) $(SBINDIR)/accept $(BINDIR)/disable -$(LN) $(SBINDIR)/accept $(BINDIR)/enable - $(CP) cancel lp lpstat $(BINDIR) + $(LIBTOOL) $(BSD_INSTALL_PROGRAM) cancel lp lpstat $(BINDIR) # # accept @@@@ -62,7 +59,7 @@@@ accept: accept.o ../cups/$(LIBCUPS) echo Linking $@@... - $(CC) $(LDFLAGS) -o accept accept.o $(LIBS) + $(LIBTOOL) $(CC) $(LDFLAGS) -o accept accept.o $(LIBS) -$(LN) accept disable -$(LN) accept enable -$(LN) accept reject @@@@ -75,7 +72,7 @@@@ cancel: cancel.o ../cups/$(LIBCUPS) echo Linking $@@... - $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) + $(LIBTOOL) $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) cancel.o: ../cups/cups.h ../Makedefs @@@@ -85,7 +82,7 @@@@ lp: lp.o ../cups/$(LIBCUPS) echo Linking $@@... - $(CC) $(LDFLAGS) -o lp lp.o $(LIBS) + $(LIBTOOL) $(CC) $(LDFLAGS) -o lp lp.o $(LIBS) lp.o: ../cups/cups.h ../Makedefs @@@@ -95,7 +92,7 @@@@ lpadmin: lpadmin.o ../cups/$(LIBCUPS) echo Linking $@@... - $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS) + $(LIBTOOL) $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS) lpadmin.o: ../cups/cups.h ../Makedefs @@@@ -105,7 +102,7 @@@@ lpstat: lpstat.o ../cups/$(LIBCUPS) echo Linking $@@... - $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS) + $(LIBTOOL) $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS) lpstat.o: ../cups/cups.h ../Makedefs d24 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Common UNIX Printing System, a IPP 1.0 implementation. @ text @@