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-2010Q4:1.4.0.4 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.2 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-4-PATCH002:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2011.01.19.03.28.42; author sbd; state dead; branches; next 1.4; 1.4 date 2010.11.12.08.24.32; author sbd; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2000.07.12.20.09.38; author jlam; state dead; branches; next 1.2; 1.2 date 99.12.07.21.01.47; author rh; state Exp; branches; next 1.1; 1.1 date 99.11.29.02.18.54; author jlam; state Exp; branches 1.1.1.1; next ; 1.4.2.1 date 2010.11.12.08.24.32; author tron; state dead; branches; next 1.4.2.2; 1.4.2.2 date 2010.11.13.11.22.03; author tron; 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 to cups 1.4.6 CHANGES IN CUPS V1.4.6 - Fixed a "make check" issue on Solaris (STR #3729) - Regression: The pstops filter did not support landscape printing of PostScript files (STR #3722) - The scheduler killed retried (fax) jobs after restarting them (STR #3697) - The cupsAdminSetServerSettings() function disabled sharing when debug logging was enabled (STR #3712) CHANGES IN CUPS V1.4.5 - Documentation fixes (STR #3542, STR #3650) - Localization fixes (STR #3635, STR #3636, STR #3647, STR #3666) - Security: Fixed a memory corruption bug reported in CVE-2010-2941 (STR #3648) - The CUPS API incorrectly mapped the HTTP_UNAUTHORIZED status to the IPP_NOT_AUTHORIZED status code, when IPP_NOT_AUTHENTICATED would be the correct mapping (STR #3684) - The scheduler would restart jobs while shutting down (STR #3679) - Fixed a PPD loader bug that could cause a crash in cupsd (STR #3680) - Improved the mapping of non-standard PPD and PWG names (STR #3671) - The scheduler did not initialize Kerberos in all cases (STR #3662) - cupsAdminSetServerSettings duplicated Listen and Order lines (STR #3645) - Added DeviceN colorspace support to the CUPS Raster format (STR #3419) - ppdMarkDefaults() did not clear the marked field of the previous choices (STR #3642) - The serial backend would not allow a raw job to be canceled (STR #3649) - The socket backend could go into an infinite loop with certain printers (STR #3622) - Setting the PRINTER or LPDEST environment variables to "name/instance" did not work (STR #3485) - The scheduler did not handle the JobRetryLimit setting properly (STR #3466) - The lpstat command always showed a remote job ID of 0 for shared printers (STR #3627) - Increased the write timeout for the libusb-based USB backend to 5 minutes (STR #3595) - The libusb-base USB backend did not check whether the printer has a serial number (STR #3590) - The lpadmin command did not support setting of custom option values (STR #3631) - The lpadmin command did not support setting of the location or description of a class (STR #3613) - The cupsaddsmb command did not give up after too many failed attempts (STR #3615) - The CUPS library no longer uses certain problematic ctype macros that change based on the locale's character set. - PJL value substitution of more than 9 values was broken (STR #3621) - Custom options with missing string values caused ppdEmit* to segfault (STR #3620) - Fixed an issue with the Italian version of the web interface (STR #3624) - Fixed the Solaris SMF configuration file for cups-lpd (STR #3611) - The scheduler did not set the notify-subscribed-event attribute when delivering printer-added or printer-modified events (STR #3608) - The mailto notifier could get into an infinite loop (STR #3609) - Date/time information was not shown in banner pages. - Relational operators were broken in #if/#elif/#else/#endif expressions for the PPD compiler. - Moving a job via the web interface failed without asking for authentication (STR #3559) - The scheduler now clears the printer-state-reasons when the driver is changed (STR #3570) - The web interface did not allow a user to change the driver (STR #3537, STR #3601) - The scheduler was not setting the PATH_INFO environment variable when needed (STR #3600) - The scheduler incorrectly set the CUPSD_AUTH_TYPE environment variable instead of AUTH_TYPE (STR #3599) - Fixed a buffer overrun in the PPD compiler (STR #3594) - Fixed some additional IPP job template attribute mapping issues in the scheduler. @ text @$NetBSD: patch-aq,v 1.4 2010/11/12 08:24:32 sbd Exp $ Add str3648.patch by Mike Sweet to address CVE-2010-2941. Obtained from https://bugzilla.redhat.com/show_bug.cgi?id=624438 as Cups STR#3648 (http://www.cups.org/str.php?L3648) is not public yet! --- cups/ipp.h.orig 2010-04-23 18:56:34.000000000 +0000 +++ cups/ipp.h @@@@ -93,7 +93,8 @@@@ typedef enum ipp_tag_e /**** Format ta IPP_TAG_END_COLLECTION, /* End of collection value */ IPP_TAG_TEXT = 0x41, /* Text value */ IPP_TAG_NAME, /* Name value */ - IPP_TAG_KEYWORD = 0x44, /* Keyword value */ + IPP_TAG_RESERVED_STRING, /* Reserved for future string value @@private@@ */ + IPP_TAG_KEYWORD, /* Keyword value */ IPP_TAG_URI, /* URI value */ IPP_TAG_URISCHEME, /* URI scheme value */ IPP_TAG_CHARSET, /* Character set value */ @ 1.4 log @Add str3648.patch by Mike Sweet to address CVE-2010-2941. Obtained from https://bugzilla.redhat.com/show_bug.cgi?id=624438 as Cups STR#3648 (http://www.cups.org/str.php?L3648) is not public yet! @ text @d1 1 a1 1 $NetBSD$ @ 1.4.2.1 log @file patch-aq was added on branch pkgsrc-2010Q3 on 2010-11-13 11:22:03 +0000 @ text @d1 18 @ 1.4.2.2 log @Pullup ticket #3271 - requested by sbd print/cups: security patch Revisions pulled up: - print/cups/Makefile 1.170 - print/cups/distinfo 1.76 - print/cups/patches/patch-aq 1.4 - print/cups/patches/patch-ar 1.4 --- Module Name: pkgsrc Committed By: sbd Date: Fri Nov 12 08:24:32 UTC 2010 Modified Files: pkgsrc/print/cups: Makefile distinfo Added Files: pkgsrc/print/cups/patches: patch-aq patch-ar Log Message: Add str3648.patch by Mike Sweet to address CVE-2010-2941. Obtained from https://bugzilla.redhat.com/show_bug.cgi?id=624438 as Cups STR#3648 (http://www.cups.org/str.php?L3648) is not public yet! @ text @a0 18 $NetBSD$ Add str3648.patch by Mike Sweet to address CVE-2010-2941. Obtained from https://bugzilla.redhat.com/show_bug.cgi?id=624438 as Cups STR#3648 (http://www.cups.org/str.php?L3648) is not public yet! --- cups/ipp.h.orig 2010-04-23 18:56:34.000000000 +0000 +++ cups/ipp.h @@@@ -93,7 +93,8 @@@@ typedef enum ipp_tag_e /**** Format ta IPP_TAG_END_COLLECTION, /* End of collection value */ IPP_TAG_TEXT = 0x41, /* Text value */ IPP_TAG_NAME, /* Name value */ - IPP_TAG_KEYWORD = 0x44, /* Keyword value */ + IPP_TAG_RESERVED_STRING, /* Reserved for future string value @@private@@ */ + IPP_TAG_KEYWORD, /* Keyword value */ IPP_TAG_URI, /* URI value */ IPP_TAG_URISCHEME, /* URI scheme value */ IPP_TAG_CHARSET, /* Character set value */ @ 1.3 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-aq,v 1.2 1999/12/07 21:01:47 rh Exp $ d3 16 a18 38 --- man/Makefile.orig Mon Jun 21 17:27:44 1999 +++ man/Makefile Tue Dec 7 21:59:46 1999 @@@@ -42,5 +42,5 @@@@ # -all: $(CAT1) $(CAT5) $(CAT8) +all: # $(CAT1) $(CAT5) $(CAT8) # @@@@ -55,22 +55,13 @@@@ install: - -$(MKDIR) $(MANDIR)/man1 - $(CP) $(MAN1) $(MANDIR)/man1 + -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man1 + $(BSD_INSTALL_DATA) $(MAN1) $(MANDIR)/man1 $(LN) lp.1 $(MANDIR)/man1/cancel.1 - -$(MKDIR) $(MANDIR)/man5 - $(CP) $(MAN5) $(MANDIR)/man5 - -$(MKDIR) $(MANDIR)/man8 - $(CP) $(MAN8) $(MANDIR)/man8 + -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man5 + $(BSD_INSTALL_DATA) $(MAN5) $(MANDIR)/man5 + -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man8 + $(BSD_INSTALL_DATA) $(MAN8) $(MANDIR)/man8 $(LN) accept.8 $(MANDIR)/man8/reject.8 $(LN) enable.8 $(MANDIR)/man8/disable.8 - -$(MKDIR) $(MANDIR)/cat1 - $(CP) $(CAT1) $(MANDIR)/cat1 - $(LN) lp.$(CAT) $(MANDIR)/cat1/cancel.$(CAT) - -$(MKDIR) $(MANDIR)/cat5 - $(CP) $(CAT5) $(MANDIR)/cat5 - -$(MKDIR) $(MANDIR)/cat8 - $(CP) $(CAT8) $(MANDIR)/cat8 - $(LN) accept.$(CAT) $(MANDIR)/cat8/reject.$(CAT) - $(LN) enable.$(CAT) $(MANDIR)/cat8/disable.$(CAT) # @ 1.2 log @defuzz. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 3 a5 4 --- man/Makefile.orig Mon Jun 21 11:27:44 1999 +++ man/Makefile Sun Nov 28 21:06:28 1999 @@@@ -41,7 +41,7 @@@@ # Make everything... d12 1 a12 3 # Clean all config and object files... @@@@ -54,24 +54,15 @@@@ # a40 1 # End of "$Id: Makefile,v 1.3 1999/06/21 15:27:44 mike Exp $". @ 1.1.1.1 log @Common UNIX Printing System, a IPP 1.0 implementation. @ text @@