Update cups to version 1.3.7

OKed by jlam.

Changes in 1.3.7

The new release includes three security fixes and several printing and
authentication fixes.

CVE-2008-0047: cgiCompileSearch buffer overflow
CVE-2008-1373: CUPS GIF image filter overflow
Updated the "make check" tests to do a more thorough automated test.
cups-driverd complained about missing directories
cupsaddsmb would leave the Samba username and password on disk if no
Windows drivers were installed
The Linux USB backend used 100% CPU when a printer was disconnected
The sample raster drivers did not properly handle SIGTERM
The scheduler sent notify_post() messages too often on Mac OS X.
Kerberos access to the web interface did not work
The scheduler did not support "AuthType Default" in IPP policies
The scheduler did not support the "HideImplicitMembers" directive as
documented
"make check" didn't return a non-zero exit code on error
The scheduler incorrectly logged AUTH_foo environment variables in
debug mode
The image filters inverted PBM files
cupsctl would crash if the scheduler was not running
The scheduler could crash when printing using a port monitor
The scheduler would crash if PAM was broken
The image filters did not work with some CMYK JPEG files produced by
Adobe applications
The Mac OS X USB backend did not work with printers that did not
report a make or model.
The job-sheets option was not encoded properly
The scheduler incorrectly complained about missing LSB PPD directories.

Changes in 1.3.6

The new release fixes some platform-specific build problems, web
interface issues, PDF and PostScript filter option handling, and a
number of minor bugs discovered during routine code audits.

4 files changed, 7 insertions, 28 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index a03156eb0e4..5424b897176 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2008/02/28 00:31:37 gdt Exp $
+# $NetBSD: Makefile,v 1.133 2008/04/03 04:06:27 markd 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,10 +6,9 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-BASE_VERS=	1.3.5
+BASE_VERS=	1.3.7
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
-PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
 		ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
diff --git a/print/cups/PLIST b/print/cups/PLIST
index cb7f5f332b3..9e0ff8e2c03 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/01/22 23:58:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/04/03 04:06:27 markd Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -17,7 +17,6 @@ include/cups/cups.h
 include/cups/dir.h
 include/cups/file.h
 include/cups/http.h
-include/cups/i18n.h
 include/cups/image.h
 include/cups/ipp.h
 include/cups/language.h
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 6672c2263ad..755f6a00e7c 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.54 2008/01/22 23:58:13 markd Exp $
+$NetBSD: distinfo,v 1.55 2008/04/03 04:06:27 markd Exp $
 
-SHA1 (cups-1.3.5-source.tar.bz2) = f0f7674b46e00582f327765acd4133a6035d393e
-RMD160 (cups-1.3.5-source.tar.bz2) = c6157e552e833447e623175a4e90146ceb9d9ba4
-Size (cups-1.3.5-source.tar.bz2) = 4082098 bytes
+SHA1 (cups-1.3.7-source.tar.bz2) = 4267822cdad2fdad44ff0885587132250bcf8dff
+RMD160 (cups-1.3.7-source.tar.bz2) = 7d3bd9dbe91e787f7032b770e576ab31cfcf6588
+Size (cups-1.3.7-source.tar.bz2) = 3895825 bytes
 SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
 SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8
 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
-SHA1 (patch-ae) = f833e5b95c62a76d1d9222107a08f241c688a88d
 SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49
 SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3
 SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
deleted file mode 100644
index 586684c9d67..00000000000
--- a/print/cups/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.18 2008/01/22 23:59:00 markd Exp $
-
-post 1.3.5 fix from svn.
-
-Index: pstops.c
-===================================================================
---- filter/pstops.c	(revision 7067)
-+++ filter/pstops.c	(revision 7175)
-@@ -889,7 +889,8 @@
-   * Finish up the last page(s)...
-   */
- 
--  if (number && !is_first_page(number) && cupsArrayLast(doc->pages))
-+  if (number && is_not_last_page(number) && cupsArrayLast(doc->pages) &&
-+      check_range(doc, (number - 1) / doc->number_up + 1))
-   {
-     pageinfo = (pstops_page_t *)cupsArrayLast(doc->pages);
-