Update to cups-1.5.2
-------------------- CHANGES IN CUPS V1.5.2 - Reposted what should have been CUPS 1.5.1. CHANGES IN CUPS V1.5.1 - Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969) - Localization updates (STR #3840, STR #3989, STR #3997) - Build fixes (STR #3956, STR #3999) - The SNMP backend did not validate the device URIs reported by printers (STR #4004) - cupsBackendReport() did not handle newlines in 1284 Device IDs (STR #4005) - USB backend fixes for libusb (STR #3965, STR #3978) - The DBUS notifier did not validate string parameters (STR #3984) - Group quota ACLs did not work with Kerberos (STR #3972) - The IPP backend did not retry when a printer responded with client-error-not-possible (STR #3963) - PostScript PPDs with filters used the wrong command filter (STR #3973) - The scheduler incorrectly used free() on a POSIX ACL value, which could cause a crash (STR #3970) - PPD files using the MacStandard encoding did not work. - The web interface did not work on some platforms (STR #3902) - The lpstat command would crash when then "-u" option was used by a non-administrator (STR #3953) - Japanese supply level reporting did not always work. - The DBUS notifier could crash (STR #3947) - Relaxed some of the page size checks in cupstestppd. - The ipptool program now reports attributes that are repeated within the same attribute group. - Updated the PWG raster support to match the current draft specification. - Fixed some IPP conformance issues in the scheduler. - Added ipptool support for repeating requests. - Added IPP/2.2 conformance tests and greatly improved the IPP/1.1, IPP/2.0, and IPP/2.1 conformance testing. - IPP messages containing mixed integer/rangeOfInteger values did not work (STR #3942) - The ipptool program now provides additional diagnostics for badly- formatted responses (STR #3857) - When possible, the IPP backend now stops sending job data early on a cancel. - cupsSendRequest and cupsWriteRequestData did not properly read all HTTP headers, preventing authentication and encryption upgrades from working in all cases. - The client.conf Server directive is no longer supported on Mac OS X 10.7 and later. - The IPP backend sent the wrong margins in media-col. - The scheduler did not save or restore large Kerberos credentials for jobs. - The dnssd backend did not properly browse for secure IPP printers. - httpAssembleURI* did not properly escape all special characters in the username/password field. - The scheduler now logs config file errors to stderr (STR #3936) - The configure script incorrectly used bundle-based localizations on Linux (STR #3938) - The cups-driverd helper program did not cache .drv files properly, sometimes leading to a crash (STR #3921) - CUPS did not build on stock Mac OS X installations. - Encryption was broken with OpenSSL. - ipptool's XML output used date/time values with timezone offsets, which are not supported by Mac OS X's NSDate class. - Several programs did not support the cupsFilter2 keyword in PPD files. - The IPP backend incorrectly reported spool-area-full states. - cupsMarkOptions() did not protect against a bad PPD that was missing one or more standard Duplex options. - The PostScript filter did not mirror N-up output properly. - The ipptool program did not validate UTF-8 strings in XML output. - Fixed supply level reporting for some printers. - The scheduler no longer automatically logs debug messages for jobs that were held or canceled. - The cupsSendRequest function did not flush remaining response data from a previous request, leading to apparent chunking issues. - The scheduler did not report the correct version in the Server: header (STR #3903) - The scheduler did not support 1284 device IDs reported by driver interface programs longer than 127 characters (STR #3871) - The image filters did not support loading images larger than the RIPCache setting (STR #3901) - "PAGE: total NNN" messages did not get logged properly (STR #3887) - Updated the PWG Raster support to conform to the current draft of the PWG Raster Format specification. - The PWG Raster filter did not always write the correct number of padding lines on the bottom of the page (STR #3904) - When reporting a denial-of-service attack from the domain socket, the address reported does not always contain the correct path (STR #3888) - Badly formed GIF files could cause the image filters to crash (STR #3914) - Jobs canceled at the printer were retried by the IPP backend. - "cupsfilter -u" deleted the input file instead of the PPD file. - The scheduler did not compute the cost of PPD filters defined using the cupsFilter2 keyword properly. - The scheduler did not correctly support the maxsize() attribute for PPD filters.
This commit is contained in:
sbd
parent
3755247e00
commit
1a3ca2e9bb
4 changed files with 162 additions and 46 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.188 2012/02/06 12:41:20 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.189 2012/02/07 23:16:57 sbd 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,9 +6,8 @@
|
|||
|
||||
DISTNAME= cups-${DIST_VERS}-source
|
||||
PKGNAME= cups-${DIST_VERS:S/-/./g}
|
||||
BASE_VERS= 1.5.0
|
||||
BASE_VERS= 1.5.2
|
||||
DIST_VERS= ${BASE_VERS}
|
||||
PKGREVISION= 2
|
||||
|
||||
CATEGORIES= print
|
||||
MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
|
||||
|
|
|
|||
158
print/cups/PLIST
158
print/cups/PLIST
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.37 2011/11/13 21:49:17 sbd Exp $
|
||||
@comment $NetBSD: PLIST,v 1.38 2012/02/07 23:16:57 sbd Exp $
|
||||
bin/cancel
|
||||
bin/cups-config
|
||||
bin/cupstestdsc
|
||||
|
|
@ -174,12 +174,23 @@ share/cups/fonts/Monospace
|
|||
share/cups/fonts/Monospace-Bold
|
||||
share/cups/fonts/Monospace-BoldOblique
|
||||
share/cups/fonts/Monospace-Oblique
|
||||
share/cups/ipptool/color.jpg
|
||||
share/cups/ipptool/create-printer-subscription.test
|
||||
share/cups/ipptool/document-a4.pdf
|
||||
share/cups/ipptool/document-a4.ps
|
||||
share/cups/ipptool/document-letter.pdf
|
||||
share/cups/ipptool/document-letter.ps
|
||||
share/cups/ipptool/get-completed-jobs.test
|
||||
share/cups/ipptool/get-jobs.test
|
||||
share/cups/ipptool/gray.jpg
|
||||
share/cups/ipptool/ipp-1.1.test
|
||||
share/cups/ipptool/ipp-2.0.test
|
||||
share/cups/ipptool/ipp-2.1.test
|
||||
share/cups/ipptool/ipp-2.2.test
|
||||
share/cups/ipptool/onepage-a4.pdf
|
||||
share/cups/ipptool/onepage-a4.ps
|
||||
share/cups/ipptool/onepage-letter.pdf
|
||||
share/cups/ipptool/onepage-letter.ps
|
||||
share/cups/ipptool/testfile.jpg
|
||||
share/cups/ipptool/testfile.pdf
|
||||
share/cups/ipptool/testfile.ps
|
||||
|
|
@ -425,10 +436,150 @@ share/cups/templates/eu/subscription-canceled.tmpl
|
|||
share/cups/templates/eu/test-page.tmpl
|
||||
share/cups/templates/eu/trailer.tmpl
|
||||
share/cups/templates/eu/users.tmpl
|
||||
share/cups/templates/fr/add-class.tmpl
|
||||
share/cups/templates/fr/add-printer.tmpl
|
||||
share/cups/templates/fr/add-rss-subscription.tmpl
|
||||
share/cups/templates/fr/admin.tmpl
|
||||
share/cups/templates/fr/choose-device.tmpl
|
||||
share/cups/templates/fr/choose-make.tmpl
|
||||
share/cups/templates/fr/choose-model.tmpl
|
||||
share/cups/templates/fr/choose-serial.tmpl
|
||||
share/cups/templates/fr/choose-uri.tmpl
|
||||
share/cups/templates/fr/class-added.tmpl
|
||||
share/cups/templates/fr/class-confirm.tmpl
|
||||
share/cups/templates/fr/class-deleted.tmpl
|
||||
share/cups/templates/fr/class-jobs-header.tmpl
|
||||
share/cups/templates/fr/class-modified.tmpl
|
||||
share/cups/templates/fr/class.tmpl
|
||||
share/cups/templates/fr/classes-header.tmpl
|
||||
share/cups/templates/fr/classes.tmpl
|
||||
share/cups/templates/fr/command.tmpl
|
||||
share/cups/templates/fr/edit-config.tmpl
|
||||
share/cups/templates/fr/error-op.tmpl
|
||||
share/cups/templates/fr/error.tmpl
|
||||
share/cups/templates/fr/header.tmpl
|
||||
share/cups/templates/fr/help-header.tmpl
|
||||
share/cups/templates/fr/help-printable.tmpl
|
||||
share/cups/templates/fr/help-trailer.tmpl
|
||||
share/cups/templates/fr/job-cancel.tmpl
|
||||
share/cups/templates/fr/job-hold.tmpl
|
||||
share/cups/templates/fr/job-move.tmpl
|
||||
share/cups/templates/fr/job-moved.tmpl
|
||||
share/cups/templates/fr/job-release.tmpl
|
||||
share/cups/templates/fr/job-restart.tmpl
|
||||
share/cups/templates/fr/jobs-header.tmpl
|
||||
share/cups/templates/fr/jobs.tmpl
|
||||
share/cups/templates/fr/list-available-printers.tmpl
|
||||
share/cups/templates/fr/modify-class.tmpl
|
||||
share/cups/templates/fr/modify-printer.tmpl
|
||||
share/cups/templates/fr/norestart.tmpl
|
||||
share/cups/templates/fr/option-boolean.tmpl
|
||||
share/cups/templates/fr/option-conflict.tmpl
|
||||
share/cups/templates/fr/option-header.tmpl
|
||||
share/cups/templates/fr/option-pickmany.tmpl
|
||||
share/cups/templates/fr/option-pickone.tmpl
|
||||
share/cups/templates/fr/option-trailer.tmpl
|
||||
share/cups/templates/fr/pager.tmpl
|
||||
share/cups/templates/fr/printer-accept.tmpl
|
||||
share/cups/templates/fr/printer-added.tmpl
|
||||
share/cups/templates/fr/printer-configured.tmpl
|
||||
share/cups/templates/fr/printer-confirm.tmpl
|
||||
share/cups/templates/fr/printer-default.tmpl
|
||||
share/cups/templates/fr/printer-deleted.tmpl
|
||||
share/cups/templates/fr/printer-jobs-header.tmpl
|
||||
share/cups/templates/fr/printer-modified.tmpl
|
||||
share/cups/templates/fr/printer-purge.tmpl
|
||||
share/cups/templates/fr/printer-reject.tmpl
|
||||
share/cups/templates/fr/printer-start.tmpl
|
||||
share/cups/templates/fr/printer-stop.tmpl
|
||||
share/cups/templates/fr/printer.tmpl
|
||||
share/cups/templates/fr/printers-header.tmpl
|
||||
share/cups/templates/fr/printers.tmpl
|
||||
share/cups/templates/fr/restart.tmpl
|
||||
share/cups/templates/fr/samba-export.tmpl
|
||||
share/cups/templates/fr/samba-exported.tmpl
|
||||
share/cups/templates/fr/search.tmpl
|
||||
share/cups/templates/fr/set-printer-options-header.tmpl
|
||||
share/cups/templates/fr/set-printer-options-trailer.tmpl
|
||||
share/cups/templates/fr/subscription-added.tmpl
|
||||
share/cups/templates/fr/subscription-canceled.tmpl
|
||||
share/cups/templates/fr/test-page.tmpl
|
||||
share/cups/templates/fr/trailer.tmpl
|
||||
share/cups/templates/fr/users.tmpl
|
||||
share/cups/templates/header.tmpl
|
||||
share/cups/templates/help-header.tmpl
|
||||
share/cups/templates/help-printable.tmpl
|
||||
share/cups/templates/help-trailer.tmpl
|
||||
share/cups/templates/hu/add-class.tmpl
|
||||
share/cups/templates/hu/add-printer.tmpl
|
||||
share/cups/templates/hu/add-rss-subscription.tmpl
|
||||
share/cups/templates/hu/admin.tmpl
|
||||
share/cups/templates/hu/choose-device.tmpl
|
||||
share/cups/templates/hu/choose-make.tmpl
|
||||
share/cups/templates/hu/choose-model.tmpl
|
||||
share/cups/templates/hu/choose-serial.tmpl
|
||||
share/cups/templates/hu/choose-uri.tmpl
|
||||
share/cups/templates/hu/class-added.tmpl
|
||||
share/cups/templates/hu/class-confirm.tmpl
|
||||
share/cups/templates/hu/class-deleted.tmpl
|
||||
share/cups/templates/hu/class-jobs-header.tmpl
|
||||
share/cups/templates/hu/class-modified.tmpl
|
||||
share/cups/templates/hu/class.tmpl
|
||||
share/cups/templates/hu/classes-header.tmpl
|
||||
share/cups/templates/hu/classes.tmpl
|
||||
share/cups/templates/hu/command.tmpl
|
||||
share/cups/templates/hu/edit-config.tmpl
|
||||
share/cups/templates/hu/error-op.tmpl
|
||||
share/cups/templates/hu/error.tmpl
|
||||
share/cups/templates/hu/header.tmpl
|
||||
share/cups/templates/hu/help-header.tmpl
|
||||
share/cups/templates/hu/help-printable.tmpl
|
||||
share/cups/templates/hu/help-trailer.tmpl
|
||||
share/cups/templates/hu/job-cancel.tmpl
|
||||
share/cups/templates/hu/job-hold.tmpl
|
||||
share/cups/templates/hu/job-move.tmpl
|
||||
share/cups/templates/hu/job-moved.tmpl
|
||||
share/cups/templates/hu/job-release.tmpl
|
||||
share/cups/templates/hu/job-restart.tmpl
|
||||
share/cups/templates/hu/jobs-header.tmpl
|
||||
share/cups/templates/hu/jobs.tmpl
|
||||
share/cups/templates/hu/list-available-printers.tmpl
|
||||
share/cups/templates/hu/modify-class.tmpl
|
||||
share/cups/templates/hu/modify-printer.tmpl
|
||||
share/cups/templates/hu/norestart.tmpl
|
||||
share/cups/templates/hu/option-boolean.tmpl
|
||||
share/cups/templates/hu/option-conflict.tmpl
|
||||
share/cups/templates/hu/option-header.tmpl
|
||||
share/cups/templates/hu/option-pickmany.tmpl
|
||||
share/cups/templates/hu/option-pickone.tmpl
|
||||
share/cups/templates/hu/option-trailer.tmpl
|
||||
share/cups/templates/hu/pager.tmpl
|
||||
share/cups/templates/hu/printer-accept.tmpl
|
||||
share/cups/templates/hu/printer-added.tmpl
|
||||
share/cups/templates/hu/printer-configured.tmpl
|
||||
share/cups/templates/hu/printer-confirm.tmpl
|
||||
share/cups/templates/hu/printer-default.tmpl
|
||||
share/cups/templates/hu/printer-deleted.tmpl
|
||||
share/cups/templates/hu/printer-jobs-header.tmpl
|
||||
share/cups/templates/hu/printer-modified.tmpl
|
||||
share/cups/templates/hu/printer-purge.tmpl
|
||||
share/cups/templates/hu/printer-reject.tmpl
|
||||
share/cups/templates/hu/printer-start.tmpl
|
||||
share/cups/templates/hu/printer-stop.tmpl
|
||||
share/cups/templates/hu/printer.tmpl
|
||||
share/cups/templates/hu/printers-header.tmpl
|
||||
share/cups/templates/hu/printers.tmpl
|
||||
share/cups/templates/hu/restart.tmpl
|
||||
share/cups/templates/hu/samba-export.tmpl
|
||||
share/cups/templates/hu/samba-exported.tmpl
|
||||
share/cups/templates/hu/search.tmpl
|
||||
share/cups/templates/hu/set-printer-options-header.tmpl
|
||||
share/cups/templates/hu/set-printer-options-trailer.tmpl
|
||||
share/cups/templates/hu/subscription-added.tmpl
|
||||
share/cups/templates/hu/subscription-canceled.tmpl
|
||||
share/cups/templates/hu/test-page.tmpl
|
||||
share/cups/templates/hu/trailer.tmpl
|
||||
share/cups/templates/hu/users.tmpl
|
||||
share/cups/templates/id/add-class.tmpl
|
||||
share/cups/templates/id/add-printer.tmpl
|
||||
share/cups/templates/id/add-rss-subscription.tmpl
|
||||
|
|
@ -830,6 +981,7 @@ share/doc/cups/cups.css
|
|||
share/doc/cups/de/index.html
|
||||
share/doc/cups/es/index.html
|
||||
share/doc/cups/eu/index.html
|
||||
share/doc/cups/fr/index.html
|
||||
share/doc/cups/help/accounting.html
|
||||
share/doc/cups/help/api-array.html
|
||||
share/doc/cups/help/api-cgi.html
|
||||
|
|
@ -914,6 +1066,7 @@ share/doc/cups/help/spec-stp.html
|
|||
share/doc/cups/help/standard.html
|
||||
share/doc/cups/help/translation.html
|
||||
share/doc/cups/help/whatsnew.html
|
||||
share/doc/cups/hu/index.html
|
||||
share/doc/cups/id/index.html
|
||||
share/doc/cups/images/color-wheel.png
|
||||
share/doc/cups/images/cups-block-diagram.png
|
||||
|
|
@ -948,6 +1101,7 @@ share/locale/es/cups_es.po
|
|||
share/locale/eu/cups_eu.po
|
||||
share/locale/fi/cups_fi.po
|
||||
share/locale/fr/cups_fr.po
|
||||
share/locale/hu/cups_hu.po
|
||||
share/locale/id/cups_id.po
|
||||
share/locale/it/cups_it.po
|
||||
share/locale/ja/cups_ja.po
|
||||
|
|
@ -961,5 +1115,5 @@ 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
|
||||
@pkgdir share/cups/profiles
|
||||
@pkgdir share/cups/model
|
||||
@pkgdir share/cups/profiles
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.90 2011/12/21 08:57:11 sbd Exp $
|
||||
$NetBSD: distinfo,v 1.91 2012/02/07 23:16:57 sbd Exp $
|
||||
|
||||
SHA1 (cups-1.5.0-source.tar.bz2) = 628f549867751e373fc20c7558fec422f9eb942b
|
||||
RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff
|
||||
Size (cups-1.5.0-source.tar.bz2) = 4090210 bytes
|
||||
SHA1 (cups-1.5.2-source.tar.bz2) = 56fdb4f58e676607845321c0296c1e90e416883f
|
||||
RMD160 (cups-1.5.2-source.tar.bz2) = 98181e2ee8c6e574fb6d405f688f52c9b61a2355
|
||||
Size (cups-1.5.2-source.tar.bz2) = 9595665 bytes
|
||||
SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
|
||||
SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
|
||||
SHA1 (patch-ae) = 7806067b36fa1c98763cf51a14941665f590b816
|
||||
|
|
@ -16,6 +16,5 @@ SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e
|
|||
SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60
|
||||
SHA1 (patch-conf_Makefile) = 9bb4106e9fecaed2ba9bb67b7989f2ac9a9494fc
|
||||
SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4
|
||||
SHA1 (patch-filter_image-gif.c) = 2269cbf7e42ec80ba91c27eda4871884775f4b7a
|
||||
SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60
|
||||
SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
$NetBSD: patch-filter_image-gif.c,v 1.1 2011/08/28 07:22:12 sbd Exp $
|
||||
|
||||
Use str3914.patch from STR #3914 to fix CVE-2011-3170
|
||||
|
||||
--- filter/image-gif.c.orig 2011-06-20 20:37:51.000000000 +0000
|
||||
+++ filter/image-gif.c
|
||||
@@ -648,11 +648,13 @@ gif_read_lzw(FILE *fp, /* I - File to
|
||||
|
||||
if (code == max_code)
|
||||
{
|
||||
- *sp++ = firstcode;
|
||||
- code = oldcode;
|
||||
+ if (sp < (stack + 8192))
|
||||
+ *sp++ = firstcode;
|
||||
+
|
||||
+ code = oldcode;
|
||||
}
|
||||
|
||||
- while (code >= clear_code)
|
||||
+ while (code >= clear_code && sp < (stack + 8192))
|
||||
{
|
||||
*sp++ = table[1][code];
|
||||
if (code == table[0][code])
|
||||
@@ -661,8 +663,10 @@ gif_read_lzw(FILE *fp, /* I - File to
|
||||
code = table[0][code];
|
||||
}
|
||||
|
||||
- *sp++ = firstcode = table[1][code];
|
||||
- code = max_code;
|
||||
+ if (sp < (stack + 8192))
|
||||
+ *sp++ = firstcode = table[1][code];
|
||||
+
|
||||
+ code = max_code;
|
||||
|
||||
if (code < 4096)
|
||||
{
|
||||
Loading…
Reference in a new issue