From b594b69921e895ee5f223d0784898ba22cb047ff Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 6 Jun 2007 11:14:27 +0000 Subject: Update cups to 1.2.11 CUPS 1.2.11 fixes several build system, printing, PPD, and IPP conformance issues. It also fixes a crash bug in the scheduler when printing to files in non-existent directories. --- print/cups/Makefile | 5 +- print/cups/PLIST | 122 +++++++++++++++++++++++++++++++++++++++++++- print/cups/distinfo | 10 ++-- print/cups/patches/patch-ae | 13 ----- print/cups/patches/patch-au | 20 -------- 5 files changed, 127 insertions(+), 43 deletions(-) delete mode 100644 print/cups/patches/patch-ae delete mode 100644 print/cups/patches/patch-au (limited to 'print') diff --git a/print/cups/Makefile b/print/cups/Makefile index 443d552b633..8e123104afb 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2007/04/02 12:11:01 gdt Exp $ +# $NetBSD: Makefile,v 1.122 2007/06/06 11:14: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,8 +6,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} -PKGREVISION= 1 -BASE_VERS= 1.2.10 +BASE_VERS= 1.2.11 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} CATEGORIES= print diff --git a/print/cups/PLIST b/print/cups/PLIST index 24a352784f3..39fe2ba05de 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2007/03/14 12:29:03 markd Exp $ +@comment $NetBSD: PLIST,v 1.21 2007/06/06 11:14:27 markd Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -752,6 +752,69 @@ share/cups/templates/sv/users.tmpl share/cups/templates/test-page.tmpl share/cups/templates/trailer.tmpl share/cups/templates/users.tmpl +share/cups/templates/zh_TW/add-class.tmpl +share/cups/templates/zh_TW/add-printer.tmpl +share/cups/templates/zh_TW/admin.tmpl +share/cups/templates/zh_TW/choose-device.tmpl +share/cups/templates/zh_TW/choose-make.tmpl +share/cups/templates/zh_TW/choose-model.tmpl +share/cups/templates/zh_TW/choose-serial.tmpl +share/cups/templates/zh_TW/choose-uri.tmpl +share/cups/templates/zh_TW/class-added.tmpl +share/cups/templates/zh_TW/class-confirm.tmpl +share/cups/templates/zh_TW/class-deleted.tmpl +share/cups/templates/zh_TW/class-jobs-header.tmpl +share/cups/templates/zh_TW/class-modified.tmpl +share/cups/templates/zh_TW/classes-header.tmpl +share/cups/templates/zh_TW/classes.tmpl +share/cups/templates/zh_TW/edit-config.tmpl +share/cups/templates/zh_TW/error-op.tmpl +share/cups/templates/zh_TW/error.tmpl +share/cups/templates/zh_TW/header.tmpl +share/cups/templates/zh_TW/help-header.tmpl +share/cups/templates/zh_TW/help-printable.tmpl +share/cups/templates/zh_TW/job-cancel.tmpl +share/cups/templates/zh_TW/job-hold.tmpl +share/cups/templates/zh_TW/job-move.tmpl +share/cups/templates/zh_TW/job-moved.tmpl +share/cups/templates/zh_TW/job-release.tmpl +share/cups/templates/zh_TW/job-restart.tmpl +share/cups/templates/zh_TW/jobs-header.tmpl +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 +share/cups/templates/zh_TW/option-pickmany.tmpl +share/cups/templates/zh_TW/option-pickone.tmpl +share/cups/templates/zh_TW/option-trailer.tmpl +share/cups/templates/zh_TW/pager.tmpl +share/cups/templates/zh_TW/printer-accept.tmpl +share/cups/templates/zh_TW/printer-added.tmpl +share/cups/templates/zh_TW/printer-configured.tmpl +share/cups/templates/zh_TW/printer-confirm.tmpl +share/cups/templates/zh_TW/printer-default.tmpl +share/cups/templates/zh_TW/printer-deleted.tmpl +share/cups/templates/zh_TW/printer-jobs-header.tmpl +share/cups/templates/zh_TW/printer-modified.tmpl +share/cups/templates/zh_TW/printer-purge.tmpl +share/cups/templates/zh_TW/printer-reject.tmpl +share/cups/templates/zh_TW/printer-start.tmpl +share/cups/templates/zh_TW/printer-stop.tmpl +share/cups/templates/zh_TW/printers-header.tmpl +share/cups/templates/zh_TW/printers.tmpl +share/cups/templates/zh_TW/restart.tmpl +share/cups/templates/zh_TW/samba-export.tmpl +share/cups/templates/zh_TW/samba-exported.tmpl +share/cups/templates/zh_TW/search.tmpl +share/cups/templates/zh_TW/set-printer-options-header.tmpl +share/cups/templates/zh_TW/set-printer-options-trailer.tmpl +share/cups/templates/zh_TW/test-page.tmpl +share/cups/templates/zh_TW/trailer.tmpl +share/cups/templates/zh_TW/users.tmpl share/doc/cups/LICENSE.txt share/doc/cups/README.txt share/doc/cups/cups-printable.css @@ -1316,6 +1379,59 @@ share/doc/cups/sv/images/button-view-error-log.gif share/doc/cups/sv/images/button-view-page-log.gif share/doc/cups/sv/images/button-view-printable-version.gif share/doc/cups/sv/index.html +share/doc/cups/zh_TW/images/button-accept-jobs.gif +share/doc/cups/zh_TW/images/button-add-class.gif +share/doc/cups/zh_TW/images/button-add-printer.gif +share/doc/cups/zh_TW/images/button-add-this-printer.gif +share/doc/cups/zh_TW/images/button-cancel-all-jobs.gif +share/doc/cups/zh_TW/images/button-cancel-job.gif +share/doc/cups/zh_TW/images/button-change-settings.gif +share/doc/cups/zh_TW/images/button-clean-print-heads.gif +share/doc/cups/zh_TW/images/button-clear.gif +share/doc/cups/zh_TW/images/button-continue.gif +share/doc/cups/zh_TW/images/button-delete-class.gif +share/doc/cups/zh_TW/images/button-delete-printer.gif +share/doc/cups/zh_TW/images/button-edit-configuration-file.gif +share/doc/cups/zh_TW/images/button-export-samba.gif +share/doc/cups/zh_TW/images/button-help.gif +share/doc/cups/zh_TW/images/button-hold-job.gif +share/doc/cups/zh_TW/images/button-manage-classes.gif +share/doc/cups/zh_TW/images/button-manage-jobs.gif +share/doc/cups/zh_TW/images/button-manage-printers.gif +share/doc/cups/zh_TW/images/button-manage-server.gif +share/doc/cups/zh_TW/images/button-modify-class.gif +share/doc/cups/zh_TW/images/button-modify-printer.gif +share/doc/cups/zh_TW/images/button-move-job.gif +share/doc/cups/zh_TW/images/button-move-jobs.gif +share/doc/cups/zh_TW/images/button-print-self-test-page.gif +share/doc/cups/zh_TW/images/button-print-test-page.gif +share/doc/cups/zh_TW/images/button-publish-printer.gif +share/doc/cups/zh_TW/images/button-reject-jobs.gif +share/doc/cups/zh_TW/images/button-release-job.gif +share/doc/cups/zh_TW/images/button-restart-job.gif +share/doc/cups/zh_TW/images/button-save-changes.gif +share/doc/cups/zh_TW/images/button-search.gif +share/doc/cups/zh_TW/images/button-set-allowed-users.gif +share/doc/cups/zh_TW/images/button-set-as-default.gif +share/doc/cups/zh_TW/images/button-set-printer-options.gif +share/doc/cups/zh_TW/images/button-show-active.gif +share/doc/cups/zh_TW/images/button-show-all.gif +share/doc/cups/zh_TW/images/button-show-completed.gif +share/doc/cups/zh_TW/images/button-show-next.gif +share/doc/cups/zh_TW/images/button-show-previous.gif +share/doc/cups/zh_TW/images/button-sort-ascending.gif +share/doc/cups/zh_TW/images/button-sort-descending.gif +share/doc/cups/zh_TW/images/button-start-class.gif +share/doc/cups/zh_TW/images/button-start-printer.gif +share/doc/cups/zh_TW/images/button-stop-class.gif +share/doc/cups/zh_TW/images/button-stop-printer.gif +share/doc/cups/zh_TW/images/button-unpublish-printer.gif +share/doc/cups/zh_TW/images/button-use-default-config.gif +share/doc/cups/zh_TW/images/button-view-access-log.gif +share/doc/cups/zh_TW/images/button-view-error-log.gif +share/doc/cups/zh_TW/images/button-view-page-log.gif +share/doc/cups/zh_TW/images/button-view-printable-version.gif +share/doc/cups/zh_TW/index.html ${PAM}share/examples/cups/cups.pam share/examples/cups/cupsd.conf share/examples/cups/mime.convs @@ -1329,7 +1445,10 @@ share/locale/it/cups_it.po share/locale/ja/cups_ja.po share/locale/pl/cups_pl.po share/locale/sv/cups_sv.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 @dirrm share/doc/cups/sv/images @dirrm share/doc/cups/sv @dirrm share/doc/cups/pl/images @@ -1349,6 +1468,7 @@ share/locale/sv/cups_sv.po @dirrm share/doc/cups/de/images @dirrm share/doc/cups/de @dirrm share/doc/cups +@dirrm share/cups/templates/zh_TW @dirrm share/cups/templates/sv @dirrm share/cups/templates/pl @dirrm share/cups/templates/ja diff --git a/print/cups/distinfo b/print/cups/distinfo index af555ff85c4..30b230683d0 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.50 2007/04/03 15:23:23 gdt Exp $ +$NetBSD: distinfo,v 1.51 2007/06/06 11:14:27 markd Exp $ -SHA1 (cups-1.2.10-source.tar.bz2) = 241d7a3c52370fb08ed2ffc3fd8f59673d158299 -RMD160 (cups-1.2.10-source.tar.bz2) = 85b3bbd46a6fc097891c571ffad8e5e46693743f -Size (cups-1.2.10-source.tar.bz2) = 3618084 bytes +SHA1 (cups-1.2.11-source.tar.bz2) = 4635dc423e3fc061df10d6af5ba60aaceb03d34b +RMD160 (cups-1.2.11-source.tar.bz2) = c5471c205a6ebb7ba0c2067b89769282e1a044a1 +Size (cups-1.2.11-source.tar.bz2) = 3774113 bytes SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd SHA1 (patch-ab) = f4e587f328390c550bbb70e24d7c2a90c4c73557 SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 -SHA1 (patch-ae) = 161bcbbbe4c065c44177082e675119a9d7c11374 SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd SHA1 (patch-ao) = 5cb88810f316ffad2a004d13e65b70108c8234b2 SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 -SHA1 (patch-au) = bc513dfce45e25d14eb43c7152dc0a93f3ff3f12 diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae deleted file mode 100644 index a67f226fd53..00000000000 --- a/print/cups/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.16 2007/03/22 12:44:22 markd Exp $ - ---- filter/pstops.c.orig 2007-03-09 02:40:01.000000000 +1300 -+++ filter/pstops.c -@@ -1537,7 +1537,7 @@ copy_page(cups_file_t *fp, /* I - File - if (doc->number_up > 1 || doc->fitplot) - continue; - } -- else if (!strncmp(line, "%%EndFeature:", 13)) -+ else if (!strncmp(line, "%%EndFeature", 12)) - { - feature = 0; - diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au deleted file mode 100644 index 5554fa8fcc8..00000000000 --- a/print/cups/patches/patch-au +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-au,v 1.7 2007/04/03 15:23:23 gdt Exp $ - -This has been filed upstream as: - - http://www.cups.org/str.php?L2324 - ---- backend/usb-unix.c.orig 2007-02-20 08:41:07.000000000 -0500 -+++ backend/usb-unix.c -@@ -90,6 +90,11 @@ print_device(const char *uri, /* I - De - strcasecmp(hostname, "Konica Minolta") && - strcasecmp(hostname, "Minolta"); - -+#ifdef __NetBSD__ -+ /* XXX Use configure test to see if reading from ulpt(4) works. */ -+ use_bc = 0; -+#endif -+ - if ((device_fd = open_device(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) -- cgit v1.2.3