Re: print/cups version far behind, bad MASTER_SITES

To: pkgsrc-users%netbsd.org@localhost
Subject: Re: print/cups version far behind, bad MASTER_SITES
From: Leonardo Taccari <iamleot%gmail.com@localhost>
Date: Wed, 4 Jun 2014 14:04:12 +0200

Hello Thomas,

On Wed, Jun 04, 2014 at 12:21:16PM +0200, Leonardo Taccari wrote:
> If nobody is doing that I'll try to update it during this weekend.
In this email I will attach required patches to update print/cups to the
latest stable version (1.7.3).

Please note that I have *only* tested the client via ${LOCALBASE}/bin/lp
(I have a Debian GNU/Linux with cups-server in another room at home).

When I will configure it as a server too I will send-pr(1) as usual
(hope I'll do that in the next few days).


HTH,
Ciao,
L.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/Makefile,v
retrieving revision 1.208
diff -u -r1.208 Makefile
--- Makefile    3 Jun 2014 15:08:52 -0000       1.208
+++ Makefile    4 Jun 2014 11:50:34 -0000
@@ -6,9 +6,8 @@
 
 DISTNAME=      cups-${DIST_VERS}-source
 PKGNAME=       cups-${DIST_VERS:S/-/./g}
-BASE_VERS=     1.5.4
+BASE_VERS=     1.7.3
 DIST_VERS=     ${BASE_VERS}
-PKGREVISION=   12
 CATEGORIES=    print
 MASTER_SITES=  http://www.cups.org/software/${BASE_VERS}/
 EXTRACT_SUFX=  .tar.bz2
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/PLIST,v
retrieving revision 1.40
diff -u -r1.40 PLIST
--- PLIST       11 Mar 2014 14:05:13 -0000      1.40
+++ PLIST       4 Jun 2014 11:50:35 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2014/03/11 14:05:13 jperkin Exp $
+@comment $NetBSD$
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -22,23 +22,21 @@
 include/cups/cgi.h
 include/cups/cups.h
 include/cups/dir.h
-include/cups/driver.h
 include/cups/file.h
 include/cups/help-index.h
 include/cups/http.h
-include/cups/image.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/mime.h
 include/cups/ppd.h
 include/cups/ppdc.h
+include/cups/pwg.h
 include/cups/raster.h
 include/cups/sidechannel.h
 include/cups/transcode.h
 include/cups/versioning.h
 lib/libcups.la
 lib/libcupscgi.la
-lib/libcupsdriver.la
 lib/libcupsimage.la
 lib/libcupsmime.la
 lib/libcupsppdc.la
@@ -49,8 +47,6 @@
 libexec/cups/backend/ipps
 libexec/cups/backend/lpd
 ${PLIST.dnssd}libexec/cups/backend/mdns
-${PLIST.notmac}libexec/cups/backend/parallel
-libexec/cups/backend/serial
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
@@ -63,24 +59,14 @@
 libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-exec
 libexec/cups/daemon/cups-lpd
-libexec/cups/daemon/cups-polld
-libexec/cups/filter/bannertops
-libexec/cups/filter/commandtoescpx
-libexec/cups/filter/commandtopclx
 libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
-${PLIST.notmac}libexec/cups/filter/imagetops
-${PLIST.notmac}libexec/cups/filter/imagetoraster
-libexec/cups/filter/pdftops
 libexec/cups/filter/pstops
 libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
-libexec/cups/filter/rastertoescpx
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
-libexec/cups/filter/rastertopclx
 libexec/cups/filter/rastertopwg
-libexec/cups/filter/texttops
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
 ${PLIST.dbus}libexec/cups/notifier/dbus
@@ -105,6 +91,7 @@
 man/man1/ppdpo.1
 man/man5/classes.conf.5
 man/man5/client.conf.5
+man/man5/cups-files.conf.5
 man/man5/cups-snmp.conf.5
 man/man5/cupsd.conf.5
 man/man5/ipptoolfile.5
@@ -121,7 +108,7 @@
 man/man8/cups-deviced.8
 man/man8/cups-driverd.8
 man/man8/cups-lpd.8
-man/man8/cups-polld.8
+man/man8/cups-snmp.8
 man/man8/cupsaccept.8
 man/man8/cupsaddsmb.8
 man/man8/cupsctl.8
@@ -155,8 +142,6 @@
 share/cups/banners/standard
 share/cups/banners/topsecret
 share/cups/banners/unclassified
-share/cups/charsets/utf-8
-share/cups/data/psglyphs
 share/cups/data/testprint
 share/cups/drv/sample.drv
 share/cups/examples/color.drv
@@ -170,10 +155,6 @@
 share/cups/examples/r300-basic.drv
 share/cups/examples/r300-colorman.drv
 share/cups/examples/r300-remote.drv
-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
@@ -182,34 +163,110 @@
 share/cups/ipptool/document-letter.ps
 share/cups/ipptool/get-completed-jobs.test
 share/cups/ipptool/get-jobs.test
+share/cups/ipptool/get-notifications.test
 share/cups/ipptool/get-printer-attributes.test
+share/cups/ipptool/get-subscriptions.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/ipp-everywhere.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/print-job-deflate.test
+share/cups/ipptool/print-job-gzip.test
+share/cups/ipptool/print-job.test
 share/cups/ipptool/testfile.jpg
+share/cups/ipptool/testfile.pcl
 share/cups/ipptool/testfile.pdf
 share/cups/ipptool/testfile.ps
 share/cups/ipptool/testfile.txt
+share/cups/ipptool/validate-job.test
 share/cups/mime/mime.convs
 share/cups/mime/mime.types
 share/cups/ppdc/epson.h
-share/cups/ppdc/escp.h
 share/cups/ppdc/font.defs
 share/cups/ppdc/hp.h
 share/cups/ppdc/label.h
 share/cups/ppdc/media.defs
-share/cups/ppdc/pcl.h
 share/cups/ppdc/raster.defs
 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/ca/add-class.tmpl
+share/cups/templates/ca/add-printer.tmpl
+share/cups/templates/ca/add-rss-subscription.tmpl
+share/cups/templates/ca/admin.tmpl
+share/cups/templates/ca/choose-device.tmpl
+share/cups/templates/ca/choose-make.tmpl
+share/cups/templates/ca/choose-model.tmpl
+share/cups/templates/ca/choose-serial.tmpl
+share/cups/templates/ca/choose-uri.tmpl
+share/cups/templates/ca/class-added.tmpl
+share/cups/templates/ca/class-confirm.tmpl
+share/cups/templates/ca/class-deleted.tmpl
+share/cups/templates/ca/class-jobs-header.tmpl
+share/cups/templates/ca/class-modified.tmpl
+share/cups/templates/ca/class.tmpl
+share/cups/templates/ca/classes-header.tmpl
+share/cups/templates/ca/classes.tmpl
+share/cups/templates/ca/command.tmpl
+share/cups/templates/ca/edit-config.tmpl
+share/cups/templates/ca/error-op.tmpl
+share/cups/templates/ca/error.tmpl
+share/cups/templates/ca/header.tmpl
+share/cups/templates/ca/help-header.tmpl
+share/cups/templates/ca/help-printable.tmpl
+share/cups/templates/ca/help-trailer.tmpl
+share/cups/templates/ca/job-cancel.tmpl
+share/cups/templates/ca/job-hold.tmpl
+share/cups/templates/ca/job-move.tmpl
+share/cups/templates/ca/job-moved.tmpl
+share/cups/templates/ca/job-release.tmpl
+share/cups/templates/ca/job-restart.tmpl
+share/cups/templates/ca/jobs-header.tmpl
+share/cups/templates/ca/jobs.tmpl
+share/cups/templates/ca/list-available-printers.tmpl
+share/cups/templates/ca/modify-class.tmpl
+share/cups/templates/ca/modify-printer.tmpl
+share/cups/templates/ca/norestart.tmpl
+share/cups/templates/ca/option-boolean.tmpl
+share/cups/templates/ca/option-conflict.tmpl
+share/cups/templates/ca/option-header.tmpl
+share/cups/templates/ca/option-pickmany.tmpl
+share/cups/templates/ca/option-pickone.tmpl
+share/cups/templates/ca/option-trailer.tmpl
+share/cups/templates/ca/pager.tmpl
+share/cups/templates/ca/printer-accept.tmpl
+share/cups/templates/ca/printer-added.tmpl
+share/cups/templates/ca/printer-configured.tmpl
+share/cups/templates/ca/printer-confirm.tmpl
+share/cups/templates/ca/printer-default.tmpl
+share/cups/templates/ca/printer-deleted.tmpl
+share/cups/templates/ca/printer-jobs-header.tmpl
+share/cups/templates/ca/printer-modified.tmpl
+share/cups/templates/ca/printer-purge.tmpl
+share/cups/templates/ca/printer-reject.tmpl
+share/cups/templates/ca/printer-start.tmpl
+share/cups/templates/ca/printer-stop.tmpl
+share/cups/templates/ca/printer.tmpl
+share/cups/templates/ca/printers-header.tmpl
+share/cups/templates/ca/printers.tmpl
+share/cups/templates/ca/restart.tmpl
+share/cups/templates/ca/samba-export.tmpl
+share/cups/templates/ca/samba-exported.tmpl
+share/cups/templates/ca/search.tmpl
+share/cups/templates/ca/set-printer-options-header.tmpl
+share/cups/templates/ca/set-printer-options-trailer.tmpl
+share/cups/templates/ca/subscription-added.tmpl
+share/cups/templates/ca/subscription-canceled.tmpl
+share/cups/templates/ca/test-page.tmpl
+share/cups/templates/ca/trailer.tmpl
+share/cups/templates/ca/users.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
 share/cups/templates/choose-model.tmpl
@@ -224,6 +281,76 @@
 share/cups/templates/classes-header.tmpl
 share/cups/templates/classes.tmpl
 share/cups/templates/command.tmpl
+share/cups/templates/cs/add-class.tmpl
+share/cups/templates/cs/add-printer.tmpl
+share/cups/templates/cs/add-rss-subscription.tmpl
+share/cups/templates/cs/admin.tmpl
+share/cups/templates/cs/choose-device.tmpl
+share/cups/templates/cs/choose-make.tmpl
+share/cups/templates/cs/choose-model.tmpl
+share/cups/templates/cs/choose-serial.tmpl
+share/cups/templates/cs/choose-uri.tmpl
+share/cups/templates/cs/class-added.tmpl
+share/cups/templates/cs/class-confirm.tmpl
+share/cups/templates/cs/class-deleted.tmpl
+share/cups/templates/cs/class-jobs-header.tmpl
+share/cups/templates/cs/class-modified.tmpl
+share/cups/templates/cs/class.tmpl
+share/cups/templates/cs/classes-header.tmpl
+share/cups/templates/cs/classes.tmpl
+share/cups/templates/cs/command.tmpl
+share/cups/templates/cs/edit-config.tmpl
+share/cups/templates/cs/error-op.tmpl
+share/cups/templates/cs/error.tmpl
+share/cups/templates/cs/header.tmpl
+share/cups/templates/cs/help-header.tmpl
+share/cups/templates/cs/help-printable.tmpl
+share/cups/templates/cs/help-trailer.tmpl
+share/cups/templates/cs/job-cancel.tmpl
+share/cups/templates/cs/job-hold.tmpl
+share/cups/templates/cs/job-move.tmpl
+share/cups/templates/cs/job-moved.tmpl
+share/cups/templates/cs/job-release.tmpl
+share/cups/templates/cs/job-restart.tmpl
+share/cups/templates/cs/jobs-header.tmpl
+share/cups/templates/cs/jobs.tmpl
+share/cups/templates/cs/list-available-printers.tmpl
+share/cups/templates/cs/modify-class.tmpl
+share/cups/templates/cs/modify-printer.tmpl
+share/cups/templates/cs/norestart.tmpl
+share/cups/templates/cs/option-boolean.tmpl
+share/cups/templates/cs/option-conflict.tmpl
+share/cups/templates/cs/option-header.tmpl
+share/cups/templates/cs/option-pickmany.tmpl
+share/cups/templates/cs/option-pickone.tmpl
+share/cups/templates/cs/option-trailer.tmpl
+share/cups/templates/cs/pager.tmpl
+share/cups/templates/cs/printer-accept.tmpl
+share/cups/templates/cs/printer-added.tmpl
+share/cups/templates/cs/printer-configured.tmpl
+share/cups/templates/cs/printer-confirm.tmpl
+share/cups/templates/cs/printer-default.tmpl
+share/cups/templates/cs/printer-deleted.tmpl
+share/cups/templates/cs/printer-jobs-header.tmpl
+share/cups/templates/cs/printer-modified.tmpl
+share/cups/templates/cs/printer-purge.tmpl
+share/cups/templates/cs/printer-reject.tmpl
+share/cups/templates/cs/printer-start.tmpl
+share/cups/templates/cs/printer-stop.tmpl
+share/cups/templates/cs/printer.tmpl
+share/cups/templates/cs/printers-header.tmpl
+share/cups/templates/cs/printers.tmpl
+share/cups/templates/cs/restart.tmpl
+share/cups/templates/cs/samba-export.tmpl
+share/cups/templates/cs/samba-exported.tmpl
+share/cups/templates/cs/search.tmpl
+share/cups/templates/cs/set-printer-options-header.tmpl
+share/cups/templates/cs/set-printer-options-trailer.tmpl
+share/cups/templates/cs/subscription-added.tmpl
+share/cups/templates/cs/subscription-canceled.tmpl
+share/cups/templates/cs/test-page.tmpl
+share/cups/templates/cs/trailer.tmpl
+share/cups/templates/cs/users.tmpl
 share/cups/templates/de/add-class.tmpl
 share/cups/templates/de/add-printer.tmpl
 share/cups/templates/de/add-rss-subscription.tmpl
@@ -367,76 +494,6 @@
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
 share/cups/templates/es/users.tmpl
-share/cups/templates/eu/add-class.tmpl
-share/cups/templates/eu/add-printer.tmpl
-share/cups/templates/eu/add-rss-subscription.tmpl
-share/cups/templates/eu/admin.tmpl
-share/cups/templates/eu/choose-device.tmpl
-share/cups/templates/eu/choose-make.tmpl
-share/cups/templates/eu/choose-model.tmpl
-share/cups/templates/eu/choose-serial.tmpl
-share/cups/templates/eu/choose-uri.tmpl
-share/cups/templates/eu/class-added.tmpl
-share/cups/templates/eu/class-confirm.tmpl
-share/cups/templates/eu/class-deleted.tmpl
-share/cups/templates/eu/class-jobs-header.tmpl
-share/cups/templates/eu/class-modified.tmpl
-share/cups/templates/eu/class.tmpl
-share/cups/templates/eu/classes-header.tmpl
-share/cups/templates/eu/classes.tmpl
-share/cups/templates/eu/command.tmpl
-share/cups/templates/eu/edit-config.tmpl
-share/cups/templates/eu/error-op.tmpl
-share/cups/templates/eu/error.tmpl
-share/cups/templates/eu/header.tmpl
-share/cups/templates/eu/help-header.tmpl
-share/cups/templates/eu/help-printable.tmpl
-share/cups/templates/eu/help-trailer.tmpl
-share/cups/templates/eu/job-cancel.tmpl
-share/cups/templates/eu/job-hold.tmpl
-share/cups/templates/eu/job-move.tmpl
-share/cups/templates/eu/job-moved.tmpl
-share/cups/templates/eu/job-release.tmpl
-share/cups/templates/eu/job-restart.tmpl
-share/cups/templates/eu/jobs-header.tmpl
-share/cups/templates/eu/jobs.tmpl
-share/cups/templates/eu/list-available-printers.tmpl
-share/cups/templates/eu/modify-class.tmpl
-share/cups/templates/eu/modify-printer.tmpl
-share/cups/templates/eu/norestart.tmpl
-share/cups/templates/eu/option-boolean.tmpl
-share/cups/templates/eu/option-conflict.tmpl
-share/cups/templates/eu/option-header.tmpl
-share/cups/templates/eu/option-pickmany.tmpl
-share/cups/templates/eu/option-pickone.tmpl
-share/cups/templates/eu/option-trailer.tmpl
-share/cups/templates/eu/pager.tmpl
-share/cups/templates/eu/printer-accept.tmpl
-share/cups/templates/eu/printer-added.tmpl
-share/cups/templates/eu/printer-configured.tmpl
-share/cups/templates/eu/printer-confirm.tmpl
-share/cups/templates/eu/printer-default.tmpl
-share/cups/templates/eu/printer-deleted.tmpl
-share/cups/templates/eu/printer-jobs-header.tmpl
-share/cups/templates/eu/printer-modified.tmpl
-share/cups/templates/eu/printer-purge.tmpl
-share/cups/templates/eu/printer-reject.tmpl
-share/cups/templates/eu/printer-start.tmpl
-share/cups/templates/eu/printer-stop.tmpl
-share/cups/templates/eu/printer.tmpl
-share/cups/templates/eu/printers-header.tmpl
-share/cups/templates/eu/printers.tmpl
-share/cups/templates/eu/restart.tmpl
-share/cups/templates/eu/samba-export.tmpl
-share/cups/templates/eu/samba-exported.tmpl
-share/cups/templates/eu/search.tmpl
-share/cups/templates/eu/set-printer-options-header.tmpl
-share/cups/templates/eu/set-printer-options-trailer.tmpl
-share/cups/templates/eu/subscription-added.tmpl
-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
@@ -511,146 +568,6 @@
 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
-share/cups/templates/id/admin.tmpl
-share/cups/templates/id/choose-device.tmpl
-share/cups/templates/id/choose-make.tmpl
-share/cups/templates/id/choose-model.tmpl
-share/cups/templates/id/choose-serial.tmpl
-share/cups/templates/id/choose-uri.tmpl
-share/cups/templates/id/class-added.tmpl
-share/cups/templates/id/class-confirm.tmpl
-share/cups/templates/id/class-deleted.tmpl
-share/cups/templates/id/class-jobs-header.tmpl
-share/cups/templates/id/class-modified.tmpl
-share/cups/templates/id/class.tmpl
-share/cups/templates/id/classes-header.tmpl
-share/cups/templates/id/classes.tmpl
-share/cups/templates/id/command.tmpl
-share/cups/templates/id/edit-config.tmpl
-share/cups/templates/id/error-op.tmpl
-share/cups/templates/id/error.tmpl
-share/cups/templates/id/header.tmpl
-share/cups/templates/id/help-header.tmpl
-share/cups/templates/id/help-printable.tmpl
-share/cups/templates/id/help-trailer.tmpl
-share/cups/templates/id/job-cancel.tmpl
-share/cups/templates/id/job-hold.tmpl
-share/cups/templates/id/job-move.tmpl
-share/cups/templates/id/job-moved.tmpl
-share/cups/templates/id/job-release.tmpl
-share/cups/templates/id/job-restart.tmpl
-share/cups/templates/id/jobs-header.tmpl
-share/cups/templates/id/jobs.tmpl
-share/cups/templates/id/list-available-printers.tmpl
-share/cups/templates/id/modify-class.tmpl
-share/cups/templates/id/modify-printer.tmpl
-share/cups/templates/id/norestart.tmpl
-share/cups/templates/id/option-boolean.tmpl
-share/cups/templates/id/option-conflict.tmpl
-share/cups/templates/id/option-header.tmpl
-share/cups/templates/id/option-pickmany.tmpl
-share/cups/templates/id/option-pickone.tmpl
-share/cups/templates/id/option-trailer.tmpl
-share/cups/templates/id/pager.tmpl
-share/cups/templates/id/printer-accept.tmpl
-share/cups/templates/id/printer-added.tmpl
-share/cups/templates/id/printer-configured.tmpl
-share/cups/templates/id/printer-confirm.tmpl
-share/cups/templates/id/printer-default.tmpl
-share/cups/templates/id/printer-deleted.tmpl
-share/cups/templates/id/printer-jobs-header.tmpl
-share/cups/templates/id/printer-modified.tmpl
-share/cups/templates/id/printer-purge.tmpl
-share/cups/templates/id/printer-reject.tmpl
-share/cups/templates/id/printer-start.tmpl
-share/cups/templates/id/printer-stop.tmpl
-share/cups/templates/id/printer.tmpl
-share/cups/templates/id/printers-header.tmpl
-share/cups/templates/id/printers.tmpl
-share/cups/templates/id/restart.tmpl
-share/cups/templates/id/samba-export.tmpl
-share/cups/templates/id/samba-exported.tmpl
-share/cups/templates/id/search.tmpl
-share/cups/templates/id/set-printer-options-header.tmpl
-share/cups/templates/id/set-printer-options-trailer.tmpl
-share/cups/templates/id/subscription-added.tmpl
-share/cups/templates/id/subscription-canceled.tmpl
-share/cups/templates/id/test-page.tmpl
-share/cups/templates/id/trailer.tmpl
-share/cups/templates/id/users.tmpl
 share/cups/templates/it/add-class.tmpl
 share/cups/templates/it/add-printer.tmpl
 share/cups/templates/it/add-rss-subscription.tmpl
@@ -672,6 +589,7 @@
 share/cups/templates/it/edit-config.tmpl
 share/cups/templates/it/error-op.tmpl
 share/cups/templates/it/error.tmpl
+share/cups/templates/it/header.tmpl
 share/cups/templates/it/help-header.tmpl
 share/cups/templates/it/help-printable.tmpl
 share/cups/templates/it/help-trailer.tmpl
@@ -809,76 +727,6 @@
 share/cups/templates/option-pickone.tmpl
 share/cups/templates/option-trailer.tmpl
 share/cups/templates/pager.tmpl
-share/cups/templates/pl/add-class.tmpl
-share/cups/templates/pl/add-printer.tmpl
-share/cups/templates/pl/add-rss-subscription.tmpl
-share/cups/templates/pl/admin.tmpl
-share/cups/templates/pl/choose-device.tmpl
-share/cups/templates/pl/choose-make.tmpl
-share/cups/templates/pl/choose-model.tmpl
-share/cups/templates/pl/choose-serial.tmpl
-share/cups/templates/pl/choose-uri.tmpl
-share/cups/templates/pl/class-added.tmpl
-share/cups/templates/pl/class-confirm.tmpl
-share/cups/templates/pl/class-deleted.tmpl
-share/cups/templates/pl/class-jobs-header.tmpl
-share/cups/templates/pl/class-modified.tmpl
-share/cups/templates/pl/class.tmpl
-share/cups/templates/pl/classes-header.tmpl
-share/cups/templates/pl/classes.tmpl
-share/cups/templates/pl/command.tmpl
-share/cups/templates/pl/edit-config.tmpl
-share/cups/templates/pl/error-op.tmpl
-share/cups/templates/pl/error.tmpl
-share/cups/templates/pl/header.tmpl
-share/cups/templates/pl/help-header.tmpl
-share/cups/templates/pl/help-printable.tmpl
-share/cups/templates/pl/help-trailer.tmpl
-share/cups/templates/pl/job-cancel.tmpl
-share/cups/templates/pl/job-hold.tmpl
-share/cups/templates/pl/job-move.tmpl
-share/cups/templates/pl/job-moved.tmpl
-share/cups/templates/pl/job-release.tmpl
-share/cups/templates/pl/job-restart.tmpl
-share/cups/templates/pl/jobs-header.tmpl
-share/cups/templates/pl/jobs.tmpl
-share/cups/templates/pl/list-available-printers.tmpl
-share/cups/templates/pl/modify-class.tmpl
-share/cups/templates/pl/modify-printer.tmpl
-share/cups/templates/pl/norestart.tmpl
-share/cups/templates/pl/option-boolean.tmpl
-share/cups/templates/pl/option-conflict.tmpl
-share/cups/templates/pl/option-header.tmpl
-share/cups/templates/pl/option-pickmany.tmpl
-share/cups/templates/pl/option-pickone.tmpl
-share/cups/templates/pl/option-trailer.tmpl
-share/cups/templates/pl/pager.tmpl
-share/cups/templates/pl/printer-accept.tmpl
-share/cups/templates/pl/printer-added.tmpl
-share/cups/templates/pl/printer-configured.tmpl
-share/cups/templates/pl/printer-confirm.tmpl
-share/cups/templates/pl/printer-default.tmpl
-share/cups/templates/pl/printer-deleted.tmpl
-share/cups/templates/pl/printer-jobs-header.tmpl
-share/cups/templates/pl/printer-modified.tmpl
-share/cups/templates/pl/printer-purge.tmpl
-share/cups/templates/pl/printer-reject.tmpl
-share/cups/templates/pl/printer-start.tmpl
-share/cups/templates/pl/printer-stop.tmpl
-share/cups/templates/pl/printer.tmpl
-share/cups/templates/pl/printers-header.tmpl
-share/cups/templates/pl/printers.tmpl
-share/cups/templates/pl/restart.tmpl
-share/cups/templates/pl/samba-export.tmpl
-share/cups/templates/pl/samba-exported.tmpl
-share/cups/templates/pl/search.tmpl
-share/cups/templates/pl/set-printer-options-header.tmpl
-share/cups/templates/pl/set-printer-options-trailer.tmpl
-share/cups/templates/pl/subscription-added.tmpl
-share/cups/templates/pl/subscription-canceled.tmpl
-share/cups/templates/pl/test-page.tmpl
-share/cups/templates/pl/trailer.tmpl
-share/cups/templates/pl/users.tmpl
 share/cups/templates/printer-accept.tmpl
 share/cups/templates/printer-added.tmpl
 share/cups/templates/printer-configured.tmpl
@@ -894,6 +742,74 @@
 share/cups/templates/printer.tmpl
 share/cups/templates/printers-header.tmpl
 share/cups/templates/printers.tmpl
+share/cups/templates/pt_BR/add-class.tmpl
+share/cups/templates/pt_BR/add-printer.tmpl
+share/cups/templates/pt_BR/add-rss-subscription.tmpl
+share/cups/templates/pt_BR/admin.tmpl
+share/cups/templates/pt_BR/choose-device.tmpl
+share/cups/templates/pt_BR/choose-make.tmpl
+share/cups/templates/pt_BR/choose-model.tmpl
+share/cups/templates/pt_BR/choose-serial.tmpl
+share/cups/templates/pt_BR/choose-uri.tmpl
+share/cups/templates/pt_BR/class-added.tmpl
+share/cups/templates/pt_BR/class-confirm.tmpl
+share/cups/templates/pt_BR/class-deleted.tmpl
+share/cups/templates/pt_BR/class-jobs-header.tmpl
+share/cups/templates/pt_BR/class-modified.tmpl
+share/cups/templates/pt_BR/class.tmpl
+share/cups/templates/pt_BR/classes-header.tmpl
+share/cups/templates/pt_BR/classes.tmpl
+share/cups/templates/pt_BR/command.tmpl
+share/cups/templates/pt_BR/edit-config.tmpl
+share/cups/templates/pt_BR/error-op.tmpl
+share/cups/templates/pt_BR/error.tmpl
+share/cups/templates/pt_BR/header.tmpl
+share/cups/templates/pt_BR/help-header.tmpl
+share/cups/templates/pt_BR/job-cancel.tmpl
+share/cups/templates/pt_BR/job-hold.tmpl
+share/cups/templates/pt_BR/job-move.tmpl
+share/cups/templates/pt_BR/job-moved.tmpl
+share/cups/templates/pt_BR/job-release.tmpl
+share/cups/templates/pt_BR/job-restart.tmpl
+share/cups/templates/pt_BR/jobs-header.tmpl
+share/cups/templates/pt_BR/jobs.tmpl
+share/cups/templates/pt_BR/list-available-printers.tmpl
+share/cups/templates/pt_BR/modify-class.tmpl
+share/cups/templates/pt_BR/modify-printer.tmpl
+share/cups/templates/pt_BR/norestart.tmpl
+share/cups/templates/pt_BR/option-boolean.tmpl
+share/cups/templates/pt_BR/option-conflict.tmpl
+share/cups/templates/pt_BR/option-header.tmpl
+share/cups/templates/pt_BR/option-pickmany.tmpl
+share/cups/templates/pt_BR/option-pickone.tmpl
+share/cups/templates/pt_BR/option-trailer.tmpl
+share/cups/templates/pt_BR/pager.tmpl
+share/cups/templates/pt_BR/printer-accept.tmpl
+share/cups/templates/pt_BR/printer-added.tmpl
+share/cups/templates/pt_BR/printer-configured.tmpl
+share/cups/templates/pt_BR/printer-confirm.tmpl
+share/cups/templates/pt_BR/printer-default.tmpl
+share/cups/templates/pt_BR/printer-deleted.tmpl
+share/cups/templates/pt_BR/printer-jobs-header.tmpl
+share/cups/templates/pt_BR/printer-modified.tmpl
+share/cups/templates/pt_BR/printer-purge.tmpl
+share/cups/templates/pt_BR/printer-reject.tmpl
+share/cups/templates/pt_BR/printer-start.tmpl
+share/cups/templates/pt_BR/printer-stop.tmpl
+share/cups/templates/pt_BR/printer.tmpl
+share/cups/templates/pt_BR/printers-header.tmpl
+share/cups/templates/pt_BR/printers.tmpl
+share/cups/templates/pt_BR/restart.tmpl
+share/cups/templates/pt_BR/samba-export.tmpl
+share/cups/templates/pt_BR/samba-exported.tmpl
+share/cups/templates/pt_BR/search.tmpl
+share/cups/templates/pt_BR/set-printer-options-header.tmpl
+share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
+share/cups/templates/pt_BR/subscription-added.tmpl
+share/cups/templates/pt_BR/subscription-canceled.tmpl
+share/cups/templates/pt_BR/test-page.tmpl
+share/cups/templates/pt_BR/trailer.tmpl
+share/cups/templates/pt_BR/users.tmpl
 share/cups/templates/restart.tmpl
 share/cups/templates/ru/add-class.tmpl
 share/cups/templates/ru/add-printer.tmpl
@@ -975,13 +891,15 @@
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
 share/cups/templates/users.tmpl
+share/cups/usb/org.cups.usb-quirks
 share/doc/cups/LICENSE.txt
 share/doc/cups/README.txt
+share/doc/cups/ca/index.html
+share/doc/cups/cs/index.html
 share/doc/cups/cups-printable.css
 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
@@ -1004,7 +922,7 @@
 share/doc/cups/help/man-cancel.html
 share/doc/cups/help/man-cups-config.html
 share/doc/cups/help/man-cups-lpd.html
-share/doc/cups/help/man-cups-polld.html
+share/doc/cups/help/man-cups-snmp.html
 share/doc/cups/help/man-cupsaccept.html
 share/doc/cups/help/man-cupsaddsmb.html
 share/doc/cups/help/man-cupsd.html
@@ -1043,6 +961,7 @@
 share/doc/cups/help/ref-access_log.html
 share/doc/cups/help/ref-classes-conf.html
 share/doc/cups/help/ref-client-conf.html
+share/doc/cups/help/ref-cups-files-conf.html
 share/doc/cups/help/ref-cupsd-conf.html
 share/doc/cups/help/ref-error_log.html
 share/doc/cups/help/ref-mailto-conf.html
@@ -1054,7 +973,6 @@
 share/doc/cups/help/security.html
 share/doc/cups/help/sharing.html
 share/doc/cups/help/spec-banner.html
-share/doc/cups/help/spec-browsing.html
 share/doc/cups/help/spec-cmp.html
 share/doc/cups/help/spec-command.html
 share/doc/cups/help/spec-design.html
@@ -1064,11 +982,8 @@
 share/doc/cups/help/spec-ppd.html
 share/doc/cups/help/spec-raster.html
 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
 share/doc/cups/images/cups-command-chain.png
@@ -1076,7 +991,6 @@
 share/doc/cups/images/cups-postscript-chain.png
 share/doc/cups/images/cups-raster-chain.png
 share/doc/cups/images/cups.png
-share/doc/cups/images/generic.png
 share/doc/cups/images/left.gif
 share/doc/cups/images/raster-organization.png
 share/doc/cups/images/raster.png
@@ -1089,31 +1003,20 @@
 share/doc/cups/index.html
 share/doc/cups/it/index.html
 share/doc/cups/ja/index.html
-share/doc/cups/pl/index.html
+share/doc/cups/pt_BR/index.html
 share/doc/cups/robots.txt
 share/doc/cups/ru/index.html
 ${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/cupsd.conf
 share/examples/cups/snmp.conf
-share/locale/da/cups_da.po
+share/locale/ca/cups_ca.po
+share/locale/cs/cups_cs.po
 share/locale/de/cups_de.po
 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
-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
-@pkgdir share/cups/model
 @pkgdir share/cups/profiles
+@pkgdir share/cups/model
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/distinfo,v
retrieving revision 1.99
diff -u -r1.99 distinfo
--- distinfo    1 Jun 2014 06:19:02 -0000       1.99
+++ distinfo    4 Jun 2014 11:50:35 -0000
@@ -1,24 +1,21 @@
 $NetBSD: distinfo,v 1.99 2014/06/01 06:19:02 ryoon Exp $
 
-SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
-RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
-Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes
-SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
-SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
-SHA1 (patch-ae) = 67e846ac428b4c44d8da9b49d959fa4f14fbb494
-SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
-SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
-SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
-SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e
-SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
-SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
-SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e
-SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60
-SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395
-SHA1 (patch-config-scripts_cups-gssapi.m4) = 
6f558ee1d2d56ceba3a9705d3278c7969495be5d
-SHA1 (patch-config.h.in) = 0f072063d24810dcbdd2d095b9f2fa6bab44ff20
-SHA1 (patch-filter_raster.c) = fc48e9cc7f7f32355816355dfc199157a00246c7
-SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60
-SHA1 (patch-scheduler_auth.c) = 29cd4378eb4ceeb1e618534fc5a9975022dbcf2c
-SHA1 (patch-scheduler_client.c) = d4b6667199c0ff9617847ba119b82a50457cfd98
-SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47
+SHA1 (cups-1.7.3-source.tar.bz2) = 8b967f64224eaa7f8e1241560dcf93a723c4b54a
+RMD160 (cups-1.7.3-source.tar.bz2) = ecc5803ffa2b78b04f617ef43819395410dc182b
+Size (cups-1.7.3-source.tar.bz2) = 8792641 bytes
+SHA1 (patch-ac) = a6f3ed84b727fe4735060a804eaf564ef813748b
+SHA1 (patch-ad) = c7c6b052e6ed5a78f8d3aeceaac9c5b08597df38
+SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
+SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
+SHA1 (patch-ah) = d7a43f4fc9d4439fe9a490d6ea6d6c75afd7b777
+SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
+SHA1 (patch-an) = c75ce52b7afc252c293da7024d93788fd5da3957
+SHA1 (patch-ao) = 26a9fbfbe44bdf9ba615a747a40521cb49a13fa3
+SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178
+SHA1 (patch-au) = 20e1b2375e32d6aede99b26fad95f8bfd8b0100e
+SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516
+SHA1 (patch-config-scripts_cups-gssapi.m4) = 
7c8b0dd893b9d21597088062711cc50f13031338
+SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa
+SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
+SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4
+SHA1 (patch-scheduler_dirsvc.c) = 9fde40dc14d7a3d177b84219c820b57d82dbe48a
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ac,v
retrieving revision 1.15
diff -u -r1.15 patch-ac
--- patches/patch-ac    21 May 2010 10:05:20 -0000      1.15
+++ patches/patch-ac    4 Jun 2014 11:50:35 -0000
@@ -2,13 +2,13 @@
 
 libtoolize.
 
---- configure.in.orig  2008-11-14 19:32:22.000000000 +0000
+--- configure.in.orig  2013-07-08 21:15:13.000000000 +0000
 +++ configure.in
-@@ -22,7 +22,6 @@ sinclude(config-scripts/cups-manpages.m4
+@@ -21,7 +21,6 @@ sinclude(config-scripts/cups-directories
+ sinclude(config-scripts/cups-manpages.m4)
  
- sinclude(config-scripts/cups-3264.m4)
  sinclude(config-scripts/cups-sharedlibs.m4)
 -sinclude(config-scripts/cups-libtool.m4)
  sinclude(config-scripts/cups-compiler.m4)
  
- sinclude(config-scripts/cups-image.m4)
+ sinclude(config-scripts/cups-network.m4)
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ad,v
retrieving revision 1.17
diff -u -r1.17 patch-ad
--- patches/patch-ad    13 Nov 2011 21:49:17 -0000      1.17
+++ patches/patch-ad    4 Jun 2014 11:50:36 -0000
@@ -2,7 +2,7 @@
 
 libtoolize.
 
---- config-scripts/cups-sharedlibs.m4.orig     2010-06-16 00:48:25.000000000 
+0000
+--- config-scripts/cups-sharedlibs.m4.orig     2012-10-15 21:02:10.000000000 
+0000
 +++ config-scripts/cups-sharedlibs.m4
 @@ -22,6 +22,24 @@ cupsbase="cups"
  LIBCUPSBASE="lib$cupsbase"
@@ -29,7 +29,7 @@
  if test x$enable_shared != xno; then
        case "$uname" in
                SunOS*)
-@@ -131,6 +149,15 @@ if test x$enable_shared != xno; then
+@@ -122,6 +140,15 @@ if test x$enable_shared != xno; then
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` 
-shared \$(OPTIM)"
                        ;;
        esac
@@ -45,7 +45,7 @@
  else
        PICFLAG=0
        LIBCUPS="lib$cupsbase.a"
-@@ -163,8 +190,13 @@ AC_SUBST(LIBCUPSPPDC)
+@@ -145,8 +172,13 @@ AC_SUBST(LIBCUPSPPDC)
  AC_SUBST(LIBCUPSSTATIC)
  
  if test x$enable_shared = xno; then
@@ -60,9 +60,9 @@
 +      fi
  
        EXTLINKCUPS="-lcups"
-       EXTLINKCUPSDRIVER="-lcupsdriver"
-@@ -204,10 +236,11 @@ if test "$DSO" != ":"; then
-       DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+       EXTLINKCUPSIMAGE="-lcupsimage"
+@@ -182,10 +214,11 @@ if test "$DSO" != ":"; then
+       DSOLIBS="\$(LIBZ)"
        IMGLIBS=""
  
 -      # Tell the run-time linkers where to find a DSO.  Some platforms
@@ -77,7 +77,7 @@
                  HP-UX*)
                        # HP-UX needs the path, even for /usr/lib...
                        case "$uarch" in
-@@ -255,7 +288,8 @@ if test "$DSO" != ":"; then
+@@ -223,7 +256,8 @@ if test "$DSO" != ":"; then
                                EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
                        fi
                        ;;
@@ -86,4 +86,4 @@
 +      fi
  else
        DSOLIBS=""
-       IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
+       IMGLIBS="\$(LIBZ)"
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ae,v
retrieving revision 1.31
diff -u -r1.31 patch-ae
--- patches/patch-ae    10 May 2014 13:42:08 -0000      1.31
+++ patches/patch-ae    4 Jun 2014 11:50:36 -0000
@@ -5,7 +5,7 @@
 
 Same for CXX.
 
---- Makedefs.in.orig   2012-03-01 00:05:55.000000000 +0000
+--- Makedefs.in.orig   2013-07-17 15:21:18.000000000 +0000
 +++ Makedefs.in
 @@ -19,9 +19,11 @@
  
@@ -20,16 +20,16 @@
 +CXX           =       @LIBTOOL@ --mode=link @CXX@
  DSO           =       @DSO@
  DSOXX         =       @DSOXX@
- HTMLDOC               =       @HTMLDOC@
-@@ -41,12 +43,12 @@ SHELL              =       /bin/sh
+ GZIP          =       @GZIP@
+@@ -40,12 +42,12 @@ SHELL              =       /bin/sh
  # Installation programs...
  #
  
 -INSTALL_BIN   =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-+INSTALL_BIN   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 
@INSTALL_STRIP@
- INSTALL_CONFIG        =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 -INSTALL_COMPDATA =    $(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN   =       $(LIBTOOL) --mode=install $(INSTALL) -c -m 755 
@INSTALL_STRIP@
 +INSTALL_COMPDATA =    $(INSTALL) -c -m 444
+ INSTALL_CONFIG        =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
  INSTALL_DATA  =       $(INSTALL) -c -m 444
  INSTALL_DIR   =       $(INSTALL) -d
 -INSTALL_LIB   =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
@@ -37,7 +37,7 @@
  INSTALL_MAN   =       $(INSTALL) -c -m 444
  INSTALL_SCRIPT        =       $(INSTALL) -c -m 555
  
-@@ -145,7 +147,7 @@ CXXLIBS            =       @CXXLIBS@
+@@ -135,7 +137,7 @@ CXXLIBS            =       @CXXLIBS@
  DBUS_NOTIFIER =       @DBUS_NOTIFIER@
  DBUS_NOTIFIERLIBS =   @DBUS_NOTIFIERLIBS@
  DNSSD_BACKEND =       @DNSSD_BACKEND@
@@ -45,24 +45,14 @@
 +DSOFLAGS      =       -L../cups @DSOFLAGS@ $(OPTIM)
  DSOLIBS               =       @DSOLIBS@ $(COMMONLIBS)
  DNSSDLIBS     =       @DNSSDLIBS@
- FONTS         =       @FONTS@
-@@ -279,19 +281,19 @@ DBUSDIR          =       @DBUSDIR@
+ IPPFIND_BIN   =       @IPPFIND_BIN@
+@@ -243,11 +245,11 @@ DBUSDIR          =       @DBUSDIR@
  
  .c.o:
        echo Compiling $<...
 -      $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 +      $(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
  
- .c.32.o:
-       echo Compiling 32-bit $<...
--      $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-+      $(CC_COMPILE) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
- 
- .c.64.o:
-       echo Compiling 64-bit $<...
--      $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-+      $(CC_COMPILE) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
- 
  .cxx.o:
        echo Compiling $<...
 -      $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-af,v
retrieving revision 1.21
diff -u -r1.21 patch-af
--- patches/patch-af    13 Nov 2011 21:49:17 -0000      1.21
+++ patches/patch-af    4 Jun 2014 11:50:36 -0000
@@ -2,9 +2,9 @@
 
 * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
 
---- backend/Makefile.orig      2011-05-04 04:28:00.000000000 +0000
+--- backend/Makefile.orig      2013-07-17 15:21:18.000000000 +0000
 +++ backend/Makefile
-@@ -89,7 +89,7 @@ install-exec:        $(INSTALLXPC)
+@@ -124,7 +124,7 @@ install-exec:      $(INSTALLXPC)
        echo Installing backends in $(SERVERBIN)/backend
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
        for file in $(RBACKENDS); do \
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- patches/patch-ag    21 May 2010 10:05:20 -0000      1.22
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.22 2010/05/21 10:05:20 sbd Exp $
-
-cups installs stuff in /usr/pkg/lib64 on Linux. Don't do this.
-
---- config-scripts/cups-3264.m4.orig   2009-04-19 21:18:45.000000000 +0000
-+++ config-scripts/cups-3264.m4
-@@ -95,7 +95,7 @@ case "$uname" in
-                       LIB32CUPS="32bit/libcups.so.2"
-                       LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-                       LIB32DIR="$exec_prefix/lib"
--                      if test -d /usr/lib32; then
-+                      if test -d /usr/lib32 && false; then
-                               LIB32DIR="${LIB32DIR}32"
-                       fi
-                       UNINSTALL32="uninstall32bit"
-@@ -107,7 +107,7 @@ case "$uname" in
-                       LIB64CUPS="64bit/libcups.so.2"
-                       LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-                       LIB64DIR="$exec_prefix/lib"
--                      if test -d /usr/lib64; then
-+                      if test -d /usr/lib64 && false; then
-                               LIB64DIR="${LIB64DIR}64"
-                       fi
-                       UNINSTALL64="uninstall64bit"
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ah,v
retrieving revision 1.20
diff -u -r1.20 patch-ah
--- patches/patch-ah    2 Dec 2011 14:14:58 -0000       1.20
+++ patches/patch-ah    4 Jun 2014 11:50:36 -0000
@@ -3,16 +3,20 @@
 Some builds of gcc seem to support this for compiling but then fail during
 linking with undefined reference to `__stack_chk_fail_local'
 
---- config-scripts/cups-compiler.m4.orig       2009-05-17 00:13:47.000000000 
+0000
+--- config-scripts/cups-compiler.m4.orig       2014-03-05 20:01:48.000000000 
+0000
 +++ config-scripts/cups-compiler.m4
-@@ -140,8 +140,9 @@ if test -n "$GCC"; then
+@@ -113,12 +113,13 @@ if test -n "$GCC"; then
        AC_MSG_CHECKING(if GCC supports -fstack-protector)
        OLDCFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fstack-protector"
 -      AC_TRY_LINK(,,
 +      AC_TRY_LINK(, [return 0;],
-               OPTIM="$OPTIM -fstack-protector"
-+              LIBS="$LIBS $LIBS_SSP"
+               if test "x$LSB_BUILD" = xy; then
+                       # Can't use stack-protector with LSB binaries...
+                       OPTIM="$OPTIM -fno-stack-protector"
+               else
+                       OPTIM="$OPTIM -fstack-protector"
++                      LIBS="$LIBS $LIBS_SSP"
+               fi
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))
-       CFLAGS="$OLDCFLAGS"
Index: patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ai,v
retrieving revision 1.19
diff -u -r1.19 patch-ai
--- patches/patch-ai    13 Nov 2011 21:49:17 -0000      1.19
+++ patches/patch-ai    4 Jun 2014 11:50:36 -0000
@@ -2,7 +2,7 @@
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
---- notifier/Makefile.orig     2009-04-12 23:04:51.000000000 +0000
+--- notifier/Makefile.orig     2013-05-29 11:51:34.000000000 +0000
 +++ notifier/Makefile
 @@ -62,6 +62,8 @@ install:     all install-data install-header
  #
Index: patches/patch-an
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-an,v
retrieving revision 1.11
diff -u -r1.11 patch-an
--- patches/patch-an    21 May 2010 10:05:20 -0000      1.11
+++ patches/patch-an    4 Jun 2014 11:50:36 -0000
@@ -9,18 +9,24 @@
 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    2009-04-12 23:04:51.000000000 
+0000
+--- config-scripts/cups-directories.m4.orig    2013-04-09 20:10:23.000000000 
+0000
 +++ config-scripts/cups-directories.m4
-@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib
-                       libdir="$exec_prefix/lib32"
-                       ;;
+@@ -103,12 +103,12 @@ dnl Fix "libdir" variable...
+ if test "$libdir" = "\${exec_prefix}/lib"; then
+       case "$uname" in
                Linux*)
--                      if test -d /usr/lib64; then
-+                      if test -d /usr/lib64 && false; then
+-                      if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
++                      if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot && 
false; then
                                libdir="$exec_prefix/lib64"
                        fi
                        ;;
-@@ -297,7 +297,15 @@ AC_SUBST(CUPS_CACHEDIR)
+               HP-UX*)
+-                      if test -d /usr/lib/hpux32; then
++                      if test -d /usr/lib/hpux32 && false; then
+                               libdir="$exec_prefix/lib/hpux32"
+                       fi
+                       ;;
+@@ -298,7 +298,15 @@ AC_SUBST(CUPS_CACHEDIR)
  
  # Data files
  CUPS_DATADIR="$datadir/cups"
@@ -37,7 +43,7 @@
  AC_SUBST(CUPS_DATADIR)
  
  # Icon directory
-@@ -306,7 +314,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
+@@ -307,7 +315,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
  if test "x$icondir" = x -a -d /usr/share/icons; then
        ICONDIR="/usr/share/icons"
  else
@@ -50,7 +56,7 @@
  fi
  
  AC_SUBST(ICONDIR)
-@@ -317,7 +329,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
+@@ -318,7 +330,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
  if test "x$menudir" = x -a -d /usr/share/applications; then
        MENUDIR="/usr/share/applications"
  else
@@ -63,7 +69,7 @@
  fi
  
  AC_SUBST(MENUDIR)
-@@ -332,7 +348,15 @@ else
+@@ -333,7 +349,15 @@ else
        CUPS_DOCROOT="$docdir"
  fi
  
@@ -80,7 +86,7 @@
  AC_SUBST(CUPS_DOCROOT)
  
  # Fonts
-@@ -344,8 +368,16 @@ else
+@@ -345,8 +369,16 @@ else
        CUPS_FONTPATH="$fontpath"
  fi
  
@@ -98,7 +104,7 @@
  
  # Locale data
  if test "$localedir" = "\${datarootdir}/locale"; then
-@@ -367,6 +399,14 @@ else
+@@ -368,6 +400,14 @@ else
        CUPS_LOCALEDIR="$localedir"
  fi
  
@@ -113,7 +119,7 @@
  AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
  AC_SUBST(CUPS_LOCALEDIR)
  
-@@ -375,7 +415,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
+@@ -376,7 +416,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
  
  if test x$logdir = x; then
        CUPS_LOGDIR="$localstatedir/log/cups"
@@ -121,7 +127,7 @@
  else
        CUPS_LOGDIR="$logdir"
  fi
-@@ -384,10 +423,13 @@ AC_SUBST(CUPS_LOGDIR)
+@@ -385,10 +424,13 @@ AC_SUBST(CUPS_LOGDIR)
  
  # Longer-term spool data
  CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -136,7 +142,7 @@
  case "$uname" in
        *BSD* | Darwin*)
                # *BSD and Darwin (MacOS X)
-@@ -400,6 +442,10 @@ case "$uname" in
+@@ -401,6 +443,10 @@ case "$uname" in
                CUPS_SERVERBIN="$exec_prefix/lib/cups"
                ;;
  esac
@@ -147,7 +153,7 @@
  
  AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  AC_SUBST(CUPS_SERVERBIN)
-@@ -407,7 +453,7 @@ AC_SUBST(INSTALL_SYSV)
+@@ -408,7 +454,7 @@ AC_SUBST(INSTALL_SYSV)
  
  # Configuration files
  CUPS_SERVERROOT="$sysconfdir/cups"
Index: patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ao,v
retrieving revision 1.11
diff -u -r1.11 patch-ao
--- patches/patch-ao    21 May 2010 10:05:21 -0000      1.11
+++ patches/patch-ao    4 Jun 2014 11:50:36 -0000
@@ -2,7 +2,7 @@
 
 Add '--with-manext' configure option.
 
---- config-scripts/cups-manpages.m4.orig       2009-01-12 19:17:09.000000000 
+0000
+--- config-scripts/cups-manpages.m4.orig       2012-10-15 21:02:10.000000000 
+0000
 +++ config-scripts/cups-manpages.m4
 @@ -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/";.
@@ -13,22 +13,18 @@
  dnl Fix "mandir" variable...
  if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
        # New GNU "standards" break previous ones, so make sure we use
-@@ -50,8 +52,33 @@ AC_SUBST(AMANDIR)
+@@ -44,8 +46,28 @@ AC_SUBST(AMANDIR)
  AC_SUBST(PMANDIR)
  
  dnl Setup manpage extensions...
 -case "$uname" in
--      IRIX*)
+-      SunOS* | HP-UX*)
 +if test x$manext = x; then
 +      case "$uname" in
 +              *BSD* | DragonFly*)
 +                      # *BSD and Darwin (MacOS X)
 +                      manext=bsd
 +                      ;;
-+              IRIX*)
-+                      # SGI IRIX
-+                      manext=irix
-+                      ;;
 +              SunOS* | HP-UX*)
 +                      # Solaris and HP-UX
 +                      manext=sysv
@@ -39,35 +35,25 @@
 +                      ;;
 +              *)
 +                      # All others
-+                      manext=none
 +                      ;;
 +      esac
 +fi
 +
 +case "$manext" in
-+      irix)
-               # SGI IRIX
-               MAN1EXT=1
-               MAN5EXT=5
-@@ -59,7 +86,7 @@ case "$uname" in
-               MAN8EXT=1m
-               MAN8DIR=1
-               ;;
--      SunOS* | HP-UX*)
 +      sysv)
                # Solaris and HP-UX
                MAN1EXT=1
                MAN5EXT=5
-@@ -67,7 +94,7 @@ case "$uname" in
+@@ -53,7 +75,7 @@ case "$uname" in
                MAN8EXT=1m
                MAN8DIR=1m
                ;;
 -      Linux* | GNU* | Darwin*)
 +      linux)
-               # Linux, GNU Hurd, and Mac OS X
+               # Linux, GNU Hurd, and OS X
                MAN1EXT=1.gz
                MAN5EXT=5.gz
-@@ -75,7 +102,7 @@ case "$uname" in
+@@ -61,7 +83,7 @@ case "$uname" in
                MAN8EXT=8.gz
                MAN8DIR=8
                ;;
Index: patches/patch-at
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-at,v
retrieving revision 1.12
diff -u -r1.12 patch-at
--- patches/patch-at    13 Nov 2011 21:49:17 -0000      1.12
+++ patches/patch-at    4 Jun 2014 11:50:36 -0000
@@ -2,9 +2,9 @@
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
---- scheduler/Makefile.orig    2009-05-26 23:27:06.000000000 +0000
+--- scheduler/Makefile.orig    2013-05-29 11:51:34.000000000 +0000
 +++ scheduler/Makefile
-@@ -135,6 +135,8 @@ install:   all install-data install-header
+@@ -146,6 +146,8 @@ install:   all install-data install-header
  #
  
  install-data:
Index: patches/patch-au
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-au,v
retrieving revision 1.15
diff -u -r1.15 patch-au
--- patches/patch-au    21 Dec 2011 08:57:11 -0000      1.15
+++ patches/patch-au    4 Jun 2014 11:50:36 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-au,v 1.15 2011/12/21 08:57:11 sbd Exp $
 
---- scheduler/printers.c.orig  2011-06-15 00:46:13.000000000 +0000
+--- scheduler/printers.c.orig  2014-02-19 20:18:10.000000000 +0000
 +++ scheduler/printers.c
-@@ -80,6 +80,9 @@
+@@ -37,6 +37,9 @@
  #  include <asl.h>
  #endif /* __APPLE__ */
  
Index: patches/patch-conf_Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-conf_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-conf_Makefile
--- patches/patch-conf_Makefile 9 May 2013 09:38:20 -0000       1.2
+++ patches/patch-conf_Makefile 4 Jun 2014 11:50:36 -0000
@@ -2,7 +2,7 @@
 
 Don't install the config files (leave it up to pkgsrc).
 
---- conf/Makefile.orig 2011-05-12 05:21:56.000000000 +0000
+--- conf/Makefile.orig 2013-05-29 11:51:34.000000000 +0000
 +++ conf/Makefile
 @@ -70,22 +70,8 @@ install:    all install-data install-header
  #
Index: patches/patch-config-scripts_cups-gssapi.m4
===================================================================
RCS file: 
/cvsroot/pkgsrc/print/cups/patches/patch-config-scripts_cups-gssapi.m4,v
retrieving revision 1.3
diff -u -r1.3 patch-config-scripts_cups-gssapi.m4
--- patches/patch-config-scripts_cups-gssapi.m4 12 Oct 2013 06:01:58 -0000      
1.3
+++ patches/patch-config-scripts_cups-gssapi.m4 4 Jun 2014 11:50:36 -0000
@@ -3,7 +3,7 @@
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
---- config-scripts/cups-gssapi.m4.orig 2011-10-19 20:21:16.000000000 +0000
+--- config-scripts/cups-gssapi.m4.orig 2014-03-28 13:52:05.000000000 +0000
 +++ config-scripts/cups-gssapi.m4
 @@ -36,19 +36,18 @@ if test x$enable_gssapi != xno; then
                                        AC_MSG_RESULT(no)
Index: patches/patch-config.h.in
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-config.h.in,v
retrieving revision 1.1
diff -u -r1.1 patch-config.h.in
--- patches/patch-config.h.in   1 Jun 2014 06:19:02 -0000       1.1
+++ patches/patch-config.h.in   4 Jun 2014 11:50:36 -0000
@@ -2,9 +2,9 @@
 
 * OpenBSD has no arc4random_stir
 
---- config.h.in.orig   2012-03-21 04:45:48.000000000 +0000
+--- config.h.in.orig   2014-02-27 15:57:59.000000000 +0000
 +++ config.h.in
-@@ -674,7 +674,11 @@
+@@ -612,7 +612,11 @@
  
  #ifdef HAVE_ARC4RANDOM
  #  define CUPS_RAND() arc4random()
Index: patches/patch-filter_raster.c
===================================================================
RCS file: patches/patch-filter_raster.c
diff -N patches/patch-filter_raster.c
--- patches/patch-filter_raster.c       1 Jun 2014 06:19:02 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-filter_raster.c,v 1.1 2014/06/01 06:19:02 ryoon Exp $
-
-* OpenBSD needs stdint.h
-
---- filter/raster.c.orig       2011-09-20 18:36:33.000000000 +0000
-+++ filter/raster.c
-@@ -50,6 +50,7 @@
- #  include <io.h>
- #  include <winsock2.h>                       /* for htonl() definition */
- #else
-+#  include <stdint.h>
- #  include <unistd.h>
- #endif /* WIN32 || __EMX__ */
- 
Index: patches/patch-ppdc_Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-ppdc_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-ppdc_Makefile
--- patches/patch-ppdc_Makefile 29 Nov 2011 15:46:25 -0000      1.1
+++ patches/patch-ppdc_Makefile 4 Jun 2014 11:50:36 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ppdc_Makefile,v 1.1 2011/11/29 15:46:25 hans Exp $
 
---- ppdc/Makefile.orig 2011-01-06 23:21:05.000000000 +0100
-+++ ppdc/Makefile      2011-11-13 15:51:42.867152712 +0100
-@@ -378,7 +378,7 @@ libcupsppdc_s.a:   $(LIBOBJS) ../cups/$(LI
+--- ppdc/Makefile.orig 2013-03-11 13:57:36.000000000 +0000
++++ ppdc/Makefile
+@@ -380,7 +380,7 @@ libcupsppdc_s.a:   $(LIBOBJS) ../cups/$(LI
  libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) 
\
Index: patches/patch-scheduler_auth.c
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/patches/patch-scheduler_auth.c,v
retrieving revision 1.2
diff -u -r1.2 patch-scheduler_auth.c
--- patches/patch-scheduler_auth.c      1 Jun 2014 06:19:02 -0000       1.2
+++ patches/patch-scheduler_auth.c      4 Jun 2014 11:50:36 -0000
@@ -5,7 +5,7 @@
 
 OpenBSD defines SO_PEERCRED, but it is different from Linux's one.
 
---- scheduler/auth.c.orig      2011-08-31 04:58:33.000000000 +0000
+--- scheduler/auth.c.orig      2014-01-06 22:21:15.000000000 +0000
 +++ scheduler/auth.c
 @@ -84,7 +84,7 @@ extern const char *cssmErrorString(int e
  #ifdef HAVE_SYS_PARAM_H
@@ -16,7 +16,7 @@
  #  include <sys/ucred.h>
  typedef struct xucred cupsd_ucred_t;
  #  define CUPSD_UCRED_UID(c) (c).cr_uid
-@@ -493,7 +493,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
+@@ -500,7 +500,7 @@ cupsdAuthorize(cupsd_client_t *con)        /* I
      con->type = CUPSD_AUTH_BASIC;
    }
  #endif /* HAVE_AUTHORIZATION_H */
@@ -25,7 +25,7 @@
    else if (!strncmp(authorization, "PeerCred ", 9) &&
             con->http.hostaddr->addr.sa_family == AF_LOCAL)
    {
-@@ -1120,7 +1120,7 @@ cupsdAuthorize(cupsd_client_t *con)      /* I
+@@ -1142,7 +1142,7 @@ cupsdAuthorize(cupsd_client_t *con)      /* I
  
      gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
  
Index: patches/patch-scheduler_client.c
===================================================================
RCS file: patches/patch-scheduler_client.c
diff -N patches/patch-scheduler_client.c
--- patches/patch-scheduler_client.c    15 May 2014 12:51:58 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-scheduler_client.c,v 1.1 2014/05/15 12:51:58 wiz Exp $
-
-Fix for CVE-2014-2856 from
-http://www.cups.org/str.php?L4356
-
---- scheduler/client.c.orig    2012-03-07 06:05:39.000000000 +0000
-+++ scheduler/client.c
-@@ -4075,6 +4075,14 @@ is_path_absolute(const char *path)      /* I 
-     return (0);
- 
-  /*
-+  * Check for "<" or quotes in the path and reject since this is probably
-+  * someone trying to inject HTML...
-+  */
-+
-+  if (strchr(path, '<') != NULL || strchr(path, '\"') != NULL || strchr(path, 
'\'') != NULL)
-+    return (0);
-+
-+ /*
-   * Check for "/.." in the path...
-   */
- 
Index: patches/patch-scheduler_dirsvc.c
===================================================================
RCS file: patches/patch-scheduler_dirsvc.c
diff -N patches/patch-scheduler_dirsvc.c
--- patches/patch-scheduler_dirsvc.c    13 Oct 2011 13:05:57 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2011/10/13 13:05:57 hans Exp $
-
---- scheduler/dirsvc.c.orig    2011-01-22 01:07:22.000000000 +0100
-+++ scheduler/dirsvc.c 2011-09-20 19:08:50.512786064 +0200
-@@ -1332,7 +1332,7 @@ ldap_connect(void)
-     cupsdLogMessage(CUPSD_LOG_ERROR, "LDAP bind failed with error %d: %s",
-                     rc, ldap_err2string(rc));
- 
--#  if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP)
-+#  if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP) && !defined(__sun)
-     if (ldap_ssl && (rc == LDAP_SERVER_DOWN || rc == LDAP_CONNECT_ERROR))
-     {
-       ssl_err = PORT_GetError();

Follow-Ups:
- Re: print/cups version far behind, bad MASTER_SITES
  - From: Thomas Klausner

References:
- print/cups version far behind, bad MASTER_SITES
  - From: Thomas Mueller
- Re: print/cups version far behind, bad MASTER_SITES
  - From: Thomas Klausner
- Re: print/cups version far behind, bad MASTER_SITES
  - From: Thomas Mueller
- Re: print/cups version far behind, bad MASTER_SITES
  - From: Thomas Klausner
- Re: print/cups version far behind, bad MASTER_SITES
  - From: Leonardo Taccari

Prev by Date: Re: php 54 extensions not loading due to missing symbols
Next by Date: Re: print/cups version far behind, bad MASTER_SITES
Previous by Thread: Re: print/cups version far behind, bad MASTER_SITES
Next by Thread: Re: print/cups version far behind, bad MASTER_SITES
Indexes:

Home | Main Index | Thread Index | Old Index