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.

5 files changed, 8 insertions, 68 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 06490da018a..4b2388e7717 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.175 2011/01/19 03:01:06 sbd Exp $
+# $NetBSD: Makefile,v 1.176 2011/01/19 03:28:42 sbd Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	1.4.4
+BASE_VERS=	1.4.6
 DIST_VERS=	${BASE_VERS}
 
 PKGREVISION=	1
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 21cb35044fe..6ffe779987f 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2011/01/03 05:58:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2011/01/19 03:28:42 sbd Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -110,7 +110,6 @@ man/man5/ppdcfile.5
 man/man5/printers.conf.5
 man/man5/subscriptions.conf.5
 man/man7/backend.7
-man/man7/drv.7
 man/man7/filter.7
 man/man7/notifier.7
 man/man8/accept.8
@@ -883,7 +882,6 @@ share/doc/cups/help/man-cupsd.html
 share/doc/cups/help/man-cupsenable.html
 share/doc/cups/help/man-cupstestdsc.html
 share/doc/cups/help/man-cupstestppd.html
-share/doc/cups/help/man-drv.html
 share/doc/cups/help/man-filter.html
 share/doc/cups/help/man-lp.html
 share/doc/cups/help/man-lpadmin.html
@@ -946,6 +944,7 @@ share/doc/cups/images/cups-icon.png
 share/doc/cups/images/cups-postscript-chain.png
 share/doc/cups/images/cups-raster-chain.png
 share/doc/cups/images/cups.png
+share/doc/cups/images/generic.png
 share/doc/cups/images/left.gif
 share/doc/cups/images/raster.png
 share/doc/cups/images/right.gif
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 527b72cd781..915f3ad7faa 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.77 2010/11/12 08:54:58 sbd Exp $
+$NetBSD: distinfo,v 1.78 2011/01/19 03:28:42 sbd Exp $
 
-SHA1 (cups-1.4.4-source.tar.bz2) = 3e179c007fa6cd6874b60ff18a6f48070547a00a
-RMD160 (cups-1.4.4-source.tar.bz2) = 1f486acda02e83b6824f8ca33b74c02ff3f01994
-Size (cups-1.4.4-source.tar.bz2) = 4472741 bytes
+SHA1 (cups-1.4.6-source.tar.bz2) = 42fb1ca00ee7291561564d3072716eb2045f05d1
+RMD160 (cups-1.4.6-source.tar.bz2) = 94c9921e03f5ec52d9c16947435622365f53aef6
+Size (cups-1.4.6-source.tar.bz2) = 4517061 bytes
 SHA1 (patch-aa) = ddb088080d433b8b364ae9e0708cc79c249a1160
 SHA1 (patch-ab) = 8269ed7f24bcd5b16c143353443d4689fef082b2
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
@@ -19,6 +19,4 @@ SHA1 (patch-am) = b2cc09ac01e45c96247558667f875fd4a95b125f
 SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
 SHA1 (patch-ap) = 70c5fa4a19ca2812818844180ca9db9cb7cfd601
-SHA1 (patch-aq) = 098d78b7dd82ae0d69804d736603cdad9814ee9a
-SHA1 (patch-ar) = ec48fcb37ed2525af4ee669e6f3fa6a253e7bf10
 SHA1 (patch-at) = aee1f0e8cbcd9e2dbcfa9af3fb675ea7ce1ce622
diff --git a/print/cups/patches/patch-aq b/print/cups/patches/patch-aq
deleted file mode 100644
index 7cc38f34e73..00000000000
--- a/print/cups/patches/patch-aq
+++ /dev/null
@@ -1,18 +0,0 @@
-$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 */
diff --git a/print/cups/patches/patch-ar b/print/cups/patches/patch-ar
deleted file mode 100644
index 0c68a557e4d..00000000000
--- a/print/cups/patches/patch-ar
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ar,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.c.orig	2010-04-23 18:56:34.000000000 +0000
-+++ cups/ipp.c
-@@ -1275,7 +1275,9 @@ ippReadIO(void       *src,		/* I - Data
- 
- 	      attr->value_tag = tag;
- 	    }
--	    else if ((value_tag >= IPP_TAG_TEXTLANG &&
-+	    else if (value_tag == IPP_TAG_TEXTLANG ||
-+	             value_tag == IPP_TAG_NAMELANG ||
-+		     (value_tag >= IPP_TAG_TEXT &&
- 		      value_tag <= IPP_TAG_MIMETYPE))
-             {
- 	     /*
-@@ -1283,8 +1285,9 @@ ippReadIO(void       *src,		/* I - Data
- 	      * forms; accept sets of differing values...
- 	      */
- 
--	      if ((tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE) &&
--	          tag != IPP_TAG_NOVALUE)
-+	      if (tag != IPP_TAG_TEXTLANG && tag != IPP_TAG_NAMELANG &&
-+	          (tag < IPP_TAG_TEXT || tag > IPP_TAG_MIMETYPE) &&
-+		  tag != IPP_TAG_NOVALUE)
- 	      {
- 		DEBUG_printf(("1ippReadIO: 1setOf value tag %x(%s) != %x(%s)",
- 			      value_tag, ippTagString(value_tag), tag,
-@@ -2766,6 +2769,7 @@ _ippFreeAttr(ipp_attribute_t *attr)	/* I
-   {
-     case IPP_TAG_TEXT :
-     case IPP_TAG_NAME :
-+    case IPP_TAG_RESERVED_STRING :
-     case IPP_TAG_KEYWORD :
-     case IPP_TAG_URI :
-     case IPP_TAG_URISCHEME :