Updated print/cups to 1.1.18. Changes from version 1.1.17 include:

- SECURITY FIX: The scheduler now provides a FileDevice directive to
  control whether new printers can be added using device URIs of the form
  "file:/filename".  The default is to not allow printers with these
  device URIs.
- SECURITY FIX: Potential underflow/overflow bug in web interface.
- SECURITY FIX: Race condition in certificate creation.
- SECURITY FIX: Bad URIs in browse packets could be used to exploit the
  web interface underflow/overflow bug.
- SECURITY FIX: Some types of Denial of Service attacks were not handled
  properly, so once the attack was over the scheduler did not close the
  connections immediately on all platforms.
- SECURITY FIXES: Added integer overflow/underflow checks for all image
  formats.
- Bug fixes to the scheduler.
- Upgraded pdftops filter to Xpdf 2.01 with fixes for TrueType fonts.
- Added a MaxClientsPerHost configuration directive to provide limited
  protection against Denial of Service attacks.

4 files changed, 47 insertions, 42 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 8de16142555..78b9f8255bd 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.848 2002/12/19 22:26:12 jlam Exp $
+$NetBSD: CHANGES,v 1.849 2002/12/20 07:00:45 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2002:
 
@@ -4023,3 +4023,4 @@ Changes to the packages collection and infrastructure in 2002:
 	Updated openslp to 1.0.10 [jlam 2002-12-19]
 	Updated png to 1.2.5nb1 [fredb 2002-12-19]
 	Updated cups to 1.1.17 [jlam 2002-12-19]
+	Updated cups to 1.1.18 [jlam 2002-12-20]
diff --git a/print/cups/Makefile b/print/cups/Makefile
index f4632cd2111..621f9fd6a9f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2002/12/19 22:24:51 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2002/12/20 06:59:58 jlam 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-${VERS}
-BASE_VERS=		1.1.17
+BASE_VERS=		1.1.18
 DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 320f4beff78..e2a9f789947 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/12/19 22:24:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/12/20 06:59:59 jlam Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -54,6 +54,7 @@ libexec/cups/filter/rastertohp
 libexec/cups/filter/texttops
 man/cat1/backend.0
 man/cat1/cancel.0
+man/cat1/cupstestppd.0
 man/cat1/filter.0
 man/cat1/lp.0
 man/cat1/lpoptions.0
@@ -82,6 +83,7 @@ man/cat8/lpmove.0
 man/cat8/reject.0
 man/fr/cat1/backend.0
 man/fr/cat1/cancel.0
+man/fr/cat1/cupstestppd.0
 man/fr/cat1/filter.0
 man/fr/cat1/lp.0
 man/fr/cat1/lpoptions.0
@@ -110,6 +112,7 @@ man/fr/cat8/lpmove.0
 man/fr/cat8/reject.0
 man/fr/man1/backend.1
 man/fr/man1/cancel.1
+man/fr/man1/cupstestppd.1
 man/fr/man1/filter.1
 man/fr/man1/lp.1
 man/fr/man1/lpoptions.1
@@ -138,6 +141,7 @@ man/fr/man8/lpmove.8
 man/fr/man8/reject.8
 man/man1/backend.1
 man/man1/cancel.1
+man/man1/cupstestppd.1
 man/man1/filter.1
 man/man1/lp.1
 man/man1/lpoptions.1
@@ -167,6 +171,7 @@ man/man8/reject.8
 sbin/accept
 sbin/cupsaddsmb
 sbin/cupsd
+sbin/cupstestppd
 sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
@@ -203,6 +208,7 @@ share/cups/charsets/windows-1255
 share/cups/charsets/windows-1256
 share/cups/charsets/windows-1257
 share/cups/charsets/windows-1258
+share/cups/charsets/windows-874
 share/cups/data/HPGLprolog
 share/cups/data/psglyphs
 share/cups/data/testprint.ps
@@ -211,7 +217,37 @@ share/cups/fonts/Courier-Bold
 share/cups/fonts/Courier-BoldOblique
 share/cups/fonts/Courier-Oblique
 share/cups/fonts/Symbol
-share/cups/templates/fr/add-class.tmpl 
+share/cups/model/deskjet.ppd
+share/cups/model/deskjet2.ppd
+share/cups/model/dymo.ppd
+share/cups/model/epson24.ppd
+share/cups/model/epson9.ppd
+share/cups/model/laserjet.ppd
+share/cups/model/okidat24.ppd
+share/cups/model/okidata9.ppd
+share/cups/model/stcolor.ppd
+share/cups/model/stcolor2.ppd
+share/cups/model/stphoto.ppd
+share/cups/model/stphoto2.ppd
+share/cups/templates/add-class.tmpl
+share/cups/templates/add-printer.tmpl
+share/cups/templates/admin-op.tmpl
+share/cups/templates/admin.tmpl
+share/cups/templates/choose-device.tmpl
+share/cups/templates/choose-make.tmpl
+share/cups/templates/choose-members.tmpl
+share/cups/templates/choose-model.tmpl
+share/cups/templates/choose-serial.tmpl
+share/cups/templates/choose-uri.tmpl
+share/cups/templates/class-added.tmpl
+share/cups/templates/class-confirm.tmpl
+share/cups/templates/class-deleted.tmpl
+share/cups/templates/class-modified.tmpl
+share/cups/templates/classes.tmpl
+share/cups/templates/config-printer.tmpl
+share/cups/templates/config-printer2.tmpl
+share/cups/templates/error.tmpl
+share/cups/templates/fr/add-class.tmpl
 share/cups/templates/fr/add-printer.tmpl
 share/cups/templates/fr/admin-op.tmpl
 share/cups/templates/fr/admin.tmpl
@@ -256,36 +292,6 @@ share/cups/templates/fr/printer-stop.tmpl
 share/cups/templates/fr/printers.tmpl
 share/cups/templates/fr/test-page.tmpl
 share/cups/templates/fr/trailer.tmpl
-share/cups/model/deskjet.ppd
-share/cups/model/deskjet2.ppd
-share/cups/model/dymo.ppd
-share/cups/model/epson24.ppd
-share/cups/model/epson9.ppd
-share/cups/model/laserjet.ppd
-share/cups/model/okidat24.ppd
-share/cups/model/okidata9.ppd
-share/cups/model/stcolor.ppd
-share/cups/model/stcolor2.ppd
-share/cups/model/stphoto.ppd
-share/cups/model/stphoto2.ppd
-share/cups/templates/add-class.tmpl
-share/cups/templates/add-printer.tmpl
-share/cups/templates/admin-op.tmpl
-share/cups/templates/admin.tmpl
-share/cups/templates/choose-device.tmpl
-share/cups/templates/choose-make.tmpl
-share/cups/templates/choose-members.tmpl
-share/cups/templates/choose-model.tmpl
-share/cups/templates/choose-serial.tmpl
-share/cups/templates/choose-uri.tmpl
-share/cups/templates/class-added.tmpl
-share/cups/templates/class-confirm.tmpl
-share/cups/templates/class-deleted.tmpl
-share/cups/templates/class-modified.tmpl
-share/cups/templates/classes.tmpl
-share/cups/templates/config-printer.tmpl
-share/cups/templates/config-printer2.tmpl
-share/cups/templates/error.tmpl
 share/cups/templates/header.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
@@ -343,11 +349,11 @@ share/doc/html/cups/fr/images/modify-class.gif
 share/doc/html/cups/fr/images/modify-printer.gif
 share/doc/html/cups/fr/images/navbar.gif
 share/doc/html/cups/fr/images/print-test-page.gif
-share/doc/html/cups/fr/images/reject-jobs.gif 
+share/doc/html/cups/fr/images/reject-jobs.gif
 share/doc/html/cups/fr/images/release-job.gif
 share/doc/html/cups/fr/images/restart-job.gif
 share/doc/html/cups/fr/images/show-active.gif
-share/doc/html/cups/fr/images/show-completed.gif 
+share/doc/html/cups/fr/images/show-completed.gif
 share/doc/html/cups/fr/images/start-class.gif
 share/doc/html/cups/fr/images/start-printer.gif
 share/doc/html/cups/fr/images/stop-class.gif
@@ -444,11 +450,9 @@ ${PKGLOCALEDIR}/locale/sv/cups_sv
 ${PKGLOCALEDIR}/locale/uk/cups_uk
 ${PKGLOCALEDIR}/locale/uk_UA.cp1251/cups_uk_UA.cp1251
 ${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN
-share/cups/charsets/windows-874
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/uk_UA.cp1251 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.koi8r 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.cp1251 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/be 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/C 2>/dev/null || ${TRUE}
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
diff --git a/print/cups/distinfo b/print/cups/distinfo
index f396bb9566c..f6454d3bae4 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2002/12/19 22:24:51 jlam Exp $
+$NetBSD: distinfo,v 1.20 2002/12/20 06:59:59 jlam Exp $
 
-SHA1 (cups-1.1.17-source.tar.bz2) = bd1469a441472139e4ffb64a6d62ba2dd8971dda
-Size (cups-1.1.17-source.tar.bz2) = 3442020 bytes
+SHA1 (cups-1.1.18-source.tar.bz2) = 03973207391df399608691563e804ed5afce45b3
+Size (cups-1.1.18-source.tar.bz2) = 3491321 bytes
 SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d
 SHA1 (patch-an) = 5ef594098978476eaee13cc8afc05679b6321176
 SHA1 (patch-ao) = cbe2edda168434d0c58214f2a8089555357de292