Update print/cups to 1.1.23. Changes from version 1.1.22 include:

- The scheduler's is_path_absolute() code could cause a DoS (STR #1042)
- The scheduler's device loading code used the wrong size limits for the
  make/model and info parameters (STR #1035)
- The PNG loading code did not use a "long unsigned integer" format
  specifier for the width and height (STR #1032)
- The web interface only showed the first 4 or 8 characters of
  "{variable-name}" for undefined template variables (STR #1031)
- The hpgltops filter did not handle a common PCL command to enter
  HP-GL/2 mode (STR #1037)
- The scheduler no longer sends the page-set option when printing banner
  pages (STR #995)
- The hpgltops filter contained two buffer overflows that could
  potentially allow remote access to the "lp" account (STR #1024)
- The lppasswd command did not protect against file descriptor or ulimit
  attacks (STR #1023)
- The "lpc status" command used the wrong resource path when querying
  the list of printers and jobs, causing unnecessary authentication
  requests (STR #1018)
- The httpWait() function did not handle signal interruptions (STR #1020)
- The USB backend used the wrong size status variable when checking the
  printer status (STR #1017)
- The scheduler did not delete classes from other classes or implicit
  classes, which could cause a crash (STR #1015)
- The IPP backend now logs the remote print job ID at log level NOTICE
  instead of INFO (so it shows up in the error_log file...)

5 files changed, 229 insertions, 208 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 2c9000f8148..6a50d770b91 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2004/12/29 15:31:24 minskim Exp $
+# $NetBSD: Makefile,v 1.86 2005/01/06 07:26:39 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,12 +6,11 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-BASE_VERS=	1.1.22
+BASE_VERS=	1.1.23
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
-PKGREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
+MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
 		ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
 		ftp://ftp3.easysw.com/pub/cups/${BASE_VERS}/ \
 		ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
@@ -41,7 +40,7 @@ INSTALL_TARGET=		installcups
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/cups
 CONFIGURE_ARGS+=	--with-serverbindir=${PREFIX}/libexec/cups
 CONFIGURE_ARGS+=	--with-rcdir=${RCD_SCRIPTS_DIR}
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 800e032e4dc..24bb543f769 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/11/08 16:30:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/01/06 07:26:39 jlam Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestppd
@@ -92,11 +92,11 @@ man/es/cat5/mime.convs.0
 man/es/cat5/mime.types.0
 man/es/cat5/printers.conf.0
 man/es/cat8/accept.0
-man/es/cat8/disable.0
 man/es/cat8/cups-lpd.0
 man/es/cat8/cups-polld.0
 man/es/cat8/cupsaddsmb.0
 man/es/cat8/cupsd.0
+man/es/cat8/disable.0
 man/es/cat8/enable.0
 man/es/cat8/lpadmin.0
 man/es/cat8/lpc.0
@@ -515,191 +515,191 @@ share/doc/cups/CGI.txt
 share/doc/cups/ENCRYPTION.txt
 share/doc/cups/LICENSE.txt
 share/doc/cups/README.txt
-share/doc/html/cups/be/documentation.html
-share/doc/html/cups/be/images/accept-jobs.gif
-share/doc/html/cups/be/images/add-class.gif
-share/doc/html/cups/be/images/add-printer.gif
-share/doc/html/cups/be/images/cancel-job.gif
-share/doc/html/cups/be/images/config-printer.gif
-share/doc/html/cups/be/images/continue.gif
-share/doc/html/cups/be/images/delete-class.gif
-share/doc/html/cups/be/images/delete-printer.gif
-share/doc/html/cups/be/images/hold-job.gif
-share/doc/html/cups/be/images/manage-classes.gif
-share/doc/html/cups/be/images/manage-jobs.gif
-share/doc/html/cups/be/images/manage-printers.gif
-share/doc/html/cups/be/images/modify-class.gif
-share/doc/html/cups/be/images/modify-printer.gif
-share/doc/html/cups/be/images/navbar.gif
-share/doc/html/cups/be/images/print-test-page.gif
-share/doc/html/cups/be/images/reject-jobs.gif
-share/doc/html/cups/be/images/release-job.gif
-share/doc/html/cups/be/images/restart-job.gif
-share/doc/html/cups/be/images/show-active.gif
-share/doc/html/cups/be/images/show-completed.gif
-share/doc/html/cups/be/images/start-class.gif
-share/doc/html/cups/be/images/start-printer.gif
-share/doc/html/cups/be/images/stop-class.gif
-share/doc/html/cups/be/images/stop-printer.gif
-share/doc/html/cups/be/index.html
-share/doc/html/cups/cmp.html
-share/doc/html/cups/cmp.pdf
-share/doc/html/cups/cups.css
-share/doc/html/cups/cupsdoc.css
-share/doc/html/cups/de/documentation.html
-share/doc/html/cups/de/images/accept-jobs.gif
-share/doc/html/cups/de/images/add-class.gif
-share/doc/html/cups/de/images/add-printer.gif
-share/doc/html/cups/de/images/cancel-job.gif
-share/doc/html/cups/de/images/config-printer.gif
-share/doc/html/cups/de/images/continue.gif
-share/doc/html/cups/de/images/delete-class.gif
-share/doc/html/cups/de/images/delete-printer.gif
-share/doc/html/cups/de/images/hold-job.gif
-share/doc/html/cups/de/images/manage-classes.gif
-share/doc/html/cups/de/images/manage-jobs.gif
-share/doc/html/cups/de/images/manage-printers.gif
-share/doc/html/cups/de/images/modify-class.gif
-share/doc/html/cups/de/images/modify-printer.gif
-share/doc/html/cups/de/images/navbar.gif
-share/doc/html/cups/de/images/print-test-page.gif
-share/doc/html/cups/de/images/reject-jobs.gif
-share/doc/html/cups/de/images/release-job.gif
-share/doc/html/cups/de/images/restart-job.gif
-share/doc/html/cups/de/images/show-active.gif
-share/doc/html/cups/de/images/show-completed.gif
-share/doc/html/cups/de/images/start-class.gif
-share/doc/html/cups/de/images/start-printer.gif
-share/doc/html/cups/de/images/stop-class.gif
-share/doc/html/cups/de/images/stop-printer.gif
-share/doc/html/cups/de/index.html
-share/doc/html/cups/documentation.html
-share/doc/html/cups/es/documentation.html
-share/doc/html/cups/es/images/accept-jobs.gif
-share/doc/html/cups/es/images/add-class.gif
-share/doc/html/cups/es/images/add-printer.gif
-share/doc/html/cups/es/images/cancel-job.gif
-share/doc/html/cups/es/images/config-printer.gif
-share/doc/html/cups/es/images/continue.gif
-share/doc/html/cups/es/images/delete-class.gif
-share/doc/html/cups/es/images/delete-printer.gif
-share/doc/html/cups/es/images/hold-job.gif
-share/doc/html/cups/es/images/manage-classes.gif
-share/doc/html/cups/es/images/manage-jobs.gif
-share/doc/html/cups/es/images/manage-printers.gif
-share/doc/html/cups/es/images/modify-class.gif
-share/doc/html/cups/es/images/modify-printer.gif
-share/doc/html/cups/es/images/navbar.gif
-share/doc/html/cups/es/images/print-test-page.gif
-share/doc/html/cups/es/images/reject-jobs.gif
-share/doc/html/cups/es/images/release-job.gif
-share/doc/html/cups/es/images/restart-job.gif
-share/doc/html/cups/es/images/set-as-default.gif
-share/doc/html/cups/es/images/show-active.gif
-share/doc/html/cups/es/images/show-completed.gif
-share/doc/html/cups/es/images/start-class.gif
-share/doc/html/cups/es/images/start-printer.gif
-share/doc/html/cups/es/images/stop-class.gif
-share/doc/html/cups/es/images/stop-printer.gif
-share/doc/html/cups/es/index.html
-share/doc/html/cups/fr/cups.css
-share/doc/html/cups/fr/cupsdoc.css
-share/doc/html/cups/fr/documentation.html
-share/doc/html/cups/fr/images/accept-jobs.gif
-share/doc/html/cups/fr/images/add-class.gif
-share/doc/html/cups/fr/images/add-printer.gif
-share/doc/html/cups/fr/images/cancel-job.gif
-share/doc/html/cups/fr/images/config-printer.gif
-share/doc/html/cups/fr/images/continue.gif
-share/doc/html/cups/fr/images/delete-class.gif
-share/doc/html/cups/fr/images/delete-printer.gif
-share/doc/html/cups/fr/images/hold-job.gif
-share/doc/html/cups/fr/images/manage-classes.gif
-share/doc/html/cups/fr/images/manage-jobs.gif
-share/doc/html/cups/fr/images/manage-printers.gif
-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/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/start-class.gif
-share/doc/html/cups/fr/images/start-printer.gif
-share/doc/html/cups/fr/images/stop-class.gif
-share/doc/html/cups/fr/images/stop-printer.gif
-share/doc/html/cups/fr/index.html
-share/doc/html/cups/fr/overview.html
-share/doc/html/cups/fr/overview.pdf
-share/doc/html/cups/fr/sam.html
-share/doc/html/cups/fr/sam.pdf
-share/doc/html/cups/fr/sum.html
-share/doc/html/cups/fr/sum.pdf
-share/doc/html/cups/idd.html
-share/doc/html/cups/idd.pdf
-share/doc/html/cups/images/accept-jobs.gif
-share/doc/html/cups/images/add-class.gif
-share/doc/html/cups/images/add-printer.gif
-share/doc/html/cups/images/cancel-job.gif
-share/doc/html/cups/images/classes.gif
-share/doc/html/cups/images/config-printer.gif
-share/doc/html/cups/images/continue.gif
-share/doc/html/cups/images/cups-block-diagram.gif
-share/doc/html/cups/images/cups-large.gif
-share/doc/html/cups/images/cups-medium.gif
-share/doc/html/cups/images/cups-small.gif
-share/doc/html/cups/images/delete-class.gif
-share/doc/html/cups/images/delete-printer.gif
-share/doc/html/cups/images/hold-job.gif
-share/doc/html/cups/images/left.gif
-share/doc/html/cups/images/logo.gif
-share/doc/html/cups/images/manage-classes.gif
-share/doc/html/cups/images/manage-jobs.gif
-share/doc/html/cups/images/manage-printers.gif
-share/doc/html/cups/images/modify-class.gif
-share/doc/html/cups/images/modify-printer.gif
-share/doc/html/cups/images/navbar.gif
-share/doc/html/cups/images/print-test-page.gif
-share/doc/html/cups/images/printer-idle.gif
-share/doc/html/cups/images/printer-processing.gif
-share/doc/html/cups/images/printer-stopped.gif
-share/doc/html/cups/images/reject-jobs.gif
-share/doc/html/cups/images/release-job.gif
-share/doc/html/cups/images/restart-job.gif
-share/doc/html/cups/images/right.gif
-share/doc/html/cups/images/set-as-default.gif
-share/doc/html/cups/images/show-active.gif
-share/doc/html/cups/images/show-completed.gif
-share/doc/html/cups/images/start-class.gif
-share/doc/html/cups/images/start-printer.gif
-share/doc/html/cups/images/stop-class.gif
-share/doc/html/cups/images/stop-printer.gif
-share/doc/html/cups/index.html
-share/doc/html/cups/ipp.html
-share/doc/html/cups/ipp.pdf
-share/doc/html/cups/overview.html
-share/doc/html/cups/overview.pdf
-share/doc/html/cups/robots.txt
-share/doc/html/cups/sam.html
-share/doc/html/cups/sam.pdf
-share/doc/html/cups/sdd.html
-share/doc/html/cups/sdd.pdf
-share/doc/html/cups/spm.html
-share/doc/html/cups/spm.pdf
-share/doc/html/cups/sps.html
-share/doc/html/cups/sps.pdf
-share/doc/html/cups/ssr.html
-share/doc/html/cups/ssr.pdf
-share/doc/html/cups/stp.html
-share/doc/html/cups/stp.pdf
-share/doc/html/cups/sum.html
-share/doc/html/cups/sum.pdf
-share/doc/html/cups/svd.html
-share/doc/html/cups/svd.pdf
-share/doc/html/cups/translation.html
-share/doc/html/cups/translation.pdf
+share/doc/cups/be/documentation.html
+share/doc/cups/be/images/accept-jobs.gif
+share/doc/cups/be/images/add-class.gif
+share/doc/cups/be/images/add-printer.gif
+share/doc/cups/be/images/cancel-job.gif
+share/doc/cups/be/images/config-printer.gif
+share/doc/cups/be/images/continue.gif
+share/doc/cups/be/images/delete-class.gif
+share/doc/cups/be/images/delete-printer.gif
+share/doc/cups/be/images/hold-job.gif
+share/doc/cups/be/images/manage-classes.gif
+share/doc/cups/be/images/manage-jobs.gif
+share/doc/cups/be/images/manage-printers.gif
+share/doc/cups/be/images/modify-class.gif
+share/doc/cups/be/images/modify-printer.gif
+share/doc/cups/be/images/navbar.gif
+share/doc/cups/be/images/print-test-page.gif
+share/doc/cups/be/images/reject-jobs.gif
+share/doc/cups/be/images/release-job.gif
+share/doc/cups/be/images/restart-job.gif
+share/doc/cups/be/images/show-active.gif
+share/doc/cups/be/images/show-completed.gif
+share/doc/cups/be/images/start-class.gif
+share/doc/cups/be/images/start-printer.gif
+share/doc/cups/be/images/stop-class.gif
+share/doc/cups/be/images/stop-printer.gif
+share/doc/cups/be/index.html
+share/doc/cups/cmp.html
+share/doc/cups/cmp.pdf
+share/doc/cups/cups.css
+share/doc/cups/cupsdoc.css
+share/doc/cups/de/documentation.html
+share/doc/cups/de/images/accept-jobs.gif
+share/doc/cups/de/images/add-class.gif
+share/doc/cups/de/images/add-printer.gif
+share/doc/cups/de/images/cancel-job.gif
+share/doc/cups/de/images/config-printer.gif
+share/doc/cups/de/images/continue.gif
+share/doc/cups/de/images/delete-class.gif
+share/doc/cups/de/images/delete-printer.gif
+share/doc/cups/de/images/hold-job.gif
+share/doc/cups/de/images/manage-classes.gif
+share/doc/cups/de/images/manage-jobs.gif
+share/doc/cups/de/images/manage-printers.gif
+share/doc/cups/de/images/modify-class.gif
+share/doc/cups/de/images/modify-printer.gif
+share/doc/cups/de/images/navbar.gif
+share/doc/cups/de/images/print-test-page.gif
+share/doc/cups/de/images/reject-jobs.gif
+share/doc/cups/de/images/release-job.gif
+share/doc/cups/de/images/restart-job.gif
+share/doc/cups/de/images/show-active.gif
+share/doc/cups/de/images/show-completed.gif
+share/doc/cups/de/images/start-class.gif
+share/doc/cups/de/images/start-printer.gif
+share/doc/cups/de/images/stop-class.gif
+share/doc/cups/de/images/stop-printer.gif
+share/doc/cups/de/index.html
+share/doc/cups/documentation.html
+share/doc/cups/es/documentation.html
+share/doc/cups/es/images/accept-jobs.gif
+share/doc/cups/es/images/add-class.gif
+share/doc/cups/es/images/add-printer.gif
+share/doc/cups/es/images/cancel-job.gif
+share/doc/cups/es/images/config-printer.gif
+share/doc/cups/es/images/continue.gif
+share/doc/cups/es/images/delete-class.gif
+share/doc/cups/es/images/delete-printer.gif
+share/doc/cups/es/images/hold-job.gif
+share/doc/cups/es/images/manage-classes.gif
+share/doc/cups/es/images/manage-jobs.gif
+share/doc/cups/es/images/manage-printers.gif
+share/doc/cups/es/images/modify-class.gif
+share/doc/cups/es/images/modify-printer.gif
+share/doc/cups/es/images/navbar.gif
+share/doc/cups/es/images/print-test-page.gif
+share/doc/cups/es/images/reject-jobs.gif
+share/doc/cups/es/images/release-job.gif
+share/doc/cups/es/images/restart-job.gif
+share/doc/cups/es/images/set-as-default.gif
+share/doc/cups/es/images/show-active.gif
+share/doc/cups/es/images/show-completed.gif
+share/doc/cups/es/images/start-class.gif
+share/doc/cups/es/images/start-printer.gif
+share/doc/cups/es/images/stop-class.gif
+share/doc/cups/es/images/stop-printer.gif
+share/doc/cups/es/index.html
+share/doc/cups/fr/cups.css
+share/doc/cups/fr/cupsdoc.css
+share/doc/cups/fr/documentation.html
+share/doc/cups/fr/images/accept-jobs.gif
+share/doc/cups/fr/images/add-class.gif
+share/doc/cups/fr/images/add-printer.gif
+share/doc/cups/fr/images/cancel-job.gif
+share/doc/cups/fr/images/config-printer.gif
+share/doc/cups/fr/images/continue.gif
+share/doc/cups/fr/images/delete-class.gif
+share/doc/cups/fr/images/delete-printer.gif
+share/doc/cups/fr/images/hold-job.gif
+share/doc/cups/fr/images/manage-classes.gif
+share/doc/cups/fr/images/manage-jobs.gif
+share/doc/cups/fr/images/manage-printers.gif
+share/doc/cups/fr/images/modify-class.gif
+share/doc/cups/fr/images/modify-printer.gif
+share/doc/cups/fr/images/navbar.gif
+share/doc/cups/fr/images/print-test-page.gif
+share/doc/cups/fr/images/reject-jobs.gif
+share/doc/cups/fr/images/release-job.gif
+share/doc/cups/fr/images/restart-job.gif
+share/doc/cups/fr/images/show-active.gif
+share/doc/cups/fr/images/show-completed.gif
+share/doc/cups/fr/images/start-class.gif
+share/doc/cups/fr/images/start-printer.gif
+share/doc/cups/fr/images/stop-class.gif
+share/doc/cups/fr/images/stop-printer.gif
+share/doc/cups/fr/index.html
+share/doc/cups/fr/overview.html
+share/doc/cups/fr/overview.pdf
+share/doc/cups/fr/sam.html
+share/doc/cups/fr/sam.pdf
+share/doc/cups/fr/sum.html
+share/doc/cups/fr/sum.pdf
+share/doc/cups/idd.html
+share/doc/cups/idd.pdf
+share/doc/cups/images/accept-jobs.gif
+share/doc/cups/images/add-class.gif
+share/doc/cups/images/add-printer.gif
+share/doc/cups/images/cancel-job.gif
+share/doc/cups/images/classes.gif
+share/doc/cups/images/config-printer.gif
+share/doc/cups/images/continue.gif
+share/doc/cups/images/cups-block-diagram.gif
+share/doc/cups/images/cups-large.gif
+share/doc/cups/images/cups-medium.gif
+share/doc/cups/images/cups-small.gif
+share/doc/cups/images/delete-class.gif
+share/doc/cups/images/delete-printer.gif
+share/doc/cups/images/hold-job.gif
+share/doc/cups/images/left.gif
+share/doc/cups/images/logo.gif
+share/doc/cups/images/manage-classes.gif
+share/doc/cups/images/manage-jobs.gif
+share/doc/cups/images/manage-printers.gif
+share/doc/cups/images/modify-class.gif
+share/doc/cups/images/modify-printer.gif
+share/doc/cups/images/navbar.gif
+share/doc/cups/images/print-test-page.gif
+share/doc/cups/images/printer-idle.gif
+share/doc/cups/images/printer-processing.gif
+share/doc/cups/images/printer-stopped.gif
+share/doc/cups/images/reject-jobs.gif
+share/doc/cups/images/release-job.gif
+share/doc/cups/images/restart-job.gif
+share/doc/cups/images/right.gif
+share/doc/cups/images/set-as-default.gif
+share/doc/cups/images/show-active.gif
+share/doc/cups/images/show-completed.gif
+share/doc/cups/images/start-class.gif
+share/doc/cups/images/start-printer.gif
+share/doc/cups/images/stop-class.gif
+share/doc/cups/images/stop-printer.gif
+share/doc/cups/index.html
+share/doc/cups/ipp.html
+share/doc/cups/ipp.pdf
+share/doc/cups/overview.html
+share/doc/cups/overview.pdf
+share/doc/cups/robots.txt
+share/doc/cups/sam.html
+share/doc/cups/sam.pdf
+share/doc/cups/sdd.html
+share/doc/cups/sdd.pdf
+share/doc/cups/spm.html
+share/doc/cups/spm.pdf
+share/doc/cups/sps.html
+share/doc/cups/sps.pdf
+share/doc/cups/ssr.html
+share/doc/cups/ssr.pdf
+share/doc/cups/stp.html
+share/doc/cups/stp.pdf
+share/doc/cups/sum.html
+share/doc/cups/sum.pdf
+share/doc/cups/svd.html
+share/doc/cups/svd.pdf
+share/doc/cups/translation.html
+share/doc/cups/translation.pdf
 share/examples/cups/classes.conf
 share/examples/cups/client.conf
 ${PAM}share/examples/cups/cups.pam
@@ -726,16 +726,15 @@ ${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/C 2>/dev/null || ${TRUE}
 @dirrm share/examples/cups
-@dirrm share/doc/html/cups/images
-@dirrm share/doc/html/cups/fr/images
-@dirrm share/doc/html/cups/fr
-@dirrm share/doc/html/cups/es/images
-@dirrm share/doc/html/cups/es
-@dirrm share/doc/html/cups/de/images
-@dirrm share/doc/html/cups/de
-@dirrm share/doc/html/cups/be/images
-@dirrm share/doc/html/cups/be
-@dirrm share/doc/html/cups
+@dirrm share/doc/cups/images
+@dirrm share/doc/cups/fr/images
+@dirrm share/doc/cups/fr
+@dirrm share/doc/cups/es/images
+@dirrm share/doc/cups/es
+@dirrm share/doc/cups/de/images
+@dirrm share/doc/cups/de
+@dirrm share/doc/cups/be/images
+@dirrm share/doc/cups/be
 @dirrm share/doc/cups
 @dirrm share/cups/templates/fr
 @dirrm share/cups/templates/es
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 78a44b39820..9a86eef3893 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.26 2004/11/08 16:30:59 adam Exp $
+$NetBSD: distinfo,v 1.27 2005/01/06 07:26:39 jlam Exp $
 
-SHA1 (cups-1.1.22-source.tar.bz2) = 287fa4ee304617a40521efe694802d015cf865af
-Size (cups-1.1.22-source.tar.bz2) = 8527045 bytes
+SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
+Size (cups-1.1.23-source.tar.bz2) = 8705521 bytes
 SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8
 SHA1 (patch-ac) = 45388ca8b1bfeaf5d3649b766f65ac7f3108af74
 SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677
 SHA1 (patch-an) = de699800471069b1521ab2ba7194df445fb75892
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
+SHA1 (patch-at) = 6f5da25427ed40c7baec9b78220dfdc4eeb6b55b
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index 06b2283cff9..4000f876f33 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cupsd.sh,v 1.18 2004/01/10 03:32:09 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.19 2005/01/06 07:26:39 jlam Exp $
 #
 # Common UNIX Printing System daemon
 #
@@ -64,8 +64,8 @@ cupsd_waitcmd()
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
-	[ -z "${cupsd_wait}" ] && cupsd_wait=NO
-	[ -z "${cupsd_timeout}" ] && cupsd_timeout=60
+	: ${cupsd_wait:=NO}
+	: ${cupsd_timeout:=60}
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
new file mode 100644
index 00000000000..e238ec8a6cd
--- /dev/null
+++ b/print/cups/patches/patch-at
@@ -0,0 +1,22 @@
+$NetBSD: patch-at,v 1.5 2005/01/06 07:26:39 jlam Exp $
+
+--- scheduler/Makefile.orig	2005-01-03 14:29:59.000000000 -0500
++++ scheduler/Makefile
+@@ -60,12 +60,16 @@ depend:
+ # Install the scheduler...
+ #
+ 
+-install:	all
++install:	installbin installdir
++
++installbin:	all
+ 	$(INSTALL_DIR) $(SBINDIR)
+ 	$(INSTALL_BIN) cupsd $(SBINDIR)
+ 	$(INSTALL_DIR) $(SERVERBIN)/daemon
+ 	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
+ 	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
++
++installdir:
+ 	$(INSTALL_DIR) -m 711 $(SERVERROOT)/certs
+ 	$(INSTALL_DIR) $(SERVERROOT)/interfaces
+ 	$(INSTALL_DIR) $(SERVERROOT)/ppd