pkg/49960: Update print/cups to cups-2.0.3

[Leonardo Taccari <iamleot%gmail.com@localhost>]

>Number:         49960
>Category:       pkg
>Synopsis:       Update print/cups to cups-2.0.3
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 10 13:45:00 +0000 2015
>Originator:     Leonardo Taccari
>Release:        NetBSD 7.99.18
>Organization:
Università Politecnica delle Marche
>Environment:
	
	
System: NetBSD boh 7.99.18 NetBSD 7.99.18 (GENERIC) #28: Mon Jun 8 14:11:04 CEST 2015 leot@boh:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:
	print/cups in pkgsrc (2.0.2) is not the latest stable version (2.0.3).
>How-To-Repeat:
	$ cd pkgsrc/print/cups
	$ make show-var VARNAME=DIST_VERS
>Fix:
	Please apply the attached patch. I have also updated files/cupsd.sh in
	order to reflect a change from 1.6 (from CHANGES-1.6.txt):
	> - CUPS no longer supports automatic remote printers or implicit
	>   classes via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
	Indeed previously starting cups via the rc.d complained regarding "slpd"
	daemon that usually is not available (because net/openslp is not needed
	by print/cups).
	While there I will also attach a possible commit message.


------------------8<------------------8<------------------8<------------------
Update print/cups to cups-2.0.3.

pkgsrc changes:
 - Delete "slpd" in the rc.d script. According to CHANGES-1.6.txt CUPS no longer
   support the SLP protocol.

Changes:
CHANGES IN CUPS V2.0.3
----------------------
 - Security: Fixed CERT VU #810572 exploiting the dynamic linker
   (STR #4609)
 - Security: The scheduler could hang with malformed gzip data
   (STR #4602)
 - Restored missing generic printer icon file (STR #4587)
 - Fixed logging of configuration errors to show up as errors (STR #4582)
 - Fixed potential buffer overflows in raster code and filters
   (STR #4598, STR #4599, STR #4600, STR #4601)
 - Fixed a gzip processing bug (#4602)
 - Fixed <Limit> inside <Location> (STR #4575)
 - Fixed lpadmin when both -m and -o are used (STR #4578)
 - The web interface always showed support for 2-sided printing
   (STR #4595)
 - cupsRasterReadHeader did not fully validate the raster header
   (STR #4596)
 - The rastertopwg filter did not check for truncated input (STR #4597)
 - The cups-lpd mini-daemon did not check for request parameters
   (STR #4603)
 - The scheduler could get caught in a busy loop (STR #4605)
 - The sample Epson driver could crash (STR #4616)
 - The IPP backend now correctly monitors jobs
   (<rdar://problem/20495955>)
 - The ppdhtml and ppdpo utilities crashed when the -D option was used
   before a driver information file (STR #4627)
 - ippfind incorrectly substituted "=port" for service_port.
 - The IPP/1.1 test file did not handle the initial print job
   completing early (STR #4576)
 - Fixed a memory leak in cupsConnectDest (STR #4634)
 - PWG Raster Format output contained invalid ImageBox values
   (<rdar://problem/21144309>)
 - Added Russian translation (STR #4577)
 - Added German translation (STR #4635)
------------------8<------------------8<------------------8<------------------


------------------8<------------------8<------------------8<------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/Makefile,v
retrieving revision 1.218
diff -u -r1.218 Makefile
--- Makefile	23 Apr 2015 09:29:22 -0000	1.218
+++ Makefile	10 Jun 2015 13:20:50 -0000
@@ -6,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
-BASE_VERS=	2.0.2
+BASE_VERS=	2.0.3
 DIST_VERS=	${BASE_VERS}
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${BASE_VERS}/
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/PLIST,v
retrieving revision 1.47
diff -u -r1.47 PLIST
--- PLIST	17 Feb 2015 13:53:48 -0000	1.47
+++ PLIST	10 Jun 2015 13:20:51 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2015/02/17 13:53:48 wiz Exp $
+@comment $NetBSD$
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
@@ -204,6 +204,75 @@
 share/cups/templates/classes-header.tmpl
 share/cups/templates/classes.tmpl
 share/cups/templates/command.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
+share/cups/templates/de/choose-model.tmpl
+share/cups/templates/de/choose-serial.tmpl
+share/cups/templates/de/choose-uri.tmpl
+share/cups/templates/de/class-added.tmpl
+share/cups/templates/de/class-confirm.tmpl
+share/cups/templates/de/class-deleted.tmpl
+share/cups/templates/de/class-jobs-header.tmpl
+share/cups/templates/de/class-modified.tmpl
+share/cups/templates/de/class.tmpl
+share/cups/templates/de/classes-header.tmpl
+share/cups/templates/de/classes.tmpl
+share/cups/templates/de/command.tmpl
+share/cups/templates/de/edit-config.tmpl
+share/cups/templates/de/error-op.tmpl
+share/cups/templates/de/error.tmpl
+share/cups/templates/de/header.tmpl
+share/cups/templates/de/help-header.tmpl
+share/cups/templates/de/help-printable.tmpl
+share/cups/templates/de/job-cancel.tmpl
+share/cups/templates/de/job-hold.tmpl
+share/cups/templates/de/job-move.tmpl
+share/cups/templates/de/job-moved.tmpl
+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/modify-class.tmpl
+share/cups/templates/de/modify-printer.tmpl
+share/cups/templates/de/norestart.tmpl
+share/cups/templates/de/option-boolean.tmpl
+share/cups/templates/de/option-conflict.tmpl
+share/cups/templates/de/option-header.tmpl
+share/cups/templates/de/option-pickmany.tmpl
+share/cups/templates/de/option-pickone.tmpl
+share/cups/templates/de/option-trailer.tmpl
+share/cups/templates/de/pager.tmpl
+share/cups/templates/de/printer-accept.tmpl
+share/cups/templates/de/printer-added.tmpl
+share/cups/templates/de/printer-cancel-jobs.tmpl
+share/cups/templates/de/printer-configured.tmpl
+share/cups/templates/de/printer-confirm.tmpl
+share/cups/templates/de/printer-default.tmpl
+share/cups/templates/de/printer-deleted.tmpl
+share/cups/templates/de/printer-jobs-header.tmpl
+share/cups/templates/de/printer-modified.tmpl
+share/cups/templates/de/printer-reject.tmpl
+share/cups/templates/de/printer-start.tmpl
+share/cups/templates/de/printer-stop.tmpl
+share/cups/templates/de/printer.tmpl
+share/cups/templates/de/printers-header.tmpl
+share/cups/templates/de/printers.tmpl
+share/cups/templates/de/restart.tmpl
+share/cups/templates/de/samba-export.tmpl
+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
 share/cups/templates/edit-config.tmpl
 share/cups/templates/error-op.tmpl
 share/cups/templates/error.tmpl
@@ -386,6 +455,75 @@
 share/cups/templates/printers-header.tmpl
 share/cups/templates/printers.tmpl
 share/cups/templates/restart.tmpl
+share/cups/templates/ru/add-class.tmpl
+share/cups/templates/ru/add-printer.tmpl
+share/cups/templates/ru/add-rss-subscription.tmpl
+share/cups/templates/ru/admin.tmpl
+share/cups/templates/ru/choose-device.tmpl
+share/cups/templates/ru/choose-make.tmpl
+share/cups/templates/ru/choose-model.tmpl
+share/cups/templates/ru/choose-serial.tmpl
+share/cups/templates/ru/choose-uri.tmpl
+share/cups/templates/ru/class-added.tmpl
+share/cups/templates/ru/class-confirm.tmpl
+share/cups/templates/ru/class-deleted.tmpl
+share/cups/templates/ru/class-jobs-header.tmpl
+share/cups/templates/ru/class-modified.tmpl
+share/cups/templates/ru/class.tmpl
+share/cups/templates/ru/classes-header.tmpl
+share/cups/templates/ru/classes.tmpl
+share/cups/templates/ru/command.tmpl
+share/cups/templates/ru/edit-config.tmpl
+share/cups/templates/ru/error-op.tmpl
+share/cups/templates/ru/error.tmpl
+share/cups/templates/ru/header.tmpl
+share/cups/templates/ru/help-header.tmpl
+share/cups/templates/ru/help-printable.tmpl
+share/cups/templates/ru/job-cancel.tmpl
+share/cups/templates/ru/job-hold.tmpl
+share/cups/templates/ru/job-move.tmpl
+share/cups/templates/ru/job-moved.tmpl
+share/cups/templates/ru/job-release.tmpl
+share/cups/templates/ru/job-restart.tmpl
+share/cups/templates/ru/jobs-header.tmpl
+share/cups/templates/ru/jobs.tmpl
+share/cups/templates/ru/list-available-printers.tmpl
+share/cups/templates/ru/modify-class.tmpl
+share/cups/templates/ru/modify-printer.tmpl
+share/cups/templates/ru/norestart.tmpl
+share/cups/templates/ru/option-boolean.tmpl
+share/cups/templates/ru/option-conflict.tmpl
+share/cups/templates/ru/option-header.tmpl
+share/cups/templates/ru/option-pickmany.tmpl
+share/cups/templates/ru/option-pickone.tmpl
+share/cups/templates/ru/option-trailer.tmpl
+share/cups/templates/ru/pager.tmpl
+share/cups/templates/ru/printer-accept.tmpl
+share/cups/templates/ru/printer-added.tmpl
+share/cups/templates/ru/printer-cancel-jobs.tmpl
+share/cups/templates/ru/printer-configured.tmpl
+share/cups/templates/ru/printer-confirm.tmpl
+share/cups/templates/ru/printer-default.tmpl
+share/cups/templates/ru/printer-deleted.tmpl
+share/cups/templates/ru/printer-jobs-header.tmpl
+share/cups/templates/ru/printer-modified.tmpl
+share/cups/templates/ru/printer-reject.tmpl
+share/cups/templates/ru/printer-start.tmpl
+share/cups/templates/ru/printer-stop.tmpl
+share/cups/templates/ru/printer.tmpl
+share/cups/templates/ru/printers-header.tmpl
+share/cups/templates/ru/printers.tmpl
+share/cups/templates/ru/restart.tmpl
+share/cups/templates/ru/samba-export.tmpl
+share/cups/templates/ru/samba-exported.tmpl
+share/cups/templates/ru/search.tmpl
+share/cups/templates/ru/set-printer-options-header.tmpl
+share/cups/templates/ru/set-printer-options-trailer.tmpl
+share/cups/templates/ru/subscription-added.tmpl
+share/cups/templates/ru/subscription-canceled.tmpl
+share/cups/templates/ru/test-page.tmpl
+share/cups/templates/ru/trailer.tmpl
+share/cups/templates/ru/users.tmpl
 share/cups/templates/samba-export.tmpl
 share/cups/templates/samba-exported.tmpl
 share/cups/templates/search.tmpl
@@ -402,6 +540,7 @@
 share/doc/cups/apple-touch-icon.png
 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/help/accounting.html
 share/doc/cups/help/api-array.html
@@ -489,6 +628,7 @@
 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
@@ -501,19 +641,16 @@
 share/doc/cups/index.html
 share/doc/cups/ja/index.html
 share/doc/cups/robots.txt
+share/doc/cups/ru/index.html
 share/examples/cups/cups-files.conf
 share/examples/cups/cupsd.conf
 ${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/snmp.conf
 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/fr/cups_fr.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
 share/locale/ru/cups_ru.po
-@pkgdir share/cups/profiles
-@pkgdir share/cups/model
-@pkgdir share/cups/data
-@pkgdir share/cups/banners
-@pkgdir etc/cups
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/distinfo,v
retrieving revision 1.109
diff -u -r1.109 distinfo
--- distinfo	17 Feb 2015 13:53:48 -0000	1.109
+++ distinfo	10 Jun 2015 13:20:51 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.109 2015/02/17 13:53:48 wiz Exp $
 
-SHA1 (cups-2.0.2-source.tar.bz2) = e42586e4d46e47b85f5f5ba1d3403ecf255d03a1
-RMD160 (cups-2.0.2-source.tar.bz2) = 46f7ce1c31e5d34eff1f5972fd358422b2c09001
-Size (cups-2.0.2-source.tar.bz2) = 8766982 bytes
+SHA1 (cups-2.0.3-source.tar.bz2) = 3de556237dcb7c9f3df0eb853a53cb93e1879a8f
+RMD160 (cups-2.0.3-source.tar.bz2) = 0885debd2440e96aa5b5d7a6433dc85ffb45fe2f
+Size (cups-2.0.3-source.tar.bz2) = 8797220 bytes
 SHA1 (patch-ae) = e8f4bbbbbe43cd5f6f9236e10d7241caeaedc3a3
 SHA1 (patch-af) = 1bac8b3ae3c44034be6fa6d2878f10d7f89cd1ce
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
Index: files/cupsd.sh
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/files/cupsd.sh,v
retrieving revision 1.19
diff -u -r1.19 cupsd.sh
--- files/cupsd.sh	6 Jan 2005 07:26:39 -0000	1.19
+++ files/cupsd.sh	10 Jun 2015 13:20:51 -0000
@@ -5,7 +5,7 @@
 # Common UNIX Printing System daemon
 #
 # PROVIDE: cupsd
-# REQUIRE: DAEMON slpd
+# REQUIRE: DAEMON
 #
 # You will need to set some variables in /etc/rc.conf to start cupsd:
 #

>Unformatted: