Sun Nov 17 21:22:03 2019 UTC ()
cups{,-base}: Update to 2.3.0

Changes:
2.3.0
-----
 - CVE-2019-8696 and CVE-2019-8675: Fixed SNMP buffer overflows
   (rdar://51685251)
 - Added a GPL2/LGPL2 exception to the new CUPS license terms.
 - Documentation updates (Issue #5604)
 - Localization updates (Issue #5637)
 - Fixed a bug in the scheduler job cleanup code (Issue #5588)
 - Fixed builds when there is no TLS library (Issue #5590)
 - Eliminated some new GCC compiler warnings (Issue #5591)
 - Removed dead code from the scheduler (Issue #5593)
 - "make" failed with GZIP options (Issue #5595)
 - Fixed potential excess logging from the scheduler when removing job files
   (Issue #5597)
 - Fixed a NULL pointer dereference bug in `httpGetSubField2` (Issue #5598)
 - Added FIPS-140 workarounds for GNU TLS (Issue #5601, Issue #5622)
 - The scheduler no longer provides a default value for the description
   (Issue #5603)
 - The scheduler now logs jobs held for authentication using the error level so
   it is clear what happened (Issue #5604)
 - The `lpadmin` command did not always update the PPD file for changes to the
   `cupsIPPSupplies` and `cupsSNMPSupplies` keywords (Issue #5610)
 - The scheduler now uses both the group's membership list as well as the
   various OS-specific membership functions to determine whether a user belongs
   to a named group (Issue #5613)
 - Added USB quirks rule for HP LaserJet 1015 (Issue #5617)
 - Fixed some PPD parser issues (Issue #5623, Issue #5624)
 - The IPP parser no longer allows invalid member attributes in collections
   (Issue #5630)
 - The configure script now treats the "wheel" group as a potential system
   group (Issue #5638)
 - Fixed a USB printing issue on macOS (rdar://31433931)
 - Fixed IPP buffer overflow (rdar://50035411)
 - Fixed memory disclosure issue in the scheduler (rdar://51373853)
 - Fixed DoS issues in the scheduler (rdar://51373929)
 - Fixed an issue with unsupported "sides" values in the IPP backend
   (rdar://51775322)
 - The scheduler would restart continuously when idle and printers were not
   shared (rdar://52561199)
 - Fixed an issue with `EXPECT !name WITH-VALUE ...` tests.
 - Fixed a command ordering issue in the Zebra ZPL driver.
 - Fixed a memory leak in `ppdOpen`.


(leot)
diff -r1.8 -r1.9 pkgsrc/print/cups/Makefile.common
diff -r1.25 -r1.26 pkgsrc/print/cups-base/Makefile
diff -r1.3 -r1.4 pkgsrc/print/cups-base/PLIST
diff -r1.15 -r1.16 pkgsrc/print/cups-base/distinfo
diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-airprint-scheduler_conf.c
diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-airprint-scheduler_printers.c
diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-scheduler-conf.c
diff -r1.1 -r0 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-manpages.m4
diff -r1.2 -r0 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-opsys.m4
diff -r1.2 -r0 pkgsrc/print/cups-base/patches/patch-test_ippfind.c
diff -r1.2 -r1.3 pkgsrc/print/cups-base/patches/patch-man-cups-files.conf.man.in
cvs diff -r1.8 -r1.9 pkgsrc/print/cups/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile.common 2019/08/16 21:19:30 1.8
+++ pkgsrc/print/cups/Makefile.common 2019/11/17 21:22:03 1.9
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1# $NetBSD: Makefile.common,v 1.8 2019/08/16 21:19:30 leot Exp $ 1# $NetBSD: Makefile.common,v 1.9 2019/11/17 21:22:03 leot Exp $
2# 2#
3# used by print/cups/Makefile 3# used by print/cups/Makefile
4# used by print/cups-base/Makefile 4# used by print/cups-base/Makefile
5 5
6CUPS_VERS= 2.2.12 6CUPS_VERS= 2.3.0
7DISTNAME= cups-${CUPS_VERS}-source 7DISTNAME= cups-${CUPS_VERS}-source
8CATEGORIES= print 8CATEGORIES= print
9 9
10HOMEPAGE= https://www.cups.org/ 10HOMEPAGE= https://www.cups.org/
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
cvs diff -r1.25 -r1.26 pkgsrc/print/cups-base/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-base/Makefile 2019/08/26 21:57:43 1.25
+++ pkgsrc/print/cups-base/Makefile 2019/11/17 21:22:03 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2019/08/26 21:57:43 rillig Exp $ 1# $NetBSD: Makefile,v 1.26 2019/11/17 21:22:03 leot Exp $
2 2
3.include "../../print/cups/Makefile.common" 3.include "../../print/cups/Makefile.common"
4 4
5DISTNAME= cups-${CUPS_VERS}-source 5DISTNAME= cups-${CUPS_VERS}-source
6PKGNAME= cups-base-${CUPS_VERS} 6PKGNAME= cups-base-${CUPS_VERS}
7CATEGORIES= print 7CATEGORIES= print
8MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
9 9
10MAINTAINER= sbd@NetBSD.org 10MAINTAINER= sbd@NetBSD.org
11HOMEPAGE= https://www.cups.org/ 11HOMEPAGE= https://www.cups.org/
12COMMENT= Common UNIX Printing System 12COMMENT= Common UNIX Printing System
13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
14 14
@@ -26,27 +26,26 @@ USE_TOOLS+= aclocal autoconf automake g @@ -26,27 +26,26 @@ USE_TOOLS+= aclocal autoconf automake g
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 27CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
29CONFIGURE_ARGS+= --localstatedir=${VARBASE} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE}
30CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q} 30CONFIGURE_ARGS+= --with-cachedir=${CUPS_CACHE:Q}
31CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups 31CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups
32CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups 32CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups
33CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} 33CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER}
34CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} 34CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP}
35CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} 35CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q}
36CONFIGURE_ARGS+= --with-exe-file-perm=0755 36CONFIGURE_ARGS+= --with-exe-file-perm=0755
37CONFIGURE_ARGS+= --enable-libpaper 37CONFIGURE_ARGS+= --enable-libpaper
38CONFIGURE_ARGS+= --enable-ssl 38CONFIGURE_ARGS+= --enable-ssl
39CONFIGURE_ARGS+= --with-manext=bsd 
40CONFIGURE_ARGS+= --without-bundledir 39CONFIGURE_ARGS+= --without-bundledir
41CONFIGURE_ARGS+= --without-icondir 40CONFIGURE_ARGS+= --without-icondir
42CONFIGURE_ARGS+= --without-menudir 41CONFIGURE_ARGS+= --without-menudir
43CONFIGURE_ARGS+= --without-perl 42CONFIGURE_ARGS+= --without-perl
44CONFIGURE_ARGS+= --without-php 43CONFIGURE_ARGS+= --without-php
45CONFIGURE_ARGS+= --without-python 44CONFIGURE_ARGS+= --without-python
46CONFIGURE_ARGS+= --without-java 45CONFIGURE_ARGS+= --without-java
47CONFIGURE_ARGS+= --disable-gssapi 46CONFIGURE_ARGS+= --disable-gssapi
48 47
49CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 48CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
50 49
51.include "../../mk/bsd.prefs.mk" 50.include "../../mk/bsd.prefs.mk"
52.include "options.mk" 51.include "options.mk"
@@ -120,40 +119,39 @@ SUBST_FILES.rpathfix= cups-config.in @@ -120,40 +119,39 @@ SUBST_FILES.rpathfix= cups-config.in
120SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. 119SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
121SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' 120SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
122SUBST_STAGE.rpathfix= pre-configure 121SUBST_STAGE.rpathfix= pre-configure
123 122
124.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc) 123.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
125SUBST_CLASSES+= piefix 124SUBST_CLASSES+= piefix
126SUBST_FILES.piefix= Makedefs.in 125SUBST_FILES.piefix= Makedefs.in
127SUBST_MESSAGE.piefix= Removing PIE flags 126SUBST_MESSAGE.piefix= Removing PIE flags
128SUBST_SED.piefix= -e 's|@PIEFLAGS@||g' 127SUBST_SED.piefix= -e 's|@PIEFLAGS@||g'
129SUBST_STAGE.piefix= pre-configure 128SUBST_STAGE.piefix= pre-configure
130.endif 129.endif
131 130
132INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} 131INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
133INSTALL_ENV+= DSTROOT=${DESTDIR} 
134 132
135pre-configure: 133pre-configure:
136.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) 134.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP})
137 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" 135 ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP"
138 exit 1 136 exit 1
139.endif 137.endif
140 cd ${WRKSRC} && aclocal && autoconf 138 cd ${WRKSRC} && aclocal && autoconf
141 139
142post-extract: 140post-extract:
143 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam 141 ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
144 142
145post-install: 143post-install:
146 set -e; for file in LICENSE.txt README.md; do \ 144 set -e; for file in LICENSE README.md; do \
147 ${INSTALL_DATA} ${WRKSRC}/$${file} \ 145 ${INSTALL_DATA} ${WRKSRC}/$${file} \
148 ${DESTDIR}${DOCDIR}/$${file}; \ 146 ${DESTDIR}${DOCDIR}/$${file}; \
149 done 147 done
150 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \ 148 ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \
151 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ 149 ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \
152 ${DESTDIR}${EGDIR}/$${file}; \ 150 ${DESTDIR}${EGDIR}/$${file}; \
153 done 151 done
154 ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin 152 ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin
155.if !empty(PKG_OPTIONS:Mpam) 153.if !empty(PKG_OPTIONS:Mpam)
156 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} 154 ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
157.endif 155.endif
158.if !empty(PKG_OPTIONS:Mdnssd) 156.if !empty(PKG_OPTIONS:Mdnssd)
159 ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns 157 ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns
cvs diff -r1.3 -r1.4 pkgsrc/print/cups-base/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups-base/PLIST 2018/11/10 19:51:12 1.3
+++ pkgsrc/print/cups-base/PLIST 2019/11/17 21:22:03 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.3 2018/11/10 19:51:12 leot Exp $ 1@comment $NetBSD: PLIST,v 1.4 2019/11/17 21:22:03 leot Exp $
2bin/cancel 2bin/cancel
3bin/cups-config 3bin/cups-config
4bin/cupstestdsc 
5bin/cupstestppd 4bin/cupstestppd
 5bin/ippeveprinter
6${PLIST.ippfind}bin/ippfind 6${PLIST.ippfind}bin/ippfind
7bin/ipptool 7bin/ipptool
8bin/lp 8bin/lp
9bin/lpoptions 9bin/lpoptions
10bin/lpq 10bin/lpq
11bin/lpr 11bin/lpr
12bin/lprm 12bin/lprm
13bin/lpstat 13bin/lpstat
14bin/ppdc 14bin/ppdc
15bin/ppdhtml 15bin/ppdhtml
16bin/ppdi 16bin/ppdi
17bin/ppdmerge 17bin/ppdmerge
18bin/ppdpo 18bin/ppdpo
@@ -42,48 +42,49 @@ libexec/cups/backend/http @@ -42,48 +42,49 @@ libexec/cups/backend/http
42libexec/cups/backend/https 42libexec/cups/backend/https
43libexec/cups/backend/ipp 43libexec/cups/backend/ipp
44libexec/cups/backend/ipps 44libexec/cups/backend/ipps
45libexec/cups/backend/lpd 45libexec/cups/backend/lpd
46${PLIST.dnssd}libexec/cups/backend/mdns 46${PLIST.dnssd}libexec/cups/backend/mdns
47libexec/cups/backend/snmp 47libexec/cups/backend/snmp
48libexec/cups/backend/socket 48libexec/cups/backend/socket
49libexec/cups/backend/usb 49libexec/cups/backend/usb
50libexec/cups/cgi-bin/admin.cgi 50libexec/cups/cgi-bin/admin.cgi
51libexec/cups/cgi-bin/classes.cgi 51libexec/cups/cgi-bin/classes.cgi
52libexec/cups/cgi-bin/help.cgi 52libexec/cups/cgi-bin/help.cgi
53libexec/cups/cgi-bin/jobs.cgi 53libexec/cups/cgi-bin/jobs.cgi
54libexec/cups/cgi-bin/printers.cgi 54libexec/cups/cgi-bin/printers.cgi
 55libexec/cups/command/ippevepcl
 56libexec/cups/command/ippeveps
55libexec/cups/daemon/cups-deviced 57libexec/cups/daemon/cups-deviced
56libexec/cups/daemon/cups-driverd 58libexec/cups/daemon/cups-driverd
57libexec/cups/daemon/cups-exec 59libexec/cups/daemon/cups-exec
58libexec/cups/daemon/cups-lpd 60libexec/cups/daemon/cups-lpd
59libexec/cups/filter/commandtops 61libexec/cups/filter/commandtops
60libexec/cups/filter/gziptoany 62libexec/cups/filter/gziptoany
61libexec/cups/filter/pstops 63libexec/cups/filter/pstops
62libexec/cups/filter/rastertodymo 
63libexec/cups/filter/rastertoepson 64libexec/cups/filter/rastertoepson
64libexec/cups/filter/rastertohp 65libexec/cups/filter/rastertohp
65libexec/cups/filter/rastertolabel 66libexec/cups/filter/rastertolabel
66libexec/cups/filter/rastertopwg 67libexec/cups/filter/rastertopwg
67libexec/cups/monitor/bcp 68libexec/cups/monitor/bcp
68libexec/cups/monitor/tbcp 69libexec/cups/monitor/tbcp
69${PLIST.dbus}libexec/cups/notifier/dbus 70${PLIST.dbus}libexec/cups/notifier/dbus
70libexec/cups/notifier/mailto 71libexec/cups/notifier/mailto
71libexec/cups/notifier/rss 72libexec/cups/notifier/rss
72man/man1/cancel.1 73man/man1/cancel.1
73man/man1/cups-config.1 74man/man1/cups-config.1
74man/man1/cups.1 75man/man1/cups.1
75man/man1/cupstestdsc.1 
76man/man1/cupstestppd.1 76man/man1/cupstestppd.1
 77man/man1/ippeveprinter.1
77${PLIST.ippfind}man/man1/ippfind.1 78${PLIST.ippfind}man/man1/ippfind.1
78man/man1/ipptool.1 79man/man1/ipptool.1
79man/man1/lp.1 80man/man1/lp.1
80man/man1/lpoptions.1 81man/man1/lpoptions.1
81man/man1/lpq.1 82man/man1/lpq.1
82man/man1/lpr.1 83man/man1/lpr.1
83man/man1/lprm.1 84man/man1/lprm.1
84man/man1/lpstat.1 85man/man1/lpstat.1
85man/man1/ppdc.1 86man/man1/ppdc.1
86man/man1/ppdhtml.1 87man/man1/ppdhtml.1
87man/man1/ppdi.1 88man/man1/ppdi.1
88man/man1/ppdmerge.1 89man/man1/ppdmerge.1
89man/man1/ppdpo.1 90man/man1/ppdpo.1
@@ -92,132 +93,162 @@ man/man5/client.conf.5 @@ -92,132 +93,162 @@ man/man5/client.conf.5
92man/man5/cups-files.conf.5 93man/man5/cups-files.conf.5
93man/man5/cups-snmp.conf.5 94man/man5/cups-snmp.conf.5
94man/man5/cupsd-logs.5 95man/man5/cupsd-logs.5
95man/man5/cupsd.conf.5 96man/man5/cupsd.conf.5
96man/man5/ipptoolfile.5 97man/man5/ipptoolfile.5
97man/man5/mailto.conf.5 98man/man5/mailto.conf.5
98man/man5/mime.convs.5 99man/man5/mime.convs.5
99man/man5/mime.types.5 100man/man5/mime.types.5
100man/man5/ppdcfile.5 101man/man5/ppdcfile.5
101man/man5/printers.conf.5 102man/man5/printers.conf.5
102man/man5/subscriptions.conf.5 103man/man5/subscriptions.conf.5
103man/man7/backend.7 104man/man7/backend.7
104man/man7/filter.7 105man/man7/filter.7
 106man/man7/ippevepcl.7
 107man/man7/ippeveps.7
105man/man7/notifier.7 108man/man7/notifier.7
106man/man8/accept.8 
107man/man8/cups-deviced.8 109man/man8/cups-deviced.8
108man/man8/cups-driverd.8 110man/man8/cups-driverd.8
109man/man8/cups-exec.8 111man/man8/cups-exec.8
110man/man8/cups-lpd.8 112man/man8/cups-lpd.8
111man/man8/cups-snmp.8 113man/man8/cups-snmp.8
112man/man8/cupsaccept.8 114man/man8/cupsaccept.8
113man/man8/cupsaddsmb.8 
114man/man8/cupsctl.8 115man/man8/cupsctl.8
115man/man8/cupsd-helper.8 116man/man8/cupsd-helper.8
116man/man8/cupsd.8 117man/man8/cupsd.8
117man/man8/cupsdisable.8 118man/man8/cupsdisable.8
118man/man8/cupsenable.8 119man/man8/cupsenable.8
119man/man8/cupsfilter.8 120man/man8/cupsfilter.8
120man/man8/cupsreject.8 121man/man8/cupsreject.8
121man/man8/lpadmin.8 122man/man8/lpadmin.8
122man/man8/lpc.8 123man/man8/lpc.8
123man/man8/lpinfo.8 124man/man8/lpinfo.8
124man/man8/lpmove.8 125man/man8/lpmove.8
125man/man8/reject.8 
126sbin/accept 
127sbin/cupsaccept 126sbin/cupsaccept
128sbin/cupsaddsmb 
129sbin/cupsctl 127sbin/cupsctl
130sbin/cupsd 128sbin/cupsd
131sbin/cupsdisable 129sbin/cupsdisable
132sbin/cupsenable 130sbin/cupsenable
133sbin/cupsfilter 131sbin/cupsfilter
134sbin/cupsreject 132sbin/cupsreject
135sbin/lpadmin 133sbin/lpadmin
136sbin/lpc 134sbin/lpc
137sbin/lpinfo 135sbin/lpinfo
138sbin/lpmove 136sbin/lpmove
139sbin/reject 
140share/cups/drv/sample.drv 137share/cups/drv/sample.drv
141share/cups/examples/color.drv 138share/cups/examples/color.drv
142share/cups/examples/constraint.drv 139share/cups/examples/constraint.drv
143share/cups/examples/custom.drv 140share/cups/examples/custom.drv
144share/cups/examples/grouping.drv 141share/cups/examples/grouping.drv
145share/cups/examples/laserjet-basic.drv 142share/cups/examples/laserjet-basic.drv
146share/cups/examples/laserjet-pjl.drv 143share/cups/examples/laserjet-pjl.drv
147share/cups/examples/minimum.drv 144share/cups/examples/minimum.drv
148share/cups/examples/postscript.drv 145share/cups/examples/postscript.drv
149share/cups/examples/r300-basic.drv 146share/cups/examples/r300-basic.drv
150share/cups/examples/r300-colorman.drv 147share/cups/examples/r300-colorman.drv
151share/cups/examples/r300-remote.drv 148share/cups/examples/r300-remote.drv
 149share/cups/ipptool/cancel-current-job.test
152share/cups/ipptool/color.jpg 150share/cups/ipptool/color.jpg
 151share/cups/ipptool/create-job-format.test
 152share/cups/ipptool/create-job-sheets.test
 153share/cups/ipptool/create-job-timeout.test
 154share/cups/ipptool/create-job.test
153share/cups/ipptool/create-printer-subscription.test 155share/cups/ipptool/create-printer-subscription.test
 156share/cups/ipptool/cups-create-local-printer.test
154share/cups/ipptool/document-a4.pdf 157share/cups/ipptool/document-a4.pdf
155share/cups/ipptool/document-a4.ps 158share/cups/ipptool/document-a4.ps
156share/cups/ipptool/document-letter.pdf 159share/cups/ipptool/document-letter.pdf
157share/cups/ipptool/document-letter.ps 160share/cups/ipptool/document-letter.ps
 161share/cups/ipptool/fax-job.test
158share/cups/ipptool/get-completed-jobs.test 162share/cups/ipptool/get-completed-jobs.test
 163share/cups/ipptool/get-devices.test
 164share/cups/ipptool/get-job-attributes.test
 165share/cups/ipptool/get-job-attributes2.test
 166share/cups/ipptool/get-job-template-attributes.test
159share/cups/ipptool/get-jobs.test 167share/cups/ipptool/get-jobs.test
160share/cups/ipptool/get-notifications.test 168share/cups/ipptool/get-notifications.test
 169share/cups/ipptool/get-ppd-printer.test
 170share/cups/ipptool/get-ppd.test
 171share/cups/ipptool/get-ppds-drv-only.test
 172share/cups/ipptool/get-ppds-language.test
 173share/cups/ipptool/get-ppds-make-and-model.test
 174share/cups/ipptool/get-ppds-make.test
 175share/cups/ipptool/get-ppds-product.test
 176share/cups/ipptool/get-ppds-psversion.test
 177share/cups/ipptool/get-ppds.test
 178share/cups/ipptool/get-printer-attributes-suite.test
161share/cups/ipptool/get-printer-attributes.test 179share/cups/ipptool/get-printer-attributes.test
 180share/cups/ipptool/get-printer-description-attributes.test
 181share/cups/ipptool/get-printers-printer-id.test
 182share/cups/ipptool/get-printers.test
162share/cups/ipptool/get-subscriptions.test 183share/cups/ipptool/get-subscriptions.test
163share/cups/ipptool/gray.jpg 184share/cups/ipptool/gray.jpg
 185share/cups/ipptool/identify-printer-display.test
 186share/cups/ipptool/identify-printer-multiple.test
 187share/cups/ipptool/identify-printer.test
164share/cups/ipptool/ipp-1.1.test 188share/cups/ipptool/ipp-1.1.test
165share/cups/ipptool/ipp-2.0.test 189share/cups/ipptool/ipp-2.0.test
166share/cups/ipptool/ipp-2.1.test 190share/cups/ipptool/ipp-2.1.test
167share/cups/ipptool/ipp-2.2.test 191share/cups/ipptool/ipp-2.2.test
 192share/cups/ipptool/ipp-backend.test
168share/cups/ipptool/ipp-everywhere.test 193share/cups/ipptool/ipp-everywhere.test
169share/cups/ipptool/onepage-a4.pdf 194share/cups/ipptool/onepage-a4.pdf
170share/cups/ipptool/onepage-a4.ps 195share/cups/ipptool/onepage-a4.ps
171share/cups/ipptool/onepage-letter.pdf 196share/cups/ipptool/onepage-letter.pdf
172share/cups/ipptool/onepage-letter.ps 197share/cups/ipptool/onepage-letter.ps
 198share/cups/ipptool/print-job-and-wait.test
173share/cups/ipptool/print-job-deflate.test 199share/cups/ipptool/print-job-deflate.test
174share/cups/ipptool/print-job-gzip.test 200share/cups/ipptool/print-job-gzip.test
 201share/cups/ipptool/print-job-hold.test
 202share/cups/ipptool/print-job-letter.test
 203share/cups/ipptool/print-job-manual.test
 204share/cups/ipptool/print-job-media-col.test
 205share/cups/ipptool/print-job-password.test
175share/cups/ipptool/print-job.test 206share/cups/ipptool/print-job.test
 207share/cups/ipptool/print-uri.test
 208share/cups/ipptool/set-attrs-hold.test
176share/cups/ipptool/testfile.jpg 209share/cups/ipptool/testfile.jpg
177share/cups/ipptool/testfile.pcl 210share/cups/ipptool/testfile.pcl
178share/cups/ipptool/testfile.pdf 211share/cups/ipptool/testfile.pdf
179share/cups/ipptool/testfile.ps 212share/cups/ipptool/testfile.ps
180share/cups/ipptool/testfile.txt 213share/cups/ipptool/testfile.txt
181share/cups/ipptool/validate-job.test 214share/cups/ipptool/validate-job.test
182share/cups/mime/mime.convs 215share/cups/mime/mime.convs
183share/cups/mime/mime.types 216share/cups/mime/mime.types
184share/cups/ppdc/epson.h 217share/cups/ppdc/epson.h
185share/cups/ppdc/font.defs 218share/cups/ppdc/font.defs
186share/cups/ppdc/hp.h 219share/cups/ppdc/hp.h
187share/cups/ppdc/label.h 220share/cups/ppdc/label.h
188share/cups/ppdc/media.defs 221share/cups/ppdc/media.defs
189share/cups/ppdc/raster.defs 222share/cups/ppdc/raster.defs
190share/cups/templates/add-class.tmpl 223share/cups/templates/add-class.tmpl
191share/cups/templates/add-printer.tmpl 224share/cups/templates/add-printer.tmpl
192share/cups/templates/add-rss-subscription.tmpl 
193share/cups/templates/admin.tmpl 225share/cups/templates/admin.tmpl
194share/cups/templates/choose-device.tmpl 226share/cups/templates/choose-device.tmpl
195share/cups/templates/choose-make.tmpl 227share/cups/templates/choose-make.tmpl
196share/cups/templates/choose-model.tmpl 228share/cups/templates/choose-model.tmpl
197share/cups/templates/choose-serial.tmpl 229share/cups/templates/choose-serial.tmpl
198share/cups/templates/choose-uri.tmpl 230share/cups/templates/choose-uri.tmpl
199share/cups/templates/class-added.tmpl 231share/cups/templates/class-added.tmpl
200share/cups/templates/class-confirm.tmpl 232share/cups/templates/class-confirm.tmpl
201share/cups/templates/class-deleted.tmpl 233share/cups/templates/class-deleted.tmpl
202share/cups/templates/class-jobs-header.tmpl 234share/cups/templates/class-jobs-header.tmpl
203share/cups/templates/class-modified.tmpl 235share/cups/templates/class-modified.tmpl
204share/cups/templates/class.tmpl 236share/cups/templates/class.tmpl
205share/cups/templates/classes-header.tmpl 237share/cups/templates/classes-header.tmpl
206share/cups/templates/classes.tmpl 238share/cups/templates/classes.tmpl
207share/cups/templates/command.tmpl 239share/cups/templates/command.tmpl
208share/cups/templates/de/add-class.tmpl 240share/cups/templates/de/add-class.tmpl
209share/cups/templates/de/add-printer.tmpl 241share/cups/templates/de/add-printer.tmpl
210share/cups/templates/de/add-rss-subscription.tmpl 
211share/cups/templates/de/admin.tmpl 242share/cups/templates/de/admin.tmpl
212share/cups/templates/de/choose-device.tmpl 243share/cups/templates/de/choose-device.tmpl
213share/cups/templates/de/choose-make.tmpl 244share/cups/templates/de/choose-make.tmpl
214share/cups/templates/de/choose-model.tmpl 245share/cups/templates/de/choose-model.tmpl
215share/cups/templates/de/choose-serial.tmpl 246share/cups/templates/de/choose-serial.tmpl
216share/cups/templates/de/choose-uri.tmpl 247share/cups/templates/de/choose-uri.tmpl
217share/cups/templates/de/class-added.tmpl 248share/cups/templates/de/class-added.tmpl
218share/cups/templates/de/class-confirm.tmpl 249share/cups/templates/de/class-confirm.tmpl
219share/cups/templates/de/class-deleted.tmpl 250share/cups/templates/de/class-deleted.tmpl
220share/cups/templates/de/class-jobs-header.tmpl 251share/cups/templates/de/class-jobs-header.tmpl
221share/cups/templates/de/class-modified.tmpl 252share/cups/templates/de/class-modified.tmpl
222share/cups/templates/de/class.tmpl 253share/cups/templates/de/class.tmpl
223share/cups/templates/de/classes-header.tmpl 254share/cups/templates/de/classes-header.tmpl
@@ -255,42 +286,37 @@ share/cups/templates/de/printer-cancel-j @@ -255,42 +286,37 @@ share/cups/templates/de/printer-cancel-j
255share/cups/templates/de/printer-configured.tmpl 286share/cups/templates/de/printer-configured.tmpl
256share/cups/templates/de/printer-confirm.tmpl 287share/cups/templates/de/printer-confirm.tmpl
257share/cups/templates/de/printer-default.tmpl 288share/cups/templates/de/printer-default.tmpl
258share/cups/templates/de/printer-deleted.tmpl 289share/cups/templates/de/printer-deleted.tmpl
259share/cups/templates/de/printer-jobs-header.tmpl 290share/cups/templates/de/printer-jobs-header.tmpl
260share/cups/templates/de/printer-modified.tmpl 291share/cups/templates/de/printer-modified.tmpl
261share/cups/templates/de/printer-reject.tmpl 292share/cups/templates/de/printer-reject.tmpl
262share/cups/templates/de/printer-start.tmpl 293share/cups/templates/de/printer-start.tmpl
263share/cups/templates/de/printer-stop.tmpl 294share/cups/templates/de/printer-stop.tmpl
264share/cups/templates/de/printer.tmpl 295share/cups/templates/de/printer.tmpl
265share/cups/templates/de/printers-header.tmpl 296share/cups/templates/de/printers-header.tmpl
266share/cups/templates/de/printers.tmpl 297share/cups/templates/de/printers.tmpl
267share/cups/templates/de/restart.tmpl 298share/cups/templates/de/restart.tmpl
268share/cups/templates/de/samba-export.tmpl 
269share/cups/templates/de/samba-exported.tmpl 
270share/cups/templates/de/search.tmpl 299share/cups/templates/de/search.tmpl
271share/cups/templates/de/set-printer-options-header.tmpl 300share/cups/templates/de/set-printer-options-header.tmpl
272share/cups/templates/de/set-printer-options-trailer.tmpl 301share/cups/templates/de/set-printer-options-trailer.tmpl
273share/cups/templates/de/subscription-added.tmpl 
274share/cups/templates/de/subscription-canceled.tmpl 
275share/cups/templates/de/test-page.tmpl 302share/cups/templates/de/test-page.tmpl
276share/cups/templates/de/trailer.tmpl 303share/cups/templates/de/trailer.tmpl
277share/cups/templates/de/users.tmpl 304share/cups/templates/de/users.tmpl
278share/cups/templates/edit-config.tmpl 305share/cups/templates/edit-config.tmpl
279share/cups/templates/error-op.tmpl 306share/cups/templates/error-op.tmpl
280share/cups/templates/error.tmpl 307share/cups/templates/error.tmpl
281share/cups/templates/es/add-class.tmpl 308share/cups/templates/es/add-class.tmpl
282share/cups/templates/es/add-printer.tmpl 309share/cups/templates/es/add-printer.tmpl
283share/cups/templates/es/add-rss-subscription.tmpl 
284share/cups/templates/es/admin.tmpl 310share/cups/templates/es/admin.tmpl
285share/cups/templates/es/choose-device.tmpl 311share/cups/templates/es/choose-device.tmpl
286share/cups/templates/es/choose-make.tmpl 312share/cups/templates/es/choose-make.tmpl
287share/cups/templates/es/choose-model.tmpl 313share/cups/templates/es/choose-model.tmpl
288share/cups/templates/es/choose-serial.tmpl 314share/cups/templates/es/choose-serial.tmpl
289share/cups/templates/es/choose-uri.tmpl 315share/cups/templates/es/choose-uri.tmpl
290share/cups/templates/es/class-added.tmpl 316share/cups/templates/es/class-added.tmpl
291share/cups/templates/es/class-confirm.tmpl 317share/cups/templates/es/class-confirm.tmpl
292share/cups/templates/es/class-deleted.tmpl 318share/cups/templates/es/class-deleted.tmpl
293share/cups/templates/es/class-jobs-header.tmpl 319share/cups/templates/es/class-jobs-header.tmpl
294share/cups/templates/es/class-modified.tmpl 320share/cups/templates/es/class-modified.tmpl
295share/cups/templates/es/class.tmpl 321share/cups/templates/es/class.tmpl
296share/cups/templates/es/classes-header.tmpl 322share/cups/templates/es/classes-header.tmpl
@@ -328,39 +354,34 @@ share/cups/templates/es/printer-cancel-j @@ -328,39 +354,34 @@ share/cups/templates/es/printer-cancel-j
328share/cups/templates/es/printer-configured.tmpl 354share/cups/templates/es/printer-configured.tmpl
329share/cups/templates/es/printer-confirm.tmpl 355share/cups/templates/es/printer-confirm.tmpl
330share/cups/templates/es/printer-default.tmpl 356share/cups/templates/es/printer-default.tmpl
331share/cups/templates/es/printer-deleted.tmpl 357share/cups/templates/es/printer-deleted.tmpl
332share/cups/templates/es/printer-jobs-header.tmpl 358share/cups/templates/es/printer-jobs-header.tmpl
333share/cups/templates/es/printer-modified.tmpl 359share/cups/templates/es/printer-modified.tmpl
334share/cups/templates/es/printer-reject.tmpl 360share/cups/templates/es/printer-reject.tmpl
335share/cups/templates/es/printer-start.tmpl 361share/cups/templates/es/printer-start.tmpl
336share/cups/templates/es/printer-stop.tmpl 362share/cups/templates/es/printer-stop.tmpl
337share/cups/templates/es/printer.tmpl 363share/cups/templates/es/printer.tmpl
338share/cups/templates/es/printers-header.tmpl 364share/cups/templates/es/printers-header.tmpl
339share/cups/templates/es/printers.tmpl 365share/cups/templates/es/printers.tmpl
340share/cups/templates/es/restart.tmpl 366share/cups/templates/es/restart.tmpl
341share/cups/templates/es/samba-export.tmpl 
342share/cups/templates/es/samba-exported.tmpl 
343share/cups/templates/es/search.tmpl 367share/cups/templates/es/search.tmpl
344share/cups/templates/es/set-printer-options-header.tmpl 368share/cups/templates/es/set-printer-options-header.tmpl
345share/cups/templates/es/set-printer-options-trailer.tmpl 369share/cups/templates/es/set-printer-options-trailer.tmpl
346share/cups/templates/es/subscription-added.tmpl 
347share/cups/templates/es/subscription-canceled.tmpl 
348share/cups/templates/es/test-page.tmpl 370share/cups/templates/es/test-page.tmpl
349share/cups/templates/es/trailer.tmpl 371share/cups/templates/es/trailer.tmpl
350share/cups/templates/es/users.tmpl 372share/cups/templates/es/users.tmpl
351share/cups/templates/fr/add-class.tmpl 373share/cups/templates/fr/add-class.tmpl
352share/cups/templates/fr/add-printer.tmpl 374share/cups/templates/fr/add-printer.tmpl
353share/cups/templates/fr/add-rss-subscription.tmpl 
354share/cups/templates/fr/admin.tmpl 375share/cups/templates/fr/admin.tmpl
355share/cups/templates/fr/choose-device.tmpl 376share/cups/templates/fr/choose-device.tmpl
356share/cups/templates/fr/choose-make.tmpl 377share/cups/templates/fr/choose-make.tmpl
357share/cups/templates/fr/choose-model.tmpl 378share/cups/templates/fr/choose-model.tmpl
358share/cups/templates/fr/choose-serial.tmpl 379share/cups/templates/fr/choose-serial.tmpl
359share/cups/templates/fr/choose-uri.tmpl 380share/cups/templates/fr/choose-uri.tmpl
360share/cups/templates/fr/class-added.tmpl 381share/cups/templates/fr/class-added.tmpl
361share/cups/templates/fr/class-confirm.tmpl 382share/cups/templates/fr/class-confirm.tmpl
362share/cups/templates/fr/class-deleted.tmpl 383share/cups/templates/fr/class-deleted.tmpl
363share/cups/templates/fr/class-jobs-header.tmpl 384share/cups/templates/fr/class-jobs-header.tmpl
364share/cups/templates/fr/class-modified.tmpl 385share/cups/templates/fr/class-modified.tmpl
365share/cups/templates/fr/class.tmpl 386share/cups/templates/fr/class.tmpl
366share/cups/templates/fr/classes-header.tmpl 387share/cups/templates/fr/classes-header.tmpl
@@ -398,43 +419,38 @@ share/cups/templates/fr/printer-cancel-j @@ -398,43 +419,38 @@ share/cups/templates/fr/printer-cancel-j
398share/cups/templates/fr/printer-configured.tmpl 419share/cups/templates/fr/printer-configured.tmpl
399share/cups/templates/fr/printer-confirm.tmpl 420share/cups/templates/fr/printer-confirm.tmpl
400share/cups/templates/fr/printer-default.tmpl 421share/cups/templates/fr/printer-default.tmpl
401share/cups/templates/fr/printer-deleted.tmpl 422share/cups/templates/fr/printer-deleted.tmpl
402share/cups/templates/fr/printer-jobs-header.tmpl 423share/cups/templates/fr/printer-jobs-header.tmpl
403share/cups/templates/fr/printer-modified.tmpl 424share/cups/templates/fr/printer-modified.tmpl
404share/cups/templates/fr/printer-reject.tmpl 425share/cups/templates/fr/printer-reject.tmpl
405share/cups/templates/fr/printer-start.tmpl 426share/cups/templates/fr/printer-start.tmpl
406share/cups/templates/fr/printer-stop.tmpl 427share/cups/templates/fr/printer-stop.tmpl
407share/cups/templates/fr/printer.tmpl 428share/cups/templates/fr/printer.tmpl
408share/cups/templates/fr/printers-header.tmpl 429share/cups/templates/fr/printers-header.tmpl
409share/cups/templates/fr/printers.tmpl 430share/cups/templates/fr/printers.tmpl
410share/cups/templates/fr/restart.tmpl 431share/cups/templates/fr/restart.tmpl
411share/cups/templates/fr/samba-export.tmpl 
412share/cups/templates/fr/samba-exported.tmpl 
413share/cups/templates/fr/search.tmpl 432share/cups/templates/fr/search.tmpl
414share/cups/templates/fr/set-printer-options-header.tmpl 433share/cups/templates/fr/set-printer-options-header.tmpl
415share/cups/templates/fr/set-printer-options-trailer.tmpl 434share/cups/templates/fr/set-printer-options-trailer.tmpl
416share/cups/templates/fr/subscription-added.tmpl 
417share/cups/templates/fr/subscription-canceled.tmpl 
418share/cups/templates/fr/test-page.tmpl 435share/cups/templates/fr/test-page.tmpl
419share/cups/templates/fr/trailer.tmpl 436share/cups/templates/fr/trailer.tmpl
420share/cups/templates/fr/users.tmpl 437share/cups/templates/fr/users.tmpl
421share/cups/templates/header.tmpl 438share/cups/templates/header.tmpl
422share/cups/templates/help-header.tmpl 439share/cups/templates/help-header.tmpl
423share/cups/templates/help-printable.tmpl 440share/cups/templates/help-printable.tmpl
424share/cups/templates/help-trailer.tmpl 441share/cups/templates/help-trailer.tmpl
425share/cups/templates/ja/add-class.tmpl 442share/cups/templates/ja/add-class.tmpl
426share/cups/templates/ja/add-printer.tmpl 443share/cups/templates/ja/add-printer.tmpl
427share/cups/templates/ja/add-rss-subscription.tmpl 
428share/cups/templates/ja/admin.tmpl 444share/cups/templates/ja/admin.tmpl
429share/cups/templates/ja/choose-device.tmpl 445share/cups/templates/ja/choose-device.tmpl
430share/cups/templates/ja/choose-make.tmpl 446share/cups/templates/ja/choose-make.tmpl
431share/cups/templates/ja/choose-model.tmpl 447share/cups/templates/ja/choose-model.tmpl
432share/cups/templates/ja/choose-serial.tmpl 448share/cups/templates/ja/choose-serial.tmpl
433share/cups/templates/ja/choose-uri.tmpl 449share/cups/templates/ja/choose-uri.tmpl
434share/cups/templates/ja/class-added.tmpl 450share/cups/templates/ja/class-added.tmpl
435share/cups/templates/ja/class-confirm.tmpl 451share/cups/templates/ja/class-confirm.tmpl
436share/cups/templates/ja/class-deleted.tmpl 452share/cups/templates/ja/class-deleted.tmpl
437share/cups/templates/ja/class-jobs-header.tmpl 453share/cups/templates/ja/class-jobs-header.tmpl
438share/cups/templates/ja/class-modified.tmpl 454share/cups/templates/ja/class-modified.tmpl
439share/cups/templates/ja/class.tmpl 455share/cups/templates/ja/class.tmpl
440share/cups/templates/ja/classes-header.tmpl 456share/cups/templates/ja/classes-header.tmpl
@@ -472,33 +488,29 @@ share/cups/templates/ja/printer-cancel-j @@ -472,33 +488,29 @@ share/cups/templates/ja/printer-cancel-j
472share/cups/templates/ja/printer-configured.tmpl 488share/cups/templates/ja/printer-configured.tmpl
473share/cups/templates/ja/printer-confirm.tmpl 489share/cups/templates/ja/printer-confirm.tmpl
474share/cups/templates/ja/printer-default.tmpl 490share/cups/templates/ja/printer-default.tmpl
475share/cups/templates/ja/printer-deleted.tmpl 491share/cups/templates/ja/printer-deleted.tmpl
476share/cups/templates/ja/printer-jobs-header.tmpl 492share/cups/templates/ja/printer-jobs-header.tmpl
477share/cups/templates/ja/printer-modified.tmpl 493share/cups/templates/ja/printer-modified.tmpl
478share/cups/templates/ja/printer-reject.tmpl 494share/cups/templates/ja/printer-reject.tmpl
479share/cups/templates/ja/printer-start.tmpl 495share/cups/templates/ja/printer-start.tmpl
480share/cups/templates/ja/printer-stop.tmpl 496share/cups/templates/ja/printer-stop.tmpl
481share/cups/templates/ja/printer.tmpl 497share/cups/templates/ja/printer.tmpl
482share/cups/templates/ja/printers-header.tmpl 498share/cups/templates/ja/printers-header.tmpl
483share/cups/templates/ja/printers.tmpl 499share/cups/templates/ja/printers.tmpl
484share/cups/templates/ja/restart.tmpl 500share/cups/templates/ja/restart.tmpl
485share/cups/templates/ja/samba-export.tmpl 
486share/cups/templates/ja/samba-exported.tmpl 
487share/cups/templates/ja/search.tmpl 501share/cups/templates/ja/search.tmpl
488share/cups/templates/ja/set-printer-options-header.tmpl 502share/cups/templates/ja/set-printer-options-header.tmpl
489share/cups/templates/ja/set-printer-options-trailer.tmpl 503share/cups/templates/ja/set-printer-options-trailer.tmpl
490share/cups/templates/ja/subscription-added.tmpl 
491share/cups/templates/ja/subscription-canceled.tmpl 
492share/cups/templates/ja/test-page.tmpl 504share/cups/templates/ja/test-page.tmpl
493share/cups/templates/ja/trailer.tmpl 505share/cups/templates/ja/trailer.tmpl
494share/cups/templates/ja/users.tmpl 506share/cups/templates/ja/users.tmpl
495share/cups/templates/job-cancel.tmpl 507share/cups/templates/job-cancel.tmpl
496share/cups/templates/job-hold.tmpl 508share/cups/templates/job-hold.tmpl
497share/cups/templates/job-move.tmpl 509share/cups/templates/job-move.tmpl
498share/cups/templates/job-moved.tmpl 510share/cups/templates/job-moved.tmpl
499share/cups/templates/job-release.tmpl 511share/cups/templates/job-release.tmpl
500share/cups/templates/job-restart.tmpl 512share/cups/templates/job-restart.tmpl
501share/cups/templates/jobs-header.tmpl 513share/cups/templates/jobs-header.tmpl
502share/cups/templates/jobs.tmpl 514share/cups/templates/jobs.tmpl
503share/cups/templates/list-available-printers.tmpl 515share/cups/templates/list-available-printers.tmpl
504share/cups/templates/modify-class.tmpl 516share/cups/templates/modify-class.tmpl
@@ -518,27 +530,26 @@ share/cups/templates/printer-configured. @@ -518,27 +530,26 @@ share/cups/templates/printer-configured.
518share/cups/templates/printer-confirm.tmpl 530share/cups/templates/printer-confirm.tmpl
519share/cups/templates/printer-default.tmpl 531share/cups/templates/printer-default.tmpl
520share/cups/templates/printer-deleted.tmpl 532share/cups/templates/printer-deleted.tmpl
521share/cups/templates/printer-jobs-header.tmpl 533share/cups/templates/printer-jobs-header.tmpl
522share/cups/templates/printer-modified.tmpl 534share/cups/templates/printer-modified.tmpl
523share/cups/templates/printer-reject.tmpl 535share/cups/templates/printer-reject.tmpl
524share/cups/templates/printer-start.tmpl 536share/cups/templates/printer-start.tmpl
525share/cups/templates/printer-stop.tmpl 537share/cups/templates/printer-stop.tmpl
526share/cups/templates/printer.tmpl 538share/cups/templates/printer.tmpl
527share/cups/templates/printers-header.tmpl 539share/cups/templates/printers-header.tmpl
528share/cups/templates/printers.tmpl 540share/cups/templates/printers.tmpl
529share/cups/templates/pt_BR/add-class.tmpl 541share/cups/templates/pt_BR/add-class.tmpl
530share/cups/templates/pt_BR/add-printer.tmpl 542share/cups/templates/pt_BR/add-printer.tmpl
531share/cups/templates/pt_BR/add-rss-subscription.tmpl 
532share/cups/templates/pt_BR/admin.tmpl 543share/cups/templates/pt_BR/admin.tmpl
533share/cups/templates/pt_BR/choose-device.tmpl 544share/cups/templates/pt_BR/choose-device.tmpl
534share/cups/templates/pt_BR/choose-make.tmpl 545share/cups/templates/pt_BR/choose-make.tmpl
535share/cups/templates/pt_BR/choose-model.tmpl 546share/cups/templates/pt_BR/choose-model.tmpl
536share/cups/templates/pt_BR/choose-serial.tmpl 547share/cups/templates/pt_BR/choose-serial.tmpl
537share/cups/templates/pt_BR/choose-uri.tmpl 548share/cups/templates/pt_BR/choose-uri.tmpl
538share/cups/templates/pt_BR/class-added.tmpl 549share/cups/templates/pt_BR/class-added.tmpl
539share/cups/templates/pt_BR/class-confirm.tmpl 550share/cups/templates/pt_BR/class-confirm.tmpl
540share/cups/templates/pt_BR/class-deleted.tmpl 551share/cups/templates/pt_BR/class-deleted.tmpl
541share/cups/templates/pt_BR/class-jobs-header.tmpl 552share/cups/templates/pt_BR/class-jobs-header.tmpl
542share/cups/templates/pt_BR/class-modified.tmpl 553share/cups/templates/pt_BR/class-modified.tmpl
543share/cups/templates/pt_BR/class.tmpl 554share/cups/templates/pt_BR/class.tmpl
544share/cups/templates/pt_BR/classes-header.tmpl 555share/cups/templates/pt_BR/classes-header.tmpl
@@ -576,40 +587,35 @@ share/cups/templates/pt_BR/printer-cance @@ -576,40 +587,35 @@ share/cups/templates/pt_BR/printer-cance
576share/cups/templates/pt_BR/printer-configured.tmpl 587share/cups/templates/pt_BR/printer-configured.tmpl
577share/cups/templates/pt_BR/printer-confirm.tmpl 588share/cups/templates/pt_BR/printer-confirm.tmpl
578share/cups/templates/pt_BR/printer-default.tmpl 589share/cups/templates/pt_BR/printer-default.tmpl
579share/cups/templates/pt_BR/printer-deleted.tmpl 590share/cups/templates/pt_BR/printer-deleted.tmpl
580share/cups/templates/pt_BR/printer-jobs-header.tmpl 591share/cups/templates/pt_BR/printer-jobs-header.tmpl
581share/cups/templates/pt_BR/printer-modified.tmpl 592share/cups/templates/pt_BR/printer-modified.tmpl
582share/cups/templates/pt_BR/printer-reject.tmpl 593share/cups/templates/pt_BR/printer-reject.tmpl
583share/cups/templates/pt_BR/printer-start.tmpl 594share/cups/templates/pt_BR/printer-start.tmpl
584share/cups/templates/pt_BR/printer-stop.tmpl 595share/cups/templates/pt_BR/printer-stop.tmpl
585share/cups/templates/pt_BR/printer.tmpl 596share/cups/templates/pt_BR/printer.tmpl
586share/cups/templates/pt_BR/printers-header.tmpl 597share/cups/templates/pt_BR/printers-header.tmpl
587share/cups/templates/pt_BR/printers.tmpl 598share/cups/templates/pt_BR/printers.tmpl
588share/cups/templates/pt_BR/restart.tmpl 599share/cups/templates/pt_BR/restart.tmpl
589share/cups/templates/pt_BR/samba-export.tmpl 
590share/cups/templates/pt_BR/samba-exported.tmpl 
591share/cups/templates/pt_BR/search.tmpl 600share/cups/templates/pt_BR/search.tmpl
592share/cups/templates/pt_BR/set-printer-options-header.tmpl 601share/cups/templates/pt_BR/set-printer-options-header.tmpl
593share/cups/templates/pt_BR/set-printer-options-trailer.tmpl 602share/cups/templates/pt_BR/set-printer-options-trailer.tmpl
594share/cups/templates/pt_BR/subscription-added.tmpl 
595share/cups/templates/pt_BR/subscription-canceled.tmpl 
596share/cups/templates/pt_BR/test-page.tmpl 603share/cups/templates/pt_BR/test-page.tmpl
597share/cups/templates/pt_BR/trailer.tmpl 604share/cups/templates/pt_BR/trailer.tmpl
598share/cups/templates/pt_BR/users.tmpl 605share/cups/templates/pt_BR/users.tmpl
599share/cups/templates/restart.tmpl 606share/cups/templates/restart.tmpl
600share/cups/templates/ru/add-class.tmpl 607share/cups/templates/ru/add-class.tmpl
601share/cups/templates/ru/add-printer.tmpl 608share/cups/templates/ru/add-printer.tmpl
602share/cups/templates/ru/add-rss-subscription.tmpl 
603share/cups/templates/ru/admin.tmpl 609share/cups/templates/ru/admin.tmpl
604share/cups/templates/ru/choose-device.tmpl 610share/cups/templates/ru/choose-device.tmpl
605share/cups/templates/ru/choose-make.tmpl 611share/cups/templates/ru/choose-make.tmpl
606share/cups/templates/ru/choose-model.tmpl 612share/cups/templates/ru/choose-model.tmpl
607share/cups/templates/ru/choose-serial.tmpl 613share/cups/templates/ru/choose-serial.tmpl
608share/cups/templates/ru/choose-uri.tmpl 614share/cups/templates/ru/choose-uri.tmpl
609share/cups/templates/ru/class-added.tmpl 615share/cups/templates/ru/class-added.tmpl
610share/cups/templates/ru/class-confirm.tmpl 616share/cups/templates/ru/class-confirm.tmpl
611share/cups/templates/ru/class-deleted.tmpl 617share/cups/templates/ru/class-deleted.tmpl
612share/cups/templates/ru/class-jobs-header.tmpl 618share/cups/templates/ru/class-jobs-header.tmpl
613share/cups/templates/ru/class-modified.tmpl 619share/cups/templates/ru/class-modified.tmpl
614share/cups/templates/ru/class.tmpl 620share/cups/templates/ru/class.tmpl
615share/cups/templates/ru/classes-header.tmpl 621share/cups/templates/ru/classes-header.tmpl
@@ -647,84 +653,78 @@ share/cups/templates/ru/printer-cancel-j @@ -647,84 +653,78 @@ share/cups/templates/ru/printer-cancel-j
647share/cups/templates/ru/printer-configured.tmpl 653share/cups/templates/ru/printer-configured.tmpl
648share/cups/templates/ru/printer-confirm.tmpl 654share/cups/templates/ru/printer-confirm.tmpl
649share/cups/templates/ru/printer-default.tmpl 655share/cups/templates/ru/printer-default.tmpl
650share/cups/templates/ru/printer-deleted.tmpl 656share/cups/templates/ru/printer-deleted.tmpl
651share/cups/templates/ru/printer-jobs-header.tmpl 657share/cups/templates/ru/printer-jobs-header.tmpl
652share/cups/templates/ru/printer-modified.tmpl 658share/cups/templates/ru/printer-modified.tmpl
653share/cups/templates/ru/printer-reject.tmpl 659share/cups/templates/ru/printer-reject.tmpl
654share/cups/templates/ru/printer-start.tmpl 660share/cups/templates/ru/printer-start.tmpl
655share/cups/templates/ru/printer-stop.tmpl 661share/cups/templates/ru/printer-stop.tmpl
656share/cups/templates/ru/printer.tmpl 662share/cups/templates/ru/printer.tmpl
657share/cups/templates/ru/printers-header.tmpl 663share/cups/templates/ru/printers-header.tmpl
658share/cups/templates/ru/printers.tmpl 664share/cups/templates/ru/printers.tmpl
659share/cups/templates/ru/restart.tmpl 665share/cups/templates/ru/restart.tmpl
660share/cups/templates/ru/samba-export.tmpl 
661share/cups/templates/ru/samba-exported.tmpl 
662share/cups/templates/ru/search.tmpl 666share/cups/templates/ru/search.tmpl
663share/cups/templates/ru/set-printer-options-header.tmpl 667share/cups/templates/ru/set-printer-options-header.tmpl
664share/cups/templates/ru/set-printer-options-trailer.tmpl 668share/cups/templates/ru/set-printer-options-trailer.tmpl
665share/cups/templates/ru/subscription-added.tmpl 
666share/cups/templates/ru/subscription-canceled.tmpl 
667share/cups/templates/ru/test-page.tmpl 669share/cups/templates/ru/test-page.tmpl
668share/cups/templates/ru/trailer.tmpl 670share/cups/templates/ru/trailer.tmpl
669share/cups/templates/ru/users.tmpl 671share/cups/templates/ru/users.tmpl
670share/cups/templates/samba-export.tmpl 
671share/cups/templates/samba-exported.tmpl 
672share/cups/templates/search.tmpl 672share/cups/templates/search.tmpl
673share/cups/templates/set-printer-options-header.tmpl 673share/cups/templates/set-printer-options-header.tmpl
674share/cups/templates/set-printer-options-trailer.tmpl 674share/cups/templates/set-printer-options-trailer.tmpl
675share/cups/templates/subscription-added.tmpl 
676share/cups/templates/subscription-canceled.tmpl 
677share/cups/templates/test-page.tmpl 675share/cups/templates/test-page.tmpl
678share/cups/templates/trailer.tmpl 676share/cups/templates/trailer.tmpl
679share/cups/templates/users.tmpl 677share/cups/templates/users.tmpl
680${PLIST.libusb}share/cups/usb/org.cups.usb-quirks 678${PLIST.libusb}share/cups/usb/org.cups.usb-quirks
681share/doc/cups/LICENSE.txt 679share/doc/cups/LICENSE
682share/doc/cups/README.md 680share/doc/cups/README.md
683share/doc/cups/apple-touch-icon.png 681share/doc/cups/apple-touch-icon.png
684share/doc/cups/cups-printable.css 682share/doc/cups/cups-printable.css
685share/doc/cups/cups.css 683share/doc/cups/cups.css
686share/doc/cups/de/index.html 684share/doc/cups/de/index.html
687share/doc/cups/es/index.html 685share/doc/cups/es/index.html
688share/doc/cups/help/accounting.html 686share/doc/cups/help/accounting.html
 687share/doc/cups/help/admin.html
689share/doc/cups/help/api-admin.html 688share/doc/cups/help/api-admin.html
690share/doc/cups/help/api-filter.html 689share/doc/cups/help/api-filter.html
691share/doc/cups/help/api-ppd.html 690share/doc/cups/help/api-ppd.html
692share/doc/cups/help/api-raster.html 691share/doc/cups/help/api-raster.html
693share/doc/cups/help/cgi.html 692share/doc/cups/help/cgi.html
694share/doc/cups/help/cupspm.html 693share/doc/cups/help/cupspm.html
695share/doc/cups/help/encryption.html 694share/doc/cups/help/encryption.html
 695share/doc/cups/help/firewalls.html
696share/doc/cups/help/glossary.html 696share/doc/cups/help/glossary.html
697share/doc/cups/help/kerberos.html 697share/doc/cups/help/kerberos.html
698share/doc/cups/help/license.html 698share/doc/cups/help/license.html
699share/doc/cups/help/man-backend.html 699share/doc/cups/help/man-backend.html
700share/doc/cups/help/man-cancel.html 700share/doc/cups/help/man-cancel.html
701share/doc/cups/help/man-classes.conf.html 701share/doc/cups/help/man-classes.conf.html
702share/doc/cups/help/man-client.conf.html 702share/doc/cups/help/man-client.conf.html
703share/doc/cups/help/man-cups-config.html 703share/doc/cups/help/man-cups-config.html
704share/doc/cups/help/man-cups-files.conf.html 704share/doc/cups/help/man-cups-files.conf.html
705share/doc/cups/help/man-cups-lpd.html 705share/doc/cups/help/man-cups-lpd.html
706share/doc/cups/help/man-cups-snmp.html 706share/doc/cups/help/man-cups-snmp.html
707share/doc/cups/help/man-cups.html 707share/doc/cups/help/man-cups.html
708share/doc/cups/help/man-cupsaccept.html 708share/doc/cups/help/man-cupsaccept.html
709share/doc/cups/help/man-cupsaddsmb.html 
710share/doc/cups/help/man-cupsd-helper.html 709share/doc/cups/help/man-cupsd-helper.html
711share/doc/cups/help/man-cupsd-logs.html 710share/doc/cups/help/man-cupsd-logs.html
712share/doc/cups/help/man-cupsd.conf.html 711share/doc/cups/help/man-cupsd.conf.html
713share/doc/cups/help/man-cupsd.html 712share/doc/cups/help/man-cupsd.html
714share/doc/cups/help/man-cupsenable.html 713share/doc/cups/help/man-cupsenable.html
715share/doc/cups/help/man-cupstestdsc.html 
716share/doc/cups/help/man-cupstestppd.html 714share/doc/cups/help/man-cupstestppd.html
717share/doc/cups/help/man-filter.html 715share/doc/cups/help/man-filter.html
 716share/doc/cups/help/man-ippevepcl.html
 717share/doc/cups/help/man-ippeveprinter.html
718share/doc/cups/help/man-ipptool.html 718share/doc/cups/help/man-ipptool.html
719share/doc/cups/help/man-ipptoolfile.html 719share/doc/cups/help/man-ipptoolfile.html
720share/doc/cups/help/man-lp.html 720share/doc/cups/help/man-lp.html
721share/doc/cups/help/man-lpadmin.html 721share/doc/cups/help/man-lpadmin.html
722share/doc/cups/help/man-lpc.html 722share/doc/cups/help/man-lpc.html
723share/doc/cups/help/man-lpinfo.html 723share/doc/cups/help/man-lpinfo.html
724share/doc/cups/help/man-lpmove.html 724share/doc/cups/help/man-lpmove.html
725share/doc/cups/help/man-lpoptions.html 725share/doc/cups/help/man-lpoptions.html
726share/doc/cups/help/man-lpq.html 726share/doc/cups/help/man-lpq.html
727share/doc/cups/help/man-lpr.html 727share/doc/cups/help/man-lpr.html
728share/doc/cups/help/man-lprm.html 728share/doc/cups/help/man-lprm.html
729share/doc/cups/help/man-lpstat.html 729share/doc/cups/help/man-lpstat.html
730share/doc/cups/help/man-mime.convs.html 730share/doc/cups/help/man-mime.convs.html
@@ -741,28 +741,26 @@ share/doc/cups/help/network.html @@ -741,28 +741,26 @@ share/doc/cups/help/network.html
741share/doc/cups/help/options.html 741share/doc/cups/help/options.html
742share/doc/cups/help/overview.html 742share/doc/cups/help/overview.html
743share/doc/cups/help/policies.html 743share/doc/cups/help/policies.html
744share/doc/cups/help/postscript-driver.html 744share/doc/cups/help/postscript-driver.html
745share/doc/cups/help/ppd-compiler.html 745share/doc/cups/help/ppd-compiler.html
746share/doc/cups/help/raster-driver.html 746share/doc/cups/help/raster-driver.html
747share/doc/cups/help/ref-ppdcfile.html 747share/doc/cups/help/ref-ppdcfile.html
748share/doc/cups/help/security.html 748share/doc/cups/help/security.html
749share/doc/cups/help/sharing.html 749share/doc/cups/help/sharing.html
750share/doc/cups/help/spec-banner.html 750share/doc/cups/help/spec-banner.html
751share/doc/cups/help/spec-command.html 751share/doc/cups/help/spec-command.html
752share/doc/cups/help/spec-design.html 752share/doc/cups/help/spec-design.html
753share/doc/cups/help/spec-ipp.html 753share/doc/cups/help/spec-ipp.html
754share/doc/cups/help/spec-pdf.html 
755share/doc/cups/help/spec-postscript.html 
756share/doc/cups/help/spec-ppd.html 754share/doc/cups/help/spec-ppd.html
757share/doc/cups/help/spec-raster.html 755share/doc/cups/help/spec-raster.html
758share/doc/cups/help/spec-stp.html 756share/doc/cups/help/spec-stp.html
759share/doc/cups/help/translation.html 757share/doc/cups/help/translation.html
760share/doc/cups/images/color-wheel.png 758share/doc/cups/images/color-wheel.png
761share/doc/cups/images/cups-block-diagram.png 759share/doc/cups/images/cups-block-diagram.png
762share/doc/cups/images/cups-command-chain.png 760share/doc/cups/images/cups-command-chain.png
763share/doc/cups/images/cups-icon.png 761share/doc/cups/images/cups-icon.png
764share/doc/cups/images/cups-postscript-chain.png 762share/doc/cups/images/cups-postscript-chain.png
765share/doc/cups/images/cups-raster-chain.png 763share/doc/cups/images/cups-raster-chain.png
766share/doc/cups/images/cups.png 764share/doc/cups/images/cups.png
767share/doc/cups/images/generic.png 765share/doc/cups/images/generic.png
768share/doc/cups/images/left.gif 766share/doc/cups/images/left.gif
@@ -776,20 +774,21 @@ share/doc/cups/images/unsel.gif @@ -776,20 +774,21 @@ share/doc/cups/images/unsel.gif
776share/doc/cups/images/wait.gif 774share/doc/cups/images/wait.gif
777share/doc/cups/index.html 775share/doc/cups/index.html
778share/doc/cups/ja/index.html 776share/doc/cups/ja/index.html
779share/doc/cups/pt_BR/index.html 777share/doc/cups/pt_BR/index.html
780share/doc/cups/robots.txt 778share/doc/cups/robots.txt
781share/doc/cups/ru/index.html 779share/doc/cups/ru/index.html
782share/examples/cups/cups-files.conf 780share/examples/cups/cups-files.conf
783${PLIST.pam}share/examples/cups/cups.pam 781${PLIST.pam}share/examples/cups/cups.pam
784share/examples/cups/cupsd.conf 782share/examples/cups/cupsd.conf
785share/examples/cups/snmp.conf 783share/examples/cups/snmp.conf
786share/locale/ca/cups_ca.po 784share/locale/ca/cups_ca.po
787share/locale/cs/cups_cs.po 785share/locale/cs/cups_cs.po
788share/locale/de/cups_de.po 786share/locale/de/cups_de.po
 787share/locale/en/cups_en.po
789share/locale/es/cups_es.po 788share/locale/es/cups_es.po
790share/locale/fr/cups_fr.po 789share/locale/fr/cups_fr.po
791share/locale/it/cups_it.po 790share/locale/it/cups_it.po
792share/locale/ja/cups_ja.po 791share/locale/ja/cups_ja.po
793share/locale/pt_BR/cups_pt_BR.po 792share/locale/pt_BR/cups_pt_BR.po
794share/locale/ru/cups_ru.po 793share/locale/ru/cups_ru.po
795share/locale/zh_CN/cups_zh_CN.po 794share/locale/zh_CN/cups_zh_CN.po
cvs diff -r1.15 -r1.16 pkgsrc/print/cups-base/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups-base/distinfo 2019/08/16 21:19:30 1.15
+++ pkgsrc/print/cups-base/distinfo 2019/11/17 21:22:03 1.16
@@ -1,32 +1,29 @@ @@ -1,32 +1,29 @@
1$NetBSD: distinfo,v 1.15 2019/08/16 21:19:30 leot Exp $ 1$NetBSD: distinfo,v 1.16 2019/11/17 21:22:03 leot Exp $
2 2
3SHA1 (cups-2.2.12-source.tar.gz) = a6a89bd1dd3b7122913651698a89d795e3bfea80 3SHA1 (cups-2.3.0-source.tar.gz) = ccdce595a90d768968b1e908684594738eba3a91
4RMD160 (cups-2.2.12-source.tar.gz) = e9bcc54ad693f77f482c1fcef63d5c2fa538a722 4RMD160 (cups-2.3.0-source.tar.gz) = d7a0cd359441d1b30095c04986f500010aae4c9c
5SHA512 (cups-2.2.12-source.tar.gz) = b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 5SHA512 (cups-2.3.0-source.tar.gz) = c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
6Size (cups-2.2.12-source.tar.gz) = 10409313 bytes 6Size (cups-2.3.0-source.tar.gz) = 8129049 bytes
7SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 7SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
8SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 8SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
9SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 9SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
10SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77 10SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77
11SHA1 (patch-airprint-scheduler_conf.c) = f54ba16cc32dc09cd5bd8e864e1510ed2a84d6ed 11SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
12SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca 12SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca
13SHA1 (patch-airprint-scheduler_printers.c) = 7fc0157f990a6e4dfa04c0b2c5684422229af725 13SHA1 (patch-airprint-scheduler_printers.c) = 1794cd3ea6a32ce6376aa86e89f945de036036eb
14SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f 14SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
15SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a 15SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
16SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0 16SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
17SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f35de7f3 17SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f35de7f3
18SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e 18SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
19SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354 19SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
20SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412 20SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412
21SHA1 (patch-config-scripts_cups-manpages.m4) = 5cc943738df29f11fc366557938b82c1e9162344 
22SHA1 (patch-config-scripts_cups-opsys.m4) = 2bbacc401d4d8dbc157889b6a6cf66684c52357b 
23SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 21SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
24SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7 22SHA1 (patch-cups_thread.c) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7
25SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876 23SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
26SHA1 (patch-man-cups-files.conf.man.in) = 820da58aa3f854018a48b68256d0cf0dc75b986e 24SHA1 (patch-man-cups-files.conf.man.in) = 08c0322fd233c724b7df238df01988500130d1c6
27SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc 25SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57
28SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee 26SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee
29SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab 27SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab
30SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0 28SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0
31SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf 29SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
32SHA1 (patch-test_ippfind.c) = 70403f5e7d5bd56772616f64fc2dff1482994b79 
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/patch-ae 2017/11/12 14:10:15 1.1
+++ pkgsrc/print/cups-base/patches/patch-ae 2019/11/17 21:22:03 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-ae,v 1.1 2017/11/12 14:10:15 khorben Exp $ 1$NetBSD: patch-ae,v 1.2 2019/11/17 21:22:03 leot Exp $
2 2
3- Do not pass `-z' option to install(1) 3- Do not pass `-z' option to install(1)
4- Honor optimization flags. 4- Honor optimization flags.
5 5
6--- Makedefs.in.orig 2017-10-13 18:22:26.000000000 +0000 6--- Makedefs.in.orig 2019-08-23 15:19:38.000000000 +0000
7+++ Makedefs.in 7+++ Makedefs.in
8@@ -49,7 +49,7 @@ SHELL = /bin/sh 8@@ -46,7 +46,7 @@ SHELL = /bin/sh
9 # 9 #
10  10
11 INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ 11 INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
12-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ 12-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
13+INSTALL_COMPDATA = $(INSTALL) -c -m 444 13+INSTALL_COMPDATA = $(INSTALL) -c -m 444
14 INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ 14 INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
15 INSTALL_DATA = $(INSTALL) -c -m 444 15 INSTALL_DATA = $(INSTALL) -c -m 444
16 INSTALL_DIR = $(INSTALL) -d 16 INSTALL_DIR = $(INSTALL) -d
17@@ -151,7 +151,7 @@ CXXLIBS = @CXXLIBS@ 17@@ -167,7 +167,7 @@ CXXLIBS = @CXXLIBS@
18 DBUS_NOTIFIER = @DBUS_NOTIFIER@ 18 DBUS_NOTIFIER = @DBUS_NOTIFIER@
19 DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ 19 DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
20 DNSSD_BACKEND = @DNSSD_BACKEND@ 20 DNSSD_BACKEND = @DNSSD_BACKEND@
21-DSOFLAGS = -L../cups @DSOFLAGS@ 21-DSOFLAGS = @DSOFLAGS@
22+DSOFLAGS = -L../cups @DSOFLAGS@ $(OPTIM) 22+DSOFLAGS = -L../cups @DSOFLAGS@ $(OPTIM)
23 DSOLIBS = @DSOLIBS@ $(COMMONLIBS) 
24 DNSSDLIBS = @DNSSDLIBS@ 23 DNSSDLIBS = @DNSSDLIBS@
25 IPPFIND_BIN = @IPPFIND_BIN@ 24 IPPFIND_BIN = @IPPFIND_BIN@
 25 IPPFIND_MAN = @IPPFIND_MAN@
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_conf.c (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_conf.c 2018/07/24 12:19:21 1.1
+++ pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_conf.c 2019/11/17 21:22:03 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-airprint-scheduler_conf.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $ 1$NetBSD: patch-airprint-scheduler_conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $
2 2
3From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 3From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
4From: Till Kamppeter <till.kamppeter@gmail.com> 4From: Till Kamppeter <till.kamppeter@gmail.com>
5Date: Tue, 9 Aug 2016 18:11:29 +0200 5Date: Tue, 9 Aug 2016 18:11:29 +0200
6Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod 6Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
7 Touch to a CUPS server) 7 Touch to a CUPS server)
8 8
9Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 9Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
10Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 10Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
11Bug-Debian: http://bugs.debian.org/700961 11Bug-Debian: http://bugs.debian.org/700961
12Bug: https://cups.org/str.php?L4341 12Bug: https://cups.org/str.php?L4341
13Last-Update: 2015-02-10 13Last-Update: 2015-02-10
14 14
@@ -21,16 +21,16 @@ Patch-Name: airprint-support.patch @@ -21,16 +21,16 @@ Patch-Name: airprint-support.patch
21 scheduler/printers.c | 4 +++- 21 scheduler/printers.c | 4 +++-
22 5 files changed, 16 insertions(+), 2 deletions(-) 22 5 files changed, 16 insertions(+), 2 deletions(-)
23 23
24diff --git a/scheduler/conf.c b/scheduler/conf.c 24diff --git a/scheduler/conf.c b/scheduler/conf.c
25index 9c1be7089..52f2a6d35 100644 25index 9c1be7089..52f2a6d35 100644
26--- scheduler/conf.c.orig 26--- scheduler/conf.c.orig
27+++ scheduler/conf.c 27+++ scheduler/conf.c
28@@ -745,7 +745,7 @@ cupsdReadConfiguration(void) 28@@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
29 DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; 29 DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
30  30
31 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) 31 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
32- cupsdSetString(&DNSSDSubTypes, "_cups,_print"); 32- cupsdSetString(&DNSSDSubTypes, "_cups,_print");
33+ cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal"); 33+ cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
 34 cupsdClearString(&DNSSDHostName);
34 #endif /* HAVE_DNSSD || HAVE_AVAHI */ 35 #endif /* HAVE_DNSSD || HAVE_AVAHI */
35  36
36 cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE); 
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_printers.c (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_printers.c 2018/07/24 12:19:21 1.1
+++ pkgsrc/print/cups-base/patches/Attic/patch-airprint-scheduler_printers.c 2019/11/17 21:22:03 1.2
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1$NetBSD: patch-airprint-scheduler_printers.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $ 1$NetBSD: patch-airprint-scheduler_printers.c,v 1.2 2019/11/17 21:22:03 leot Exp $
2 2
3From debian: 3From debian:
4From 7147c814439aafb26ff0262a7d6b8ef56d20969f Mon Sep 17 00:00:00 2001 4From 7147c814439aafb26ff0262a7d6b8ef56d20969f Mon Sep 17 00:00:00 2001
5From: Till Kamppeter <till.kamppeter@gmail.com> 5From: Till Kamppeter <till.kamppeter@gmail.com>
6Date: Tue, 9 Aug 2016 18:11:04 +0200 6Date: Tue, 9 Aug 2016 18:11:04 +0200
7Subject: For PWG Raster, add required IPP attributes 7Subject: For PWG Raster, add required IPP attributes
8 8
9Add required by IPP Everywhere for PWG Raster when PWG Raster as input format 9Add required by IPP Everywhere for PWG Raster when PWG Raster as input format
10is supported 10is supported
11 11
12Bug-Upstream: https://www.cups.org/str.php?L4428 12Bug-Upstream: https://www.cups.org/str.php?L4428
13Last-Update: 2015-02-10 13Last-Update: 2015-02-10
14Patch-Name: pwg-raster-attributes.patch 14Patch-Name: pwg-raster-attributes.patch
15--- 15---
16 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++- 16 scheduler/printers.c | 77 +++++++++++++++++++++++++++++++++++++++++++-
17 1 file changed, 76 insertions(+), 1 deletion(-) 17 1 file changed, 76 insertions(+), 1 deletion(-)
18 18
19diff --git a/scheduler/printers.c b/scheduler/printers.c 19diff --git a/scheduler/printers.c b/scheduler/printers.c
20index bb99907ad..a0ebcbd3e 100644 20index bb99907ad..a0ebcbd3e 100644
21--- scheduler/printers.c.orig 21--- scheduler/printers.c.orig 2019-11-17 12:21:47.966025953 +0000
22+++ scheduler/printers.c 22+++ scheduler/printers.c
23@@ -2199,9 +2199,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ 23@@ -2249,9 +2249,10 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
24 cupsd_location_t *auth; /* Pointer to authentication element */ 24 cupsd_location_t *auth; /* Pointer to authentication element */
25 const char *auth_supported; /* Authentication supported */ 25 const char *auth_supported; /* Authentication supported */
26 ipp_t *oldattrs; /* Old printer attributes */ 26 ipp_t *oldattrs; /* Old printer attributes */
27- ipp_attribute_t *attr; /* Attribute data */ 27- ipp_attribute_t *attr; /* Attribute data */
28+ ipp_attribute_t *attr, *attr2; /* Attribute data */ 28+ ipp_attribute_t *attr, *attr2; /* Attribute data */
29 char *name, /* Current user/group name */ 29 char *name, /* Current user/group name */
30 *filter; /* Current filter */ 30 *filter; /* Current filter */
31+ mime_type_t *type; 31+ mime_type_t *type;
32  32
33  33
34 DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, 34 /*
35@@ -2538,6 +2539,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ 35@@ -2584,6 +2585,80 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
36 DEBUG_printf(("cupsdSetPrinterAttrs: leaving name = %s, type = %x\n", p->name, 36
37 p->type)); 37 add_printer_formats(p);
38  38
39+ /*  39+ /*
40+ * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input 40+ * Add "pwg-raster-document-xxx-supported" attributes if PWG Raster input
41+ * is supported 41+ * is supported
42+ */ 42+ */
43+ for (type = (mime_type_t *)cupsArrayFirst(p->filetypes); 43+ for (type = (mime_type_t *)cupsArrayFirst(p->filetypes);
44+ type; 44+ type;
45+ type = (mime_type_t *)cupsArrayNext(p->filetypes)) 45+ type = (mime_type_t *)cupsArrayNext(p->filetypes))
46+ { 46+ {
47+ if (!_cups_strcasecmp(type->super, "image")) 47+ if (!_cups_strcasecmp(type->super, "image"))
48+ { 48+ {
49+ if (!_cups_strcasecmp(type->type, "pwg-raster")) 49+ if (!_cups_strcasecmp(type->type, "pwg-raster"))
50+ { 50+ {
@@ -103,50 +103,24 @@ index bb99907ad..a0ebcbd3e 100644 @@ -103,50 +103,24 @@ index bb99907ad..a0ebcbd3e 100644
103+ }; 103+ };
104+ ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, 104+ ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
105+ "pwg-raster-document-type-supported", 105+ "pwg-raster-document-type-supported",
106+ (int)(sizeof(pwg_raster_document_type_supported) / 106+ (int)(sizeof(pwg_raster_document_type_supported) /
107+ sizeof(pwg_raster_document_type_supported[0])), NULL, 107+ sizeof(pwg_raster_document_type_supported[0])), NULL,
108+ pwg_raster_document_type_supported); 108+ pwg_raster_document_type_supported);
109+ } 109+ }
110+ } 110+ }
111+ } 111+ }
112+ 112+
113 /* 113 /*
114 * Add name-default attributes... 114 * Add name-default attributes...
115 */ 115 */
116 116@@ -3731,7 +3806,9 @@ add_printer_formats(cupsd_printer_t *p)
117From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001 
118From: Till Kamppeter <till.kamppeter@gmail.com> 
119Date: Tue, 9 Aug 2016 18:11:29 +0200 
120Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod 
121 Touch to a CUPS server) 
122 
123Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779 
124Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495 
125Bug-Debian: http://bugs.debian.org/700961 
126Bug: https://cups.org/str.php?L4341 
127Last-Update: 2015-02-10 
128 
129Patch-Name: airprint-support.patch 
130--- 
131 conf/mime.convs.in | 3 +++ 
132 conf/mime.types | 3 +++ 
133 scheduler/conf.c | 2 +- 
134 scheduler/dirsvc.c | 6 ++++++ 
135 scheduler/printers.c | 4 +++- 
136 5 files changed, 16 insertions(+), 2 deletions(-) 
137 
138diff --git a/scheduler/printers.c b/scheduler/printers.c 
139index a0ebcbd3e..b5fe9e031 100644 
140--- scheduler/printers.c.orig 
141+++ scheduler/printers.c 
142@@ -3765,7 +3765,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */ 
143 } 117 }
144 else if (!_cups_strcasecmp(type->super, "image")) 118 else if (!_cups_strcasecmp(type->super, "image"))
145 { 119 {
146- if (!_cups_strcasecmp(type->type, "jpeg")) 120- if (!_cups_strcasecmp(type->type, "jpeg"))
147+ if (!_cups_strcasecmp(type->type, "urf")) 121+ if (!_cups_strcasecmp(type->type, "urf"))
148+ strlcat(pdl, "image/urf,", sizeof(pdl)); 122+ strlcat(pdl, "image/urf,", sizeof(pdl));
149+ else if (!_cups_strcasecmp(type->type, "jpeg")) 123+ else if (!_cups_strcasecmp(type->type, "jpeg"))
150 strlcat(pdl, "image/jpeg,", sizeof(pdl)); 124 strlcat(pdl, "image/jpeg,", sizeof(pdl));
151 else if (!_cups_strcasecmp(type->type, "png")) 125 else if (!_cups_strcasecmp(type->type, "png"))
152 strlcat(pdl, "image/png,", sizeof(pdl)); 126 strlcat(pdl, "image/png,", sizeof(pdl));
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-base/patches/patch-scheduler-conf.c (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/patch-scheduler-conf.c 2017/11/12 14:10:15 1.1
+++ pkgsrc/print/cups-base/patches/patch-scheduler-conf.c 2019/11/17 21:22:03 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-scheduler-conf.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ 1$NetBSD: patch-scheduler-conf.c,v 1.2 2019/11/17 21:22:03 leot Exp $
2 2
3Add a PidFile configuration directive to write a PID file. 3Add a PidFile configuration directive to write a PID file.
4 4
5--- scheduler/conf.c.orig 2017-03-28 20:26:53.000000000 +0200 5--- scheduler/conf.c.orig 2019-11-17 12:21:47.927540703 +0000
6+++ scheduler/conf.c 2017-07-17 18:04:23.000000000 +0200 6+++ scheduler/conf.c
7@@ -142,6 +142,7 @@ static const cupsd_var_t cupsfiles_vars[ 7@@ -142,6 +142,7 @@ static const cupsd_var_t cupsfiles_vars[
8 { "CreateSelfSignedCerts", &CreateSelfSignedCerts, CUPSD_VARTYPE_BOOLEAN }, 8 { "CreateSelfSignedCerts", &CreateSelfSignedCerts, CUPSD_VARTYPE_BOOLEAN },
9 #endif /* HAVE_SSL */ 9 #endif /* HAVE_SSL */
10 { "DataDir", &DataDir, CUPSD_VARTYPE_STRING }, 10 { "DataDir", &DataDir, CUPSD_VARTYPE_STRING },
11+ { "PidFile", &PidFile, CUPSD_VARTYPE_STRING }, 11+ { "PidFile", &PidFile, CUPSD_VARTYPE_STRING },
12 { "DocumentRoot", &DocumentRoot, CUPSD_VARTYPE_STRING }, 12 { "DocumentRoot", &DocumentRoot, CUPSD_VARTYPE_STRING },
13 { "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING }, 13 { "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING },
14 { "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN }, 14 { "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN },
15@@ -579,6 +580,7 @@ cupsdReadConfiguration(void) 15@@ -579,6 +580,7 @@ cupsdReadConfiguration(void)
16 cupsdSetString(&RequestRoot, CUPS_REQUESTS); 16 cupsdSetString(&RequestRoot, CUPS_REQUESTS);
17 cupsdSetString(&CacheDir, CUPS_CACHEDIR); 17 cupsdSetString(&CacheDir, CUPS_CACHEDIR);
18 cupsdSetString(&DataDir, CUPS_DATADIR); 18 cupsdSetString(&DataDir, CUPS_DATADIR);
19+ cupsdSetString(&PidFile, CUPS_STATEDIR "/cupsd.pid"); 19+ cupsdSetString(&PidFile, CUPS_STATEDIR "/cupsd.pid");
20 cupsdSetString(&DocumentRoot, CUPS_DOCROOT); 20 cupsdSetString(&DocumentRoot, CUPS_DOCROOT);
21 cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log"); 21 cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
22 cupsdClearString(&ErrorLog); 22 cupsdClearString(&ErrorLog);
23@@ -3402,6 +3404,7 @@ read_cupsd_conf(cups_file_t *fp) /* I -  23@@ -3375,6 +3377,7 @@ read_cupsd_conf(cups_file_t *fp) /* I -
24 !_cups_strcasecmp(line, "CacheDir") || 24 !_cups_strcasecmp(line, "CacheDir") ||
25 !_cups_strcasecmp(line, "ConfigFilePerm") || 25 !_cups_strcasecmp(line, "ConfigFilePerm") ||
26 !_cups_strcasecmp(line, "DataDir") || 26 !_cups_strcasecmp(line, "DataDir") ||
27+ !_cups_strcasecmp(line, "PidFile") || 27+ !_cups_strcasecmp(line, "PidFile") ||
28 !_cups_strcasecmp(line, "DocumentRoot") || 28 !_cups_strcasecmp(line, "DocumentRoot") ||
29 !_cups_strcasecmp(line, "ErrorLog") || 29 !_cups_strcasecmp(line, "ErrorLog") ||
30 !_cups_strcasecmp(line, "FatalErrors") || 30 !_cups_strcasecmp(line, "FatalErrors") ||
File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-config-scripts_cups-manpages.m4
File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-config-scripts_cups-opsys.m4
File Deleted: pkgsrc/print/cups-base/patches/Attic/patch-test_ippfind.c
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-base/patches/Attic/patch-man-cups-files.conf.man.in (expand / switch to unified diff)

--- pkgsrc/print/cups-base/patches/Attic/patch-man-cups-files.conf.man.in 2018/06/11 10:04:25 1.2
+++ pkgsrc/print/cups-base/patches/Attic/patch-man-cups-files.conf.man.in 2019/11/17 21:22:03 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-man-cups-files.conf.man.in,v 1.2 2018/06/11 10:04:25 adam Exp $ 1$NetBSD: patch-man-cups-files.conf.man.in,v 1.3 2019/11/17 21:22:03 leot Exp $
2 2
3Add a PidFile configuration directive to write a PID file. 3Add a PidFile configuration directive to write a PID file.
4 4
5--- man/cups-files.conf.man.in.orig 2018-06-05 16:06:54.000000000 +0000 5--- man/cups-files.conf.5.orig 2018-06-05 16:06:54.000000000 +0000
6+++ man/cups-files.conf.man.in 6+++ man/cups-files.conf.5
7@@ -157,6 +157,12 @@ The server name may be included in filen 7@@ -157,6 +157,12 @@ The server name may be included in filen
8  8
9 .fi 9 .fi
10 The default is "/var/log/cups/page_log". 10 The default is "/var/log/cups/page_log".
11+.\"#PidFile 11+.\"#PidFile
12+.TP 5 12+.TP 5
13+\fBPidFile \fIpath\fR 13+\fBPidFile \fIpath\fR
14+Specifies the file the CUPS scheduler writes its PID to 14+Specifies the file the CUPS scheduler writes its PID to
15+(set to an empty value to disable the PID file). 15+(set to an empty value to disable the PID file).
16+The default is usually "/var/run/cups/cupsd.pid". 16+The default is usually "/var/run/cups/cupsd.pid".
17 .\"#PassEnv 17 .\"#PassEnv
18 .TP 5 18 .TP 5
19 \fBPassEnv \fIvariable \fR[ ... \fIvariable \fR] 19 \fBPassEnv \fIvariable \fR[ ... \fIvariable \fR]