From e0ea4e12f06fe9683ccf309168077094f9b21778 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 22 Jan 2008 23:58:13 +0000 Subject: Update cups to 1.3.5 Adds dns-sd support and Negotiate authentication (kerberos) various bug fixes. --- print/cups/Makefile | 34 ++---- print/cups/PLIST | 253 +++++++++++++++++++++++++++++++++++++++----- print/cups/distinfo | 16 +-- print/cups/options.mk | 33 ++++++ print/cups/patches/patch-ab | 16 +-- print/cups/patches/patch-an | 70 +++++++----- print/cups/patches/patch-ao | 12 +-- print/cups/patches/patch-au | 155 --------------------------- 8 files changed, 329 insertions(+), 260 deletions(-) create mode 100644 print/cups/options.mk delete mode 100644 print/cups/patches/patch-au (limited to 'print/cups') diff --git a/print/cups/Makefile b/print/cups/Makefile index ec98c7b55cb..bcbc28c370b 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.130 2008/01/18 05:08:53 tnn Exp $ +# $NetBSD: Makefile,v 1.131 2008/01/22 23:58:13 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.2.12 +BASE_VERS= 1.3.5 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} -PKGREVISION= 3 CATEGORIES= print MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \ @@ -52,6 +51,8 @@ CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} CONFIGURE_ARGS+= --with-manext=bsd CONFIGURE_ARGS+= --without-perl +CONFIGURE_ARGS+= --without-icondir +CONFIGURE_ARGS+= --without-menudir CONFIGURE_ARGS+= --enable-libtool CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ARGS+= --enable-gnutls=no @@ -61,30 +62,7 @@ CONFIGURE_ARGS+= --without-php CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} .include "../../mk/bsd.prefs.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.cups -PKG_SUPPORTED_OPTIONS= pam slp -PKG_SUGGESTED_OPTIONS= slp -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mpam) -. include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --enable-pam -MESSAGE_SRC= ${PKGDIR}/MESSAGE -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam -PLIST_SUBST+= PAM= -.else -CONFIGURE_ARGS+= --disable-pam -MESSAGE_SRC= ${.CURDIR}/MESSAGE -PLIST_SUBST+= PAM="@comment " -.endif - -.if !empty(PKG_OPTIONS:Mslp) -.include "../../net/openslp/buildlink3.mk" -CONFIGURE_ARGS+= --enable-slp -.else -CONFIGURE_ARGS+= --disable-slp -.endif +.include "options.mk" # CUPS_USER username of the CUPS administrator # CUPS_GROUP group of the CUPS administrator @@ -159,7 +137,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$${file} \ ${DESTDIR}${DOCDIR}/$${file}; \ done - cd ${WRKSRC}/conf; for file in *.conf mime.*; do \ + cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \ case $${file} in \ pam.conf) \ ;; \ diff --git a/print/cups/PLIST b/print/cups/PLIST index 39fe2ba05de..cb7f5f332b3 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2007/06/06 11:14:27 markd Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/01/22 23:58:13 markd Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -21,9 +21,9 @@ include/cups/i18n.h include/cups/image.h include/cups/ipp.h include/cups/language.h -include/cups/md5.h include/cups/ppd.h include/cups/raster.h +include/cups/sidechannel.h include/cups/transcode.h lib/libcups.la lib/libcupsimage.la @@ -59,6 +59,7 @@ libexec/cups/filter/texttops libexec/cups/monitor/bcp libexec/cups/monitor/tbcp libexec/cups/notifier/mailto +libexec/cups/notifier/rss libexec/cups/notifier/testnotify man/man1/cancel.1 man/man1/cups-config.1 @@ -88,9 +89,11 @@ man/man8/cups-driverd.8 man/man8/cups-lpd.8 man/man8/cups-polld.8 man/man8/cupsaddsmb.8 +man/man8/cupsctl.8 man/man8/cupsd.8 man/man8/cupsdisable.8 man/man8/cupsenable.8 +man/man8/cupsfilter.8 man/man8/lpadmin.8 man/man8/lpc.8 man/man8/lpinfo.8 @@ -98,9 +101,11 @@ man/man8/lpmove.8 man/man8/reject.8 sbin/accept sbin/cupsaddsmb +sbin/cupsctl sbin/cupsd sbin/cupsdisable sbin/cupsenable +sbin/cupsfilter sbin/lpadmin sbin/lpc sbin/lpinfo @@ -149,32 +154,7 @@ share/cups/charmaps/windows-932.txt share/cups/charmaps/windows-936.txt share/cups/charmaps/windows-949.txt share/cups/charmaps/windows-950.txt -share/cups/charsets/iso-8859-1 -share/cups/charsets/iso-8859-10 -share/cups/charsets/iso-8859-13 -share/cups/charsets/iso-8859-14 -share/cups/charsets/iso-8859-15 -share/cups/charsets/iso-8859-2 -share/cups/charsets/iso-8859-3 -share/cups/charsets/iso-8859-4 -share/cups/charsets/iso-8859-5 -share/cups/charsets/iso-8859-6 -share/cups/charsets/iso-8859-7 -share/cups/charsets/iso-8859-8 -share/cups/charsets/iso-8859-9 -share/cups/charsets/koi8-r -share/cups/charsets/koi8-u share/cups/charsets/utf-8 -share/cups/charsets/windows-1250 -share/cups/charsets/windows-1251 -share/cups/charsets/windows-1252 -share/cups/charsets/windows-1253 -share/cups/charsets/windows-1254 -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 @@ -184,10 +164,10 @@ share/cups/fonts/Courier-BoldOblique share/cups/fonts/Courier-Oblique share/cups/fonts/Symbol 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/intelbar.ppd share/cups/model/laserjet.ppd share/cups/model/okidat24.ppd share/cups/model/okidata9.ppd @@ -196,10 +176,12 @@ share/cups/model/stcolor2.ppd share/cups/model/stphoto.ppd share/cups/model/stphoto2.ppd share/cups/model/zebra.ppd +share/cups/model/zebracpl.ppd share/cups/model/zebraep1.ppd share/cups/model/zebraep2.ppd share/cups/templates/add-class.tmpl share/cups/templates/add-printer.tmpl +share/cups/templates/add-rss-subscription.tmpl share/cups/templates/admin.tmpl share/cups/templates/choose-device.tmpl share/cups/templates/choose-make.tmpl @@ -215,6 +197,7 @@ share/cups/templates/classes-header.tmpl share/cups/templates/classes.tmpl share/cups/templates/de/add-class.tmpl share/cups/templates/de/add-printer.tmpl +share/cups/templates/de/add-rss-subscription.tmpl share/cups/templates/de/admin.tmpl share/cups/templates/de/choose-device.tmpl share/cups/templates/de/choose-make.tmpl @@ -242,6 +225,7 @@ share/cups/templates/de/job-release.tmpl share/cups/templates/de/job-restart.tmpl share/cups/templates/de/jobs-header.tmpl share/cups/templates/de/jobs.tmpl +share/cups/templates/de/list-available-printers.tmpl share/cups/templates/de/maintenance.tmpl share/cups/templates/de/modify-class.tmpl share/cups/templates/de/modify-printer.tmpl @@ -272,6 +256,8 @@ share/cups/templates/de/samba-exported.tmpl share/cups/templates/de/search.tmpl share/cups/templates/de/set-printer-options-header.tmpl share/cups/templates/de/set-printer-options-trailer.tmpl +share/cups/templates/de/subscription-added.tmpl +share/cups/templates/de/subscription-canceled.tmpl share/cups/templates/de/test-page.tmpl share/cups/templates/de/trailer.tmpl share/cups/templates/de/users.tmpl @@ -280,6 +266,7 @@ share/cups/templates/error-op.tmpl share/cups/templates/error.tmpl share/cups/templates/es/add-class.tmpl share/cups/templates/es/add-printer.tmpl +share/cups/templates/es/add-rss-subscription.tmpl share/cups/templates/es/admin.tmpl share/cups/templates/es/choose-device.tmpl share/cups/templates/es/choose-make.tmpl @@ -307,6 +294,7 @@ share/cups/templates/es/job-release.tmpl share/cups/templates/es/job-restart.tmpl share/cups/templates/es/jobs-header.tmpl share/cups/templates/es/jobs.tmpl +share/cups/templates/es/list-available-printers.tmpl share/cups/templates/es/maintenance.tmpl share/cups/templates/es/modify-class.tmpl share/cups/templates/es/modify-printer.tmpl @@ -338,6 +326,8 @@ share/cups/templates/es/samba-exported.tmpl share/cups/templates/es/search.tmpl share/cups/templates/es/set-printer-options-header.tmpl share/cups/templates/es/set-printer-options-trailer.tmpl +share/cups/templates/es/subscription-added.tmpl +share/cups/templates/es/subscription-canceled.tmpl share/cups/templates/es/test-page.tmpl share/cups/templates/es/trailer.tmpl share/cups/templates/es/users.tmpl @@ -466,6 +456,69 @@ share/cups/templates/fr/set-printer-options-trailer.tmpl share/cups/templates/fr/test-page.tmpl share/cups/templates/fr/trailer.tmpl share/cups/templates/fr/users.tmpl +share/cups/templates/he/add-class.tmpl +share/cups/templates/he/add-printer.tmpl +share/cups/templates/he/admin.tmpl +share/cups/templates/he/choose-device.tmpl +share/cups/templates/he/choose-make.tmpl +share/cups/templates/he/choose-model.tmpl +share/cups/templates/he/choose-serial.tmpl +share/cups/templates/he/choose-uri.tmpl +share/cups/templates/he/class-added.tmpl +share/cups/templates/he/class-confirm.tmpl +share/cups/templates/he/class-deleted.tmpl +share/cups/templates/he/class-jobs-header.tmpl +share/cups/templates/he/class-modified.tmpl +share/cups/templates/he/classes-header.tmpl +share/cups/templates/he/classes.tmpl +share/cups/templates/he/edit-config.tmpl +share/cups/templates/he/error-op.tmpl +share/cups/templates/he/error.tmpl +share/cups/templates/he/header.tmpl +share/cups/templates/he/help-header.tmpl +share/cups/templates/he/help-printable.tmpl +share/cups/templates/he/job-cancel.tmpl +share/cups/templates/he/job-hold.tmpl +share/cups/templates/he/job-move.tmpl +share/cups/templates/he/job-moved.tmpl +share/cups/templates/he/job-release.tmpl +share/cups/templates/he/job-restart.tmpl +share/cups/templates/he/jobs-header.tmpl +share/cups/templates/he/jobs.tmpl +share/cups/templates/he/maintenance.tmpl +share/cups/templates/he/modify-class.tmpl +share/cups/templates/he/modify-printer.tmpl +share/cups/templates/he/norestart.tmpl +share/cups/templates/he/option-boolean.tmpl +share/cups/templates/he/option-conflict.tmpl +share/cups/templates/he/option-header.tmpl +share/cups/templates/he/option-pickmany.tmpl +share/cups/templates/he/option-pickone.tmpl +share/cups/templates/he/option-trailer.tmpl +share/cups/templates/he/pager.tmpl +share/cups/templates/he/printer-accept.tmpl +share/cups/templates/he/printer-added.tmpl +share/cups/templates/he/printer-configured.tmpl +share/cups/templates/he/printer-confirm.tmpl +share/cups/templates/he/printer-default.tmpl +share/cups/templates/he/printer-deleted.tmpl +share/cups/templates/he/printer-jobs-header.tmpl +share/cups/templates/he/printer-modified.tmpl +share/cups/templates/he/printer-purge.tmpl +share/cups/templates/he/printer-reject.tmpl +share/cups/templates/he/printer-start.tmpl +share/cups/templates/he/printer-stop.tmpl +share/cups/templates/he/printers-header.tmpl +share/cups/templates/he/printers.tmpl +share/cups/templates/he/restart.tmpl +share/cups/templates/he/samba-export.tmpl +share/cups/templates/he/samba-exported.tmpl +share/cups/templates/he/search.tmpl +share/cups/templates/he/set-printer-options-header.tmpl +share/cups/templates/he/set-printer-options-trailer.tmpl +share/cups/templates/he/test-page.tmpl +share/cups/templates/he/trailer.tmpl +share/cups/templates/he/users.tmpl share/cups/templates/header.tmpl share/cups/templates/help-header.tmpl share/cups/templates/help-printable.tmpl @@ -534,6 +587,7 @@ share/cups/templates/it/trailer.tmpl share/cups/templates/it/users.tmpl share/cups/templates/ja/add-class.tmpl share/cups/templates/ja/add-printer.tmpl +share/cups/templates/ja/add-rss-subscription.tmpl share/cups/templates/ja/admin.tmpl share/cups/templates/ja/choose-device.tmpl share/cups/templates/ja/choose-make.tmpl @@ -560,9 +614,11 @@ share/cups/templates/ja/job-release.tmpl share/cups/templates/ja/job-restart.tmpl share/cups/templates/ja/jobs-header.tmpl share/cups/templates/ja/jobs.tmpl +share/cups/templates/ja/list-available-printers.tmpl share/cups/templates/ja/maintenance.tmpl share/cups/templates/ja/modify-class.tmpl share/cups/templates/ja/modify-printer.tmpl +share/cups/templates/ja/norestart.tmpl share/cups/templates/ja/option-conflict.tmpl share/cups/templates/ja/option-trailer.tmpl share/cups/templates/ja/pager.tmpl @@ -584,6 +640,8 @@ share/cups/templates/ja/restart.tmpl share/cups/templates/ja/samba-export.tmpl share/cups/templates/ja/samba-exported.tmpl share/cups/templates/ja/search.tmpl +share/cups/templates/ja/subscription-added.tmpl +share/cups/templates/ja/subscription-canceled.tmpl share/cups/templates/ja/test-page.tmpl share/cups/templates/ja/users.tmpl share/cups/templates/job-cancel.tmpl @@ -594,6 +652,7 @@ share/cups/templates/job-release.tmpl share/cups/templates/job-restart.tmpl share/cups/templates/jobs-header.tmpl share/cups/templates/jobs.tmpl +share/cups/templates/list-available-printers.tmpl share/cups/templates/maintenance.tmpl share/cups/templates/modify-class.tmpl share/cups/templates/modify-printer.tmpl @@ -687,6 +746,8 @@ share/cups/templates/samba-exported.tmpl share/cups/templates/search.tmpl share/cups/templates/set-printer-options-header.tmpl share/cups/templates/set-printer-options-trailer.tmpl +share/cups/templates/subscription-added.tmpl +share/cups/templates/subscription-canceled.tmpl share/cups/templates/sv/add-class.tmpl share/cups/templates/sv/add-printer.tmpl share/cups/templates/sv/admin.tmpl @@ -784,7 +845,6 @@ share/cups/templates/zh_TW/jobs.tmpl share/cups/templates/zh_TW/maintenance.tmpl share/cups/templates/zh_TW/modify-class.tmpl share/cups/templates/zh_TW/modify-printer.tmpl -share/cups/templates/zh_TW/norestart.tmpl share/cups/templates/zh_TW/option-boolean.tmpl share/cups/templates/zh_TW/option-conflict.tmpl share/cups/templates/zh_TW/option-header.tmpl @@ -822,9 +882,11 @@ share/doc/cups/cups.css share/doc/cups/de/images/button-accept-jobs.gif share/doc/cups/de/images/button-add-class.gif share/doc/cups/de/images/button-add-printer.gif +share/doc/cups/de/images/button-add-rss-subscription.gif share/doc/cups/de/images/button-add-this-printer.gif share/doc/cups/de/images/button-cancel-all-jobs.gif share/doc/cups/de/images/button-cancel-job.gif +share/doc/cups/de/images/button-cancel-subscription.gif share/doc/cups/de/images/button-change-settings.gif share/doc/cups/de/images/button-clean-print-heads.gif share/doc/cups/de/images/button-clear.gif @@ -833,6 +895,7 @@ share/doc/cups/de/images/button-delete-class.gif share/doc/cups/de/images/button-delete-printer.gif share/doc/cups/de/images/button-edit-configuration-file.gif share/doc/cups/de/images/button-export-samba.gif +share/doc/cups/de/images/button-find-new-printers.gif share/doc/cups/de/images/button-help.gif share/doc/cups/de/images/button-hold-job.gif share/doc/cups/de/images/button-manage-classes.gif @@ -866,6 +929,7 @@ share/doc/cups/de/images/button-start-printer.gif share/doc/cups/de/images/button-stop-class.gif share/doc/cups/de/images/button-stop-printer.gif share/doc/cups/de/images/button-unpublish-printer.gif +share/doc/cups/de/images/button-use-default-config.gif share/doc/cups/de/images/button-view-access-log.gif share/doc/cups/de/images/button-view-error-log.gif share/doc/cups/de/images/button-view-page-log.gif @@ -874,9 +938,11 @@ share/doc/cups/de/index.html share/doc/cups/es/images/button-accept-jobs.gif share/doc/cups/es/images/button-add-class.gif share/doc/cups/es/images/button-add-printer.gif +share/doc/cups/es/images/button-add-rss-subscription.gif share/doc/cups/es/images/button-add-this-printer.gif share/doc/cups/es/images/button-cancel-all-jobs.gif share/doc/cups/es/images/button-cancel-job.gif +share/doc/cups/es/images/button-cancel-subscription.gif share/doc/cups/es/images/button-change-settings.gif share/doc/cups/es/images/button-clean-print-heads.gif share/doc/cups/es/images/button-clear.gif @@ -885,6 +951,7 @@ share/doc/cups/es/images/button-delete-class.gif share/doc/cups/es/images/button-delete-printer.gif share/doc/cups/es/images/button-edit-configuration-file.gif share/doc/cups/es/images/button-export-samba.gif +share/doc/cups/es/images/button-find-new-printers.gif share/doc/cups/es/images/button-help.gif share/doc/cups/es/images/button-hold-job.gif share/doc/cups/es/images/button-manage-classes.gif @@ -1031,6 +1098,61 @@ share/doc/cups/fr/images/button-view-error-log.gif share/doc/cups/fr/images/button-view-page-log.gif share/doc/cups/fr/images/button-view-printable-version.gif share/doc/cups/fr/index.html +share/doc/cups/he/cups.css +share/doc/cups/he/images/button-accept-jobs.gif +share/doc/cups/he/images/button-add-class.gif +share/doc/cups/he/images/button-add-printer.gif +share/doc/cups/he/images/button-add-this-printer.gif +share/doc/cups/he/images/button-cancel-all-jobs.gif +share/doc/cups/he/images/button-cancel-job.gif +share/doc/cups/he/images/button-change-settings.gif +share/doc/cups/he/images/button-clean-print-heads.gif +share/doc/cups/he/images/button-clear.gif +share/doc/cups/he/images/button-continue.gif +share/doc/cups/he/images/button-delete-class.gif +share/doc/cups/he/images/button-delete-printer.gif +share/doc/cups/he/images/button-edit-configuration-file.gif +share/doc/cups/he/images/button-export-samba.gif +share/doc/cups/he/images/button-help.gif +share/doc/cups/he/images/button-hold-job.gif +share/doc/cups/he/images/button-manage-classes.gif +share/doc/cups/he/images/button-manage-jobs.gif +share/doc/cups/he/images/button-manage-printers.gif +share/doc/cups/he/images/button-manage-server.gif +share/doc/cups/he/images/button-modify-class.gif +share/doc/cups/he/images/button-modify-printer.gif +share/doc/cups/he/images/button-move-job.gif +share/doc/cups/he/images/button-move-jobs.gif +share/doc/cups/he/images/button-print-self-test-page.gif +share/doc/cups/he/images/button-print-test-page.gif +share/doc/cups/he/images/button-publish-printer.gif +share/doc/cups/he/images/button-reject-jobs.gif +share/doc/cups/he/images/button-release-job.gif +share/doc/cups/he/images/button-restart-job.gif +share/doc/cups/he/images/button-save-changes.gif +share/doc/cups/he/images/button-search.gif +share/doc/cups/he/images/button-set-allowed-users.gif +share/doc/cups/he/images/button-set-as-default.gif +share/doc/cups/he/images/button-set-printer-options.gif +share/doc/cups/he/images/button-show-active.gif +share/doc/cups/he/images/button-show-all.gif +share/doc/cups/he/images/button-show-completed.gif +share/doc/cups/he/images/button-show-next.gif +share/doc/cups/he/images/button-show-previous.gif +share/doc/cups/he/images/button-sort-ascending.gif +share/doc/cups/he/images/button-sort-descending.gif +share/doc/cups/he/images/button-start-class.gif +share/doc/cups/he/images/button-start-printer.gif +share/doc/cups/he/images/button-stop-class.gif +share/doc/cups/he/images/button-stop-printer.gif +share/doc/cups/he/images/button-unpublish-printer.gif +share/doc/cups/he/images/button-use-default-config.gif +share/doc/cups/he/images/button-view-access-log.gif +share/doc/cups/he/images/button-view-error-log.gif +share/doc/cups/he/images/button-view-page-log.gif +share/doc/cups/he/images/button-view-printable-version.gif +share/doc/cups/he/index.html +share/doc/cups/help/accounting.html share/doc/cups/help/api-array.html share/doc/cups/help/api-cups.html share/doc/cups/help/api-filedir.html @@ -1040,6 +1162,7 @@ share/doc/cups/help/api-ppd.html share/doc/cups/help/api-raster.html share/doc/cups/help/cgi.html share/doc/cups/help/glossary.html +share/doc/cups/help/kerberos.html share/doc/cups/help/license.html share/doc/cups/help/man-accept.html share/doc/cups/help/man-backend.html @@ -1089,6 +1212,7 @@ share/doc/cups/help/spec-cmp.html share/doc/cups/help/spec-command.html share/doc/cups/help/spec-design.html share/doc/cups/help/spec-ipp.html +share/doc/cups/help/spec-postscript.html share/doc/cups/help/spec-ppd.html share/doc/cups/help/spec-raster.html share/doc/cups/help/spec-stp.html @@ -1100,9 +1224,11 @@ share/doc/cups/images/bottom-right.gif share/doc/cups/images/button-accept-jobs.gif share/doc/cups/images/button-add-class.gif share/doc/cups/images/button-add-printer.gif +share/doc/cups/images/button-add-rss-subscription.gif share/doc/cups/images/button-add-this-printer.gif share/doc/cups/images/button-cancel-all-jobs.gif share/doc/cups/images/button-cancel-job.gif +share/doc/cups/images/button-cancel-subscription.gif share/doc/cups/images/button-change-settings.gif share/doc/cups/images/button-clean-print-heads.gif share/doc/cups/images/button-clear.gif @@ -1111,6 +1237,7 @@ share/doc/cups/images/button-delete-class.gif share/doc/cups/images/button-delete-printer.gif share/doc/cups/images/button-edit-configuration-file.gif share/doc/cups/images/button-export-samba.gif +share/doc/cups/images/button-find-new-printers.gif share/doc/cups/images/button-help.gif share/doc/cups/images/button-hold-job.gif share/doc/cups/images/button-manage-classes.gif @@ -1157,6 +1284,8 @@ share/doc/cups/images/logo.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/raster.png +share/doc/cups/images/raster.svg share/doc/cups/images/smiley.jpg share/doc/cups/images/tab-left.gif share/doc/cups/images/tab-right.gif @@ -1226,15 +1355,20 @@ share/doc/cups/it/index.html share/doc/cups/ja/images/button-accept-jobs.gif share/doc/cups/ja/images/button-add-class.gif share/doc/cups/ja/images/button-add-printer.gif +share/doc/cups/ja/images/button-add-rss-subscription.gif share/doc/cups/ja/images/button-add-this-printer.gif share/doc/cups/ja/images/button-cancel-all-jobs.gif share/doc/cups/ja/images/button-cancel-job.gif +share/doc/cups/ja/images/button-cancel-subscription.gif share/doc/cups/ja/images/button-change-settings.gif +share/doc/cups/ja/images/button-clean-print-heads.gif +share/doc/cups/ja/images/button-clear.gif share/doc/cups/ja/images/button-continue.gif share/doc/cups/ja/images/button-delete-class.gif share/doc/cups/ja/images/button-delete-printer.gif share/doc/cups/ja/images/button-edit-configuration-file.gif share/doc/cups/ja/images/button-export-samba.gif +share/doc/cups/ja/images/button-find-new-printers.gif share/doc/cups/ja/images/button-help.gif share/doc/cups/ja/images/button-hold-job.gif share/doc/cups/ja/images/button-manage-classes.gif @@ -1245,6 +1379,7 @@ share/doc/cups/ja/images/button-modify-class.gif share/doc/cups/ja/images/button-modify-printer.gif share/doc/cups/ja/images/button-move-job.gif share/doc/cups/ja/images/button-move-jobs.gif +share/doc/cups/ja/images/button-print-self-test-page.gif share/doc/cups/ja/images/button-print-test-page.gif share/doc/cups/ja/images/button-publish-printer.gif share/doc/cups/ja/images/button-reject-jobs.gif @@ -1271,6 +1406,7 @@ share/doc/cups/ja/images/button-use-default-config.gif share/doc/cups/ja/images/button-view-access-log.gif share/doc/cups/ja/images/button-view-error-log.gif share/doc/cups/ja/images/button-view-page-log.gif +share/doc/cups/ja/images/button-view-printable-version.gif share/doc/cups/ja/index.html share/doc/cups/pl/images/button-accept-jobs.gif share/doc/cups/pl/images/button-add-class.gif @@ -1436,47 +1572,106 @@ ${PAM}share/examples/cups/cups.pam share/examples/cups/cupsd.conf share/examples/cups/mime.convs share/examples/cups/mime.types +share/examples/cups/snmp.conf share/examples/rc.d/cupsd +share/locale/da/cups_da.po share/locale/de/cups_de.po share/locale/es/cups_es.po share/locale/et/cups_et.po +share/locale/fi/cups_fi.po share/locale/fr/cups_fr.po +share/locale/he/cups_he.po share/locale/it/cups_it.po share/locale/ja/cups_ja.po +share/locale/ko/cups_ko.po +share/locale/nl/cups_nl.po +share/locale/no/cups_no.po share/locale/pl/cups_pl.po +share/locale/pt/cups_pt.po +share/locale/pt_BR/cups_pt_BR.po +share/locale/ru/cups_ru.po share/locale/sv/cups_sv.po +share/locale/zh/cups_zh.po share/locale/zh_TW/cups_zh_TW.po @dirrm share/examples/cups @dirrm share/doc/cups/zh_TW/images @dirrm share/doc/cups/zh_TW +@exec ${MKDIR} %D/share/doc/cups/zh/images +@dirrm share/doc/cups/zh/images +@dirrm share/doc/cups/zh @dirrm share/doc/cups/sv/images @dirrm share/doc/cups/sv +@exec ${MKDIR} %D/share/doc/cups/ru/images +@dirrm share/doc/cups/ru/images +@dirrm share/doc/cups/ru +@exec ${MKDIR} %D/share/doc/cups/pt_BR/images +@dirrm share/doc/cups/pt_BR/images +@dirrm share/doc/cups/pt_BR +@exec ${MKDIR} %D/share/doc/cups/pt/images +@dirrm share/doc/cups/pt/images +@dirrm share/doc/cups/pt @dirrm share/doc/cups/pl/images @dirrm share/doc/cups/pl +@exec ${MKDIR} %D/share/doc/cups/no/images +@dirrm share/doc/cups/no/images +@dirrm share/doc/cups/no +@exec ${MKDIR} %D/share/doc/cups/nl/images +@dirrm share/doc/cups/nl/images +@dirrm share/doc/cups/nl +@exec ${MKDIR} %D/share/doc/cups/ko/images +@dirrm share/doc/cups/ko/images +@dirrm share/doc/cups/ko @dirrm share/doc/cups/ja/images @dirrm share/doc/cups/ja @dirrm share/doc/cups/it/images @dirrm share/doc/cups/it @dirrm share/doc/cups/images @dirrm share/doc/cups/help +@dirrm share/doc/cups/he/images +@dirrm share/doc/cups/he @dirrm share/doc/cups/fr/images @dirrm share/doc/cups/fr +@exec ${MKDIR} %D/share/doc/cups/fi/images +@dirrm share/doc/cups/fi/images +@dirrm share/doc/cups/fi @dirrm share/doc/cups/et/images @dirrm share/doc/cups/et @dirrm share/doc/cups/es/images @dirrm share/doc/cups/es @dirrm share/doc/cups/de/images @dirrm share/doc/cups/de +@exec ${MKDIR} %D/share/doc/cups/da/images +@dirrm share/doc/cups/da/images +@dirrm share/doc/cups/da @dirrm share/doc/cups @dirrm share/cups/templates/zh_TW +@exec ${MKDIR} %D/share/cups/templates/zh +@dirrm share/cups/templates/zh @dirrm share/cups/templates/sv +@exec ${MKDIR} %D/share/cups/templates/ru +@dirrm share/cups/templates/ru +@exec ${MKDIR} %D/share/cups/templates/pt_BR +@dirrm share/cups/templates/pt_BR +@exec ${MKDIR} %D/share/cups/templates/pt +@dirrm share/cups/templates/pt @dirrm share/cups/templates/pl +@exec ${MKDIR} %D/share/cups/templates/no +@dirrm share/cups/templates/no +@exec ${MKDIR} %D/share/cups/templates/nl +@dirrm share/cups/templates/nl +@exec ${MKDIR} %D/share/cups/templates/ko +@dirrm share/cups/templates/ko @dirrm share/cups/templates/ja @dirrm share/cups/templates/it +@dirrm share/cups/templates/he @dirrm share/cups/templates/fr +@exec ${MKDIR} %D/share/cups/templates/fi +@dirrm share/cups/templates/fi @dirrm share/cups/templates/et @dirrm share/cups/templates/es @dirrm share/cups/templates/de +@exec ${MKDIR} %D/share/cups/templates/da +@dirrm share/cups/templates/da @dirrm share/cups/templates @exec ${MKDIR} %D/share/cups/profiles @dirrm share/cups/profiles diff --git a/print/cups/distinfo b/print/cups/distinfo index 7bf6d6924b9..6672c2263ad 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.53 2007/11/05 20:16:19 adrianp Exp $ +$NetBSD: distinfo,v 1.54 2008/01/22 23:58:13 markd Exp $ -SHA1 (cups-1.2.12-source.tar.bz2) = 11a540f76a1d3164b6636bf8ba47928803ad9356 -RMD160 (cups-1.2.12-source.tar.bz2) = 598270e37ff8a9b9ff1e667066d6f7e120493e32 -Size (cups-1.2.12-source.tar.bz2) = 3788301 bytes +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 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd -SHA1 (patch-ab) = f4e587f328390c550bbb70e24d7c2a90c4c73557 +SHA1 (patch-ab) = 11936b2512fc4480a45a8efb01de0c5a29a7a6e8 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 -SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd -SHA1 (patch-ao) = 5cb88810f316ffad2a004d13e65b70108c8234b2 +SHA1 (patch-ae) = f833e5b95c62a76d1d9222107a08f241c688a88d +SHA1 (patch-an) = 5c12e6de5d83659011c6050786049756e4aa4b49 +SHA1 (patch-ao) = 4fc204e312bf8752f3f3b4fd73ec1e4f166ae2d3 SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 -SHA1 (patch-au) = 9d9f8474cb553e112f5b53e84593347f919534e1 diff --git a/print/cups/options.mk b/print/cups/options.mk new file mode 100644 index 00000000000..9f7fe0dae03 --- /dev/null +++ b/print/cups/options.mk @@ -0,0 +1,33 @@ +# $NetBSD: options.mk,v 1.1 2008/01/22 23:58:13 markd Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.cups +PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp +PKG_SUGGESTED_OPTIONS= dnssd kerberos slp +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mpam) +. include "../../mk/pam.buildlink3.mk" +CONFIGURE_ARGS+= --enable-pam +MESSAGE_SRC= ${PKGDIR}/MESSAGE +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam +PLIST_SUBST+= PAM= +.else +CONFIGURE_ARGS+= --disable-pam +MESSAGE_SRC= ${.CURDIR}/MESSAGE +PLIST_SUBST+= PAM="@comment " +.endif + +.if !empty(PKG_OPTIONS:Mslp) +.include "../../net/openslp/buildlink3.mk" +CONFIGURE_ARGS+= --enable-slp +.else +CONFIGURE_ARGS+= --disable-slp +.endif + +.if !empty(PKG_OPTIONS:Mkerberos) +.include "../../mk/krb5.buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mdnssd) +.include "../../net/mDNSResponder/buildlink3.mk" +.endif diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab index 31a66418854..f3e4b0b4859 100644 --- a/print/cups/patches/patch-ab +++ b/print/cups/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.17 2007/03/14 12:29:03 markd Exp $ +$NetBSD: patch-ab,v 1.18 2008/01/22 23:58:13 markd Exp $ ---- Makefile.orig 2006-08-30 03:51:19.000000000 +1200 -+++ Makefile 2007-01-19 15:11:19.000000000 +1300 -@@ -31,7 +31,7 @@ +--- Makefile.orig 2007-12-07 09:09:39.000000000 +1300 ++++ Makefile 2008-01-16 12:28:17.000000000 +1300 +@@ -22,7 +22,7 @@ DIRS = cups backend berkeley cgi-bin filter locale man monitor \ notifier $(PDFTOPS) scheduler systemv test \ $(PHPDIR) \ -- conf data doc fonts ppd templates -+ data doc fonts ppd templates +- conf data doc $(FONTS) ppd templates ++ data doc $(FONTS) ppd templates # -@@ -91,7 +91,9 @@ +@@ -92,7 +92,9 @@ # Install object and target files... # @@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.17 2007/03/14 12:29:03 markd Exp $ for dir in $(DIRS); do\ echo Installing in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ -@@ -99,6 +101,10 @@ +@@ -100,6 +102,10 @@ echo Installing cups-config script... $(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an index 315e823d60b..fb7a058cb67 100644 --- a/print/cups/patches/patch-an +++ b/print/cups/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.8 2007/03/14 12:29:05 markd Exp $ +$NetBSD: patch-an,v 1.9 2008/01/22 23:58:14 markd Exp $ The '$' while loops expand the variables as long as possible so that no references to other variables occur. This is necessary because fontpath @@ -9,9 +9,9 @@ loop. I'm also sure that this is not the Right Way to fix it, but at least it works. ---- config-scripts/cups-directories.m4.orig 2007-02-05 22:22:11.000000000 +1300 +--- config-scripts/cups-directories.m4.orig 2007-09-19 08:39:31.000000000 +1200 +++ config-scripts/cups-directories.m4 -@@ -223,7 +223,15 @@ AC_SUBST(CUPS_CACHEDIR) +@@ -247,7 +247,15 @@ AC_SUBST(CUPS_CACHEDIR) # Data files CUPS_DATADIR="$datadir/cups" @@ -27,8 +27,34 @@ works. +AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR") AC_SUBST(CUPS_DATADIR) - # Documentation files -@@ -236,7 +244,15 @@ else + # Icon directory +@@ -256,7 +264,11 @@ AC_ARG_WITH(icondir, [ --with-icondir + if test "x$icondir" = x -a -d /usr/share/icons; then + ICONDIR="/usr/share/icons" + else +- ICONDIR="$icondir" ++ if test "x$icondir" = xno; then ++ ICONDIR="" ++ else ++ ICONDIR="$icondir" ++ fi + fi + + AC_SUBST(ICONDIR) +@@ -267,7 +279,11 @@ AC_ARG_WITH(menudir, [ --with-menudir + if test "x$menudir" = x -a -d /usr/share/applications; then + MENUDIR="/usr/share/applications" + else +- MENUDIR="$menudir" ++ if test "x$menudir" = xno; then ++ MENUDIR="" ++ else ++ MENUDIR="$menudir" ++ fi + fi + + AC_SUBST(MENUDIR) +@@ -282,7 +298,15 @@ else CUPS_DOCROOT="$docdir" fi @@ -45,7 +71,7 @@ works. AC_SUBST(CUPS_DOCROOT) # Fonts -@@ -248,10 +264,21 @@ else +@@ -294,8 +318,16 @@ else CUPS_FONTPATH="$fontpath" fi @@ -61,21 +87,12 @@ works. AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") +AC_SUBST(CUPS_FONTPATH) - # Locale data -+AC_ARG_WITH(localedir, [ --with-localedir set path for locale files],localedir="$withval",localedir="") -+ -+if test x$localedir = x; then - case "$uname" in - Linux | GNU | *BSD* | Darwin*) - CUPS_LOCALEDIR="$datadir/locale" -@@ -266,6 +293,17 @@ case "$uname" in - CUPS_LOCALEDIR="$exec_prefix/lib/locale" - ;; - esac -+else -+ CUPS_LOCALEDIR="$localedir" -+fi -+ + # Locale data (initial assignment allows us not to require autoconf 2.60) + localedir="${localedir:=}" +@@ -318,6 +350,14 @@ else + CUPS_LOCALEDIR="$localedir" + fi + +done=no +while test $done = no; do + case "$CUPS_LOCALEDIR" in @@ -83,10 +100,11 @@ works. + *) done=yes;; + esac +done - ++ AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR") AC_SUBST(CUPS_LOCALEDIR) -@@ -275,7 +313,6 @@ AC_ARG_WITH(logdir, [ --with-logdir + +@@ -326,7 +366,6 @@ AC_ARG_WITH(logdir, [ --with-logdir if test x$logdir = x; then CUPS_LOGDIR="$localstatedir/log/cups" @@ -94,7 +112,7 @@ works. else CUPS_LOGDIR="$logdir" fi -@@ -284,10 +321,13 @@ AC_SUBST(CUPS_LOGDIR) +@@ -335,10 +374,13 @@ AC_SUBST(CUPS_LOGDIR) # Longer-term spool data CUPS_REQUESTS="$localstatedir/spool/cups" @@ -109,7 +127,7 @@ works. case "$uname" in *BSD* | Darwin*) # *BSD and Darwin (MacOS X) -@@ -300,6 +340,10 @@ case "$uname" in +@@ -351,6 +393,10 @@ case "$uname" in CUPS_SERVERBIN="$exec_prefix/lib/cups" ;; esac @@ -120,7 +138,7 @@ works. AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN") AC_SUBST(CUPS_SERVERBIN) -@@ -307,12 +351,12 @@ AC_SUBST(INSTALL_SYSV) +@@ -358,12 +404,12 @@ AC_SUBST(INSTALL_SYSV) # Configuration files CUPS_SERVERROOT="$sysconfdir/cups" diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao index a71ec902cc8..3e0971d216f 100644 --- a/print/cups/patches/patch-ao +++ b/print/cups/patches/patch-ao @@ -1,17 +1,17 @@ -$NetBSD: patch-ao,v 1.7 2007/03/15 19:01:12 joerg Exp $ +$NetBSD: patch-ao,v 1.8 2008/01/22 23:58:14 markd Exp $ ---- config-scripts/cups-manpages.m4.orig 2007-02-05 23:09:00.000000000 +1300 +--- config-scripts/cups-manpages.m4.orig 2007-07-12 09:46:42.000000000 +1200 +++ config-scripts/cups-manpages.m4 -@@ -22,6 +22,8 @@ dnl EMail: cups-info@cups.org - dnl WWW: http://www.cups.org +@@ -13,6 +13,8 @@ dnl which should have been included wi + dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl +AC_ARG_WITH(manext, [ --with-manext set man page extension style (bsd,irix,sysv,none)],manext="$withval",manext="") -+ ++ dnl Fix "mandir" variable... if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then # New GNU "standards" break previous ones, so make sure we use -@@ -59,41 +61,60 @@ AC_SUBST(AMANDIR) +@@ -50,41 +52,60 @@ AC_SUBST(AMANDIR) AC_SUBST(PMANDIR) dnl Setup manpage extensions... diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au deleted file mode 100644 index e408e945e3d..00000000000 --- a/print/cups/patches/patch-au +++ /dev/null @@ -1,155 +0,0 @@ -$NetBSD: patch-au,v 1.9 2007/11/05 20:16:19 adrianp Exp $ - -# CVE-2007-4351 - ---- cups/ipp.c.orig 2007-02-05 20:25:50.000000000 +0000 -+++ cups/ipp.c -@@ -1315,6 +1315,12 @@ ippReadIO(void *src, /* I - Data - { - case IPP_TAG_INTEGER : - case IPP_TAG_ENUM : -+ if (n != 4) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 4) < 4) - { - DEBUG_puts("ippReadIO: Unable to read integer value!"); -@@ -1327,6 +1333,12 @@ ippReadIO(void *src, /* I - Data - value->integer = n; - break; - case IPP_TAG_BOOLEAN : -+ if (n != 1) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 1) < 1) - { - DEBUG_puts("ippReadIO: Unable to read boolean value!"); -@@ -1344,6 +1356,12 @@ ippReadIO(void *src, /* I - Data - case IPP_TAG_CHARSET : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : -+ if (n >= sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, n) < n) - { - DEBUG_puts("ippReadIO: unable to read name!"); -@@ -1356,6 +1374,12 @@ ippReadIO(void *src, /* I - Data - value->string.text)); - break; - case IPP_TAG_DATE : -+ if (n != 11) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, value->date, 11) < 11) - { - DEBUG_puts("ippReadIO: Unable to date integer value!"); -@@ -1363,6 +1387,12 @@ ippReadIO(void *src, /* I - Data - } - break; - case IPP_TAG_RESOLUTION : -+ if (n != 9) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 9) < 9) - { - DEBUG_puts("ippReadIO: Unable to read resolution value!"); -@@ -1379,6 +1409,12 @@ ippReadIO(void *src, /* I - Data - (ipp_res_t)buffer[8]; - break; - case IPP_TAG_RANGE : -+ if (n != 8) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, 8) < 8) - { - DEBUG_puts("ippReadIO: Unable to read range value!"); -@@ -1394,7 +1430,7 @@ ippReadIO(void *src, /* I - Data - break; - case IPP_TAG_TEXTLANG : - case IPP_TAG_NAMELANG : -- if (n > sizeof(buffer) || n < 4) -+ if (n >= sizeof(buffer) || n < 4) - { - DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); - return (IPP_ERROR); -@@ -1420,22 +1456,27 @@ ippReadIO(void *src, /* I - Data - - n = (bufptr[0] << 8) | bufptr[1]; - -- if (n >= sizeof(string)) -+ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)) || -+ n >= sizeof(string)) - { -- memcpy(string, bufptr + 2, sizeof(string) - 1); -- string[sizeof(string) - 1] = '\0'; -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); - } -- else -- { -- memcpy(string, bufptr + 2, n); -- string[n] = '\0'; -- } -+ -+ memcpy(string, bufptr + 2, n); -+ string[n] = '\0'; - - value->string.charset = _cupsStrAlloc((char *)string); - - bufptr += 2 + n; - n = (bufptr[0] << 8) | bufptr[1]; - -+ if ((bufptr + 2 + n) >= (buffer + sizeof(buffer))) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - bufptr[2 + n] = '\0'; - value->string.text = _cupsStrAlloc((char *)bufptr + 2); - break; -@@ -1477,6 +1518,12 @@ ippReadIO(void *src, /* I - Data - * we need to carry over... - */ - -+ if (n >= sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - if ((*cb)(src, buffer, n) < n) - { - DEBUG_puts("ippReadIO: Unable to read member name value!"); -@@ -1498,6 +1545,12 @@ ippReadIO(void *src, /* I - Data - break; - - default : /* Other unsupported values */ -+ if (n > sizeof(buffer)) -+ { -+ DEBUG_printf(("ippReadIO: bad value length %d!\n", n)); -+ return (IPP_ERROR); -+ } -+ - value->unknown.length = n; - if (n > 0) - { -- cgit v1.2.3