head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.28 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.26 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.24 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.22 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.20 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.18 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.16 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.14 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.12 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.10 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.8 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.6 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.4 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.2 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.4.0.12 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.10 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.8 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.6 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.4 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 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 2007.03.14.12.29.06; author markd; state dead; branches; next 1.4; 1.4 date 2005.08.11.00.03.18; author salo; state Exp; branches; next 1.3; 1.3 date 2005.08.10.23.37.08; author salo; state Exp; branches; next 1.2; 1.2 date 2000.07.12.20.09.39; author jlam; state dead; branches 1.2.14.1; next 1.1; 1.1 date 99.11.29.02.18.54; author jlam; state Exp; branches 1.1.1.1; next ; 1.2.14.1 date 2005.08.11.07.08.37; author snj; state Exp; branches; next ; 1.1.1.1 date 99.11.29.02.18.54; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Update cups to 1.2.8 ok'ed jlam a while back. CUPS 1.2.8 adds a French localization, updates the Japanese and Spanish localizations, and fixes several web interface, printing, and networking bugs. CUPS 1.2.7 adds several Mac OS X improvements, implements timeouts in the SSL negotiation code, and fixes the bounding box generated by the PostScript filter, bidirectional support in the USB backend, and another case where the lpstat command could hang. CUPS 1.2.6 fixes some compile errors, localization of the web interface on Mac OS X, bugs in the lpc and lpstat commands, and backchannel support in the parallel backend. CUPS 1.2.5 fixes minor printing, networking, and documentation issues and adds support for older versions of DBUS and a translation for Estonian. CUPS 1.2.4 fixes a number of web interface, scheduler, and CUPS API issues. CUPS 1.2.3 fixes a number of web interface, networking, remote printing, and CUPS API issues. CUPS 1.2.2 fixes several build, platform, notification, and printing bugs. CUPS 1.2.1 fixes several build, platform, and printing bugs. CUPS 1.2.0 is the first stable feature release in the 1.2.x series and includes over 90 new features and changes since CUPS 1.1.23, including a greatly improved web interface and "plug-and-print" support for many local and network printers. @ text @$NetBSD: patch-aw,v 1.4 2005/08/11 00:03:18 salo Exp $ Fix for CAN-2005-2097, from RedHat. --- pdftops/FontFile.cxx.orig 2004-02-02 23:41:09.000000000 +0100 +++ pdftops/FontFile.cxx 2005-08-10 22:30:54.000000000 +0200 @@@@ -3572,6 +3573,9 @@@@ } else { origLocaTable[i].pos = 2 * getUShort(pos + 2*i); } + + if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len) + error (1, 0, "bad loca table pos value"); } qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos); for (i = 0; i < nGlyphs; ++i) { @ 1.4 log @Remove erroneous (literally) include. @ text @d1 1 a1 1 $NetBSD: patch-aw,v 1.3 2005/08/10 23:37:08 salo Exp $ @ 1.3 log @Security fix for CAN-2005-2097. "A vulnerability has been reported in CUPS, which can be exploited by malicious people to cause a DoS (Denial of Service) on a vulnerable system. When processing a PDF file, bounds checking was not correctly performed on some fields. This could cause the pdftops filter (running as user "lp") to crash." http://secunia.com/advisories/16380/ http://rhn.redhat.com/errata/RHSA-2005-706.html Patch from RedHat. @ text @d1 1 a1 1 $NetBSD$ a6 8 @@@@ -18,6 +18,7 @@@@ #include #include #include +#include #include "gmem.h" #include "GHash.h" #include "Error.h" @ 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-aw,v 1.1 1999/11/29 02:18:54 jlam Exp $ d3 22 a24 31 --- scheduler/conf.c.orig Sun Oct 10 11:41:09 1999 +++ scheduler/conf.c Sun Nov 28 21:06:29 1999 @@@@ -76,6 +76,8 @@@@ { "ServerAdmin", ServerAdmin, VAR_STRING, sizeof(ServerAdmin) }, { "ServerRoot", ServerRoot, VAR_STRING, sizeof(ServerRoot) }, { "DocumentRoot", DocumentRoot, VAR_STRING, sizeof(DocumentRoot) }, + { "ConfRoot", ConfRoot, VAR_STRING, sizeof(ConfRoot) }, + { "ExecRoot", ExecRoot, VAR_STRING, sizeof(ExecRoot) }, { "SystemGroup", SystemGroup, VAR_STRING, sizeof(SystemGroup) }, { "AccessLog", AccessLog, VAR_STRING, sizeof(AccessLog) }, { "ErrorLog", ErrorLog, VAR_STRING, sizeof(ErrorLog) }, @@@@ -168,7 +170,9 @@@@ gethostname(ServerName, sizeof(ServerName)); sprintf(ServerAdmin, "root@@%s", ServerName); strcpy(ServerRoot, CUPS_SERVERROOT); - strcpy(DocumentRoot, CUPS_DATADIR "/doc"); + strcpy(DocumentRoot, CUPS_DOCDIR); + strcpy(ConfRoot, CUPS_CONFDIR); + strcpy(ExecRoot, CUPS_EXECDIR); strcpy(AccessLog, "logs/access_log"); strcpy(ErrorLog, "logs/error_log"); @@@@ -272,7 +276,7 @@@@ * Read the MIME type and conversion database... */ - sprintf(directory, "%s/conf", ServerRoot); + sprintf(directory, "%s", ConfRoot); MimeDatabase = mimeNew(); mimeMerge(MimeDatabase, directory); @ 1.2.14.1 log @Pullup ticket 673 - requested by Lubomir Sedlacik security fix for cups Revisions pulled up: - pkgsrc/print/cups/Makefile 1.95 - pkgsrc/print/cups/buildlink3.mk 1.13 - pkgsrc/print/cups/distinfo 1.32-1.33 - pkgsrc/print/cups/patches/patch-aw 1.3-1.4 Module Name: pkgsrc Committed By: salo Date: Wed Aug 10 23:37:08 UTC 2005 Modified Files: pkgsrc/print/cups: Makefile buildlink3.mk distinfo Added Files: pkgsrc/print/cups/patches: patch-aw Log Message: Security fix for CAN-2005-2097. "A vulnerability has been reported in CUPS, which can be exploited by malic ious people to cause a DoS (Denial of Service) on a vulnerable system. When processing a PDF file, bounds checking was not correctly performed on some fields. This could cause the pdftops filter (running as user "lp") to crash." http://secunia.com/advisories/16380/ http://rhn.redhat.com/errata/RHSA-2005-706.html Patch from RedHat. ---- Module Name: pkgsrc Committed By: salo Date: Thu Aug 11 00:03:18 UTC 2005 Modified Files: pkgsrc/print/cups: distinfo pkgsrc/print/cups/patches: patch-aw Log Message: Remove erroneous (literally) include. @ text @d1 1 a1 1 $NetBSD: patch-aw,v 1.4 2005/08/11 00:03:18 salo Exp $ d3 31 a33 14 Fix for CAN-2005-2097, from RedHat. --- pdftops/FontFile.cxx.orig 2004-02-02 23:41:09.000000000 +0100 +++ pdftops/FontFile.cxx 2005-08-10 22:30:54.000000000 +0200 @@@@ -3572,6 +3573,9 @@@@ } else { origLocaTable[i].pos = 2 * getUShort(pos + 2*i); } + + if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len) + error (1, 0, "bad loca table pos value"); } qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos); for (i = 0; i < nGlyphs; ++i) { @ 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 @@