Bump versions.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12068 a1ca3aef-8c08-0410-bb20-df032aa958be

.gitignore

@@ -0,0 +1,144 @@
+*.a
+*.cgi
+*.dylib
+*.gz
+*.o
+*.so
+*.so.*
+.buildrev
+autom4te.cache
+config.h
+config.log
+config.status
+cups-config
+Makedefs
+backend/dnssd
+backend/http
+backend/ipp
+backend/lpd
+backend/mdns
+backend/snmp
+backend/socket
+backend/test1284
+backend/testbackend
+backend/testsupplies
+backend/usb
+berkeley/lpc
+berkeley/lpq
+berkeley/lpr
+berkeley/lprm
+cgi-bin/testcgi
+cgi-bin/testhi
+cgi-bin/testhi.index
+cgi-bin/testtemplate
+conf/cups-files.conf
+conf/cupsd.conf
+conf/mime.convs
+conf/pam.std
+conf/snmp.conf
+cups/locale/
+cups/test.pwg
+cups/testadmin
+cups/testarray
+cups/testcache
+cups/testconflicts
+cups/testcups
+cups/testdest
+cups/testfile
+cups/testhttp
+cups/testi18n
+cups/testipp
+cups/testlang
+cups/testoptions
+cups/testppd
+cups/testpwg
+cups/testsnmp
+cups/tlscheck
+desktop/cups.desktop
+doc/index.html
+filter/commandtops
+filter/gziptoany
+filter/pstops
+filter/rasterbench
+filter/rastertoepson
+filter/rastertohp
+filter/rastertolabel
+filter/rastertopwg
+filter/test.raster
+filter/testraster
+locale/checkpo
+locale/po2strings
+locale/strings2po
+man/client.conf.man
+man/cups-files.conf.man
+man/cups-lpd.man
+man/cups-snmp.man
+man/cupsaddsmb.man
+man/cupsd.conf.man
+man/cupsd.man
+man/lpoptions.man
+man/mantohtml
+monitor/bcp
+monitor/tbcp
+notifier/mailto
+notifier/rss
+notifier/testnotify
+packaging/cups.list
+patches
+ppdc/genstrings
+ppdc/ppd/
+ppdc/ppd2/
+ppdc/ppdc
+ppdc/ppdc-static
+ppdc/ppdhtml
+ppdc/ppdi
+ppdc/ppdi-static
+ppdc/ppdmerge
+ppdc/ppdpo
+ppdc/sample-import.drv
+ppdc/sample.c
+ppdc/testcatalog
+scheduler/convert
+scheduler/cups-deviced
+scheduler/cups-driverd
+scheduler/cups-exec
+scheduler/cups-lpd
+scheduler/cups-lpd.xinetd
+scheduler/cups.sh
+scheduler/cups.xml
+scheduler/cupsd
+scheduler/cupsfilter
+scheduler/org.cups.cups-lpd.plist
+scheduler/org.cups.cups-lpdAT.service
+scheduler/org.cups.cupsd.path
+scheduler/org.cups.cupsd.service
+scheduler/org.cups.cupsd.socket
+scheduler/testlpd
+scheduler/testmime
+scheduler/testspeed
+scheduler/testsub
+systemv/accept
+systemv/cancel
+systemv/cupsaccept
+systemv/cupsaddsmb
+systemv/cupsctl
+systemv/cupsdisable
+systemv/cupsenable
+systemv/cupsreject
+systemv/cupstestdsc
+systemv/cupstestppd
+systemv/lp
+systemv/lpadmin
+systemv/lpinfo
+systemv/lpmove
+systemv/lpoptions
+systemv/lpstat
+systemv/reject
+templates/header.tmpl
+test/cups-str-*.html
+test/error_log-*
+test/ippfind
+test/ippfind-static
+test/ippserver
+test/ipptool
+test/ipptool-static

CHANGES.txt

@@ -1,23 +1,39 @@
-CHANGES.txt - 2.1.3 - 2016-02-05
+CHANGES.txt - 2.1.4 - 2016-06-14
 --------------------------------
 
+CHANGES IN CUPS V2.1.4
+
+	- Fixed reporting of 1284 Device IDs (Issue #3835, PR #3836)
+	- Fixed printing of multiple files to raw queues (Issue #4782)
+	- The scheduler did not implement the Hold-New-Jobs opertion correctly
+	  (Issue #4767)
+	- The ipptool program truncated values at 8k (Issue #4786)
+	- The ipptool program did not correctly report uriScheme values in plist
+	  output (Issue #4785)
+	- The cups-lpd mini-daemon incorrectly included the document-name
+	  attribute when creating a job.  It should only be included when
+	  sending a job (Issue #4790)
+	- USB quirk updates (Issue #4778, Issue #4789)
+	- Documentation update (Issue #4772)
+
+
 CHANGES IN CUPS V2.1.3
 
 	- The default password function did not work on some platforms
-	  (STR #4750)
+	  (Issue #4750)
 	- The scheduler should not exit under memory pressure
 	  (<rdar://problem/23255001>)
 	- The EPL2 and ZPL sample drivers did not properly support the CutMedia
 	  option.
 	- Pending subscriptions would prevent the scheduler from idle exiting
-	  (STR #4754)
+	  (Issue #4754)
 	- Fixed some issues in ipptool for skipped tests
 	  (<rdar://problem/24137160>)
 	- The "lp -H resume" command did not reset the "job-state-reasons"
-	  attribute value (STR #4752)
+	  attribute value (Issue #4752)
 	- The scheduler did not allow access to resource files (icons, etc.)
-	  when the web interface was disabled (STR #4755)
-	- Localization fix (STR #4756)
+	  when the web interface was disabled (Issue #4755)
+	- Localization fix (Issue #4756)
 
 
 CHANGES IN CUPS V2.1.2
@@ -39,56 +55,56 @@ CHANGES IN CUPS V2.1.1
 	  <rdar://problem/23135122>, <rdar://problem/23135207>,
 	  <rdar://problem/23144290>, <rdar://problem/23144358>,
 	  <rdar://problem/23144461>)
-	- The cupsGetPPD* functions did not work with IPP printers (STR #4725)
+	- The cupsGetPPD* functions did not work with IPP printers (Issue #4725)
 	- Some older HP LaserJet printers need a delayed close when printing
-	  using the libusb-based USB backend (STR #4549)
+	  using the libusb-based USB backend (Issue #4549)
 	- The libusb-based USB backend did not unload the kernel usblp module
 	  if it was preventing the backend from accessing the printer
-	  (STR #4707)
+	  (Issue #4707)
 	- Current Primera printers were incorrectly reported as Fargo printers
-	  (STR #4708)
+	  (Issue #4708)
 	- The IPP backend did not always handle jobs getting canceled at the
 	  printer (<rdar://problem/22716820>)
-	- Scheduler logging change (STR #4728)
-	- Added USB quirk for Canon MP530 (STR #4730)
+	- Scheduler logging change (Issue #4728)
+	- Added USB quirk for Canon MP530 (Issue #4730)
 	- The scheduler did not deliver job notifications for jobs submitted to
-	  classes (STR #4733)
+	  classes (Issue #4733)
 	- Changing the printer-is-shared value for a remote queue did not
-	  produce an error (STR #4738)
+	  produce an error (Issue #4738)
 	- The IPP backend incorrectly included the job-password attribute in
 	  Validate-Job requests (<rdar://problem/23531939>)
-	- Updated localizations (STR #4709)
+	- Updated localizations (Issue #4709)
 
 
 CHANGES IN CUPS V2.1.0
 
-	- Fixed more scheduler crash bugs in the new logging code (STR #4687,
-	  STR #4690)
+	- Fixed more scheduler crash bugs in the new logging code (Issue #4687,
+	  Issue #4690)
 	- The scheduler did not use the ConfigFilePerm setting when copying PPD
-	  files or interface scripts attached to a request (STR #4703)
+	  files or interface scripts attached to a request (Issue #4703)
 	- Now support new Chinese locale IDs and their correct fallback locales
 	  (<rdar://problem/22086642>, <rdar://problem/22130168>)
 	- "make check" incorrectly reported an expectation of 18 warning
-	  messages when 8 were expected (STR #4684)
-	- The new PDF file type rule did not work (STR #4692)
+	  messages when 8 were expected (Issue #4684)
+	- The new PDF file type rule did not work (Issue #4692)
 	- The scheduler did not update the jobs.cache file when job files were
-	  expired (STR #4706)
-	- Fixed some configure script issues (STR #4694, STR #4695, STR #4698)
-	- Documentation updates (STR #4691, STR #4693)
+	  expired (Issue #4706)
+	- Fixed some configure script issues (Issue #4694, Issue #4695, Issue #4698)
+	- Documentation updates (Issue #4691, Issue #4693)
 
 
 CHANGES IN CUPS V2.1rc1
 
 	- Added support for 3D printers (basic types only, no built-in filters)
 	  based on PWG white paper.
-	- Fixed bugs in the new journald support (STR #4655, STR #4658,
-	  STR #4661)
-	- Fixed domain socket support on Linux (STR #4679)
-	- Fixed signal handlers in the dnssd and usb backends (STR #4671)
+	- Fixed bugs in the new journald support (Issue #4655, Issue #4658,
+	  Issue #4661)
+	- Fixed domain socket support on Linux (Issue #4679)
+	- Fixed signal handlers in the dnssd and usb backends (Issue #4671)
 	- <Limit All> in <Policy> sections now applies to all operations when
-	  used by itself (STR #4659)
-	- Configure script changes for systemd support (STR #4669)
-	- Updated autoconf sources to use newer form of AC_INIT (STR #4664)
+	  used by itself (Issue #4659)
+	- Configure script changes for systemd support (Issue #4669)
+	- Updated autoconf sources to use newer form of AC_INIT (Issue #4664)
 
 
 CHANGES IN CUPS V2.1b1
@@ -103,30 +119,30 @@ CHANGES IN CUPS V2.1b1
 	- The IPP backend now updates the cupsMandatory values when the printer
 	  configuration changes (<rdar://problem/18126570>)
 	- No longer install banner files since third-party banner filters now
-	  supply their own (STR #4518)
+	  supply their own (Issue #4518)
 	- Added support for EXPECT-ALL directive in ipptool test files
-	  (STR #4469)
+	  (Issue #4469)
 	- Added support for WITH-VALUE-FROM predicate in ipptool test files
-	  (STR #4470)
+	  (Issue #4470)
 	- The scheduler no longer listens on the loopback interface unless the
 	  web interface or printer sharing are enabled
 	  (<rdar://problem/9136448>)
-	- Added a PPD generator for IPP Everywhere printers (STR #4258)
+	- Added a PPD generator for IPP Everywhere printers (Issue #4258)
 	- Now install "default" versions of more configuration files
 	  (<rdar://problem/19024491>)
 	- The cupstestppd program did not handle "maxsize(nnn)" entries in
 	  cupsFilter/cupsFilter2 values (<rdar://problem/18974858>)
 	- The scheduler now checks the return value of rename() calls
-	  (STR #4589)
+	  (Issue #4589)
 	- The scheduler now validates ErrorPolicy values in config files
-	  (STR #4591)
-	- Long cookies caused the web interface to stop working (STR #4619)
+	  (Issue #4591)
+	- Long cookies caused the web interface to stop working (Issue #4619)
 	- Added SSLOptions values to allow Diffie-Hellman key exchange and
 	  disable TLS/1.0 support.
 	- Updated the scheduler to support more IPP Everywhere attributes
-	  (STR #4630)
+	  (Issue #4630)
 	- The scheduler now supports advanced ASL and journald logging when
-	  "syslog" output is configured (STR #4474)
+	  "syslog" output is configured (Issue #4474)
 	- The scheduler now supports logging to stderr when running in the
-	  foreground (STR #4505)
+	  foreground (Issue #4505)
 

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.1.3 - 2016-02-05
+INSTALL - CUPS v2.1.4 - 2016-06-14
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v2.1.3 - 2016-02-05
+README - CUPS v2.1.4 - 2016-06-14
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
@@ -140,7 +140,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2015 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2016 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

backend/dnssd.c

@@ -1194,9 +1194,9 @@ query_callback(
       snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
 	       make_and_model, model);
     else if (!_cups_strncasecmp(model, "designjet ", 10))
-      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
+      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;", model + 10);
     else if (!_cups_strncasecmp(model, "stylus ", 7))
-      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
+      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;", model + 7);
     else if ((ptr = strchr(model, ' ')) != NULL)
     {
      /*
@@ -1206,7 +1206,7 @@ query_callback(
       memcpy(make_and_model, model, (size_t)(ptr - model));
       make_and_model[ptr - model] = '\0';
 
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
 	       make_and_model, ptr + 1);
     }
   }

backend/org.cups.usb-quirks

@@ -52,67 +52,67 @@
 # NEC Picty800 (HP OEM)
 0x0409 0xf1be unidir
 
-# Lexmark International, Inc. (e250d), https://bugs.launchpad.net/bugs/1084164
+# Lexmark International, Inc. (e250d) (https://bugs.launchpad.net/bugs/1084164)
 0x043d 0x00f3 no-reattach
 
 # Kyocera Mita FS 820, by zut <kernel@zut.de>
 0x0482 0x0010 unidir
 
-# Canon, Inc. PIXMA iP6000D Printer, https://bugs.launchpad.net/bugs/1160638
+# Canon, Inc. PIXMA iP6000D Printer (https://bugs.launchpad.net/bugs/1160638)
 0x04a9 0x1095 unidir
 
-# Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155
+# Canon, Inc. PIXMA iP4200 Printer (Issue #4155)
 0x04a9 0x10a2 unidir
 
-# Canon, Inc. PIXMA iP4300 Printer, https://bugs.launchpad.net/bugs/1032385
+# Canon, Inc. PIXMA iP4300 Printer (https://bugs.launchpad.net/bugs/1032385)
 0x04a9 0x10b6 unidir
 
-# Canon, Inc. MP210 https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53
+# Canon, Inc. MP210 (https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53)
 0x04a9 0x1721 unidir
 
-# Canon, Inc. MP500 Printer, https://bugs.launchpad.net/bugs/1032456
+# Canon, Inc. MP500 Printer (https://bugs.launchpad.net/bugs/1032456)
 0x04a9 0x170c unidir
 
-# Canon, Inc. MP510 Printer, https://bugs.launchpad.net/bugs/1050009
+# Canon, Inc. MP510 Printer (https://bugs.launchpad.net/bugs/1050009)
 0x04a9 0x1717 unidir
 
-# Canon, Inc. MP550 Printer, http://www.cups.org/str.php?L4155
+# Canon, Inc. MP550 Printer (Issue #4155)
 0x04a9 0x173d unidir
 
-# Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155
+# Canon, Inc. MP560 Printer (Issue #4155)
 0x04a9 0x173e unidir
 
-# Canon, Inc. MF4150 Printer, https://bugs.launchpad.net/bugs/1160638
+# Canon, Inc. MF4150 Printer (https://bugs.launchpad.net/bugs/1160638)
 0x04a9 0x26a3 no-reattach
 
-# Brother Industries, Ltd HL-1250 Laser Printer, https://bugs.debian.org/712512
+# Brother Industries, Ltd HL-1250 Laser Printer (https://bugs.debian.org/712512)
 0x04f9 0x0007 no-reattach
 
-# Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695
+# Brother Industries, Ltd HL-1430 Laser Printer (https://bugs.launchpad.net/bugs/1038695)
 0x04f9 0x001a no-reattach
 
-# Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253
+# Brother Industries, Ltd HL-1440 Laser Printer (https://bugs.launchpad.net/bugs/1000253)
 0x04f9 0x000d no-reattach unidir
 
-# Brother Industries, Ltd HL-1450 Laser Printer, https://bugs.launchpad.net/bugs/1000253
+# Brother Industries, Ltd HL-1450 Laser Printer (https://bugs.launchpad.net/bugs/1000253)
 0x04f9 0x000e no-reattach unidir
 
-# Oki Data Corp. Okipage 14ex Printer, https://bugs.launchpad.net/bugs/872483
+# Oki Data Corp. Okipage 14ex Printer (https://bugs.launchpad.net/bugs/872483)
 0x06bc 0x000b no-reattach
 
-# Oki Data Corp. B410d, https://bugs.launchpad.net/bugs/872483
+# Oki Data Corp. B410d (https://bugs.launchpad.net/bugs/872483)
 0x06bc 0x01c7 no-reattach
 
-# Seiko Epson Corp. Stylus Color 740 / Photo 750, http://bugs.debian.org/697970
+# Seiko Epson Corp. Stylus Color 740 / Photo 750 (http://bugs.debian.org/697970)
 0x04b8 0x0001 no-reattach unidir
 
-# Seiko Epson Corp. Stylus Color 670, https://bugs.launchpad.net/bugs/872483
+# Seiko Epson Corp. Stylus Color 670 (https://bugs.launchpad.net/bugs/872483)
 0x04b8 0x0005 no-reattach
 
 # Seiko Epson Receipt Printer M129C
 0x04b8 0x0202 vendor-class
 
-# Prolific Technology, Inc. PL2305 Parallel Port (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485
+# Prolific Technology, Inc. PL2305 Parallel Port (USB -> Parallel adapter) (https://bugs.launchpad.net/bugs/987485)
 0x067b 0x2305 no-reattach soft-reset unidir
 
 # Xerox Phaser 3124 https://bugzilla.redhat.com/show_bug.cgi?id=867392
@@ -121,13 +121,13 @@
 # Xerox WorkCentre 3210 https://bugs.launchpad.net/bugs/1102470
 0x0924 0x4293 no-reattach
 
-# QinHeng Electronics CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253
+# QinHeng Electronics CH340S (USB -> Parallel adapter) (https://bugs.launchpad.net/bugs/1000253)
 0x1a86 0x7584 no-reattach
 
-# All Samsung devices, https://bugs.launchpad.net/bugs/1032456
+# All Samsung devices (https://bugs.launchpad.net/bugs/1032456)
 0x04e8 soft-reset
 
-# All Zebra devices, https://bugs.launchpad.net/bugs/1001028
+# All Zebra devices (https://bugs.launchpad.net/bugs/1001028)
 0x0a5f unidir
 
 # Canon CP-10
@@ -217,27 +217,33 @@
 # Lexmark E238 (<rdar://problem/14493054>)
 0x043d 0x00d7 no-reattach
 
-# Lexmark E238 (STR #4448)
+# Lexmark E238 (Issue #4448)
 0x043d 0x009a no-reattach
 
-# Canon MX310 (STR #4482)
+# Canon MX310 (Issue #4482)
 0x04a9 0x1728 unidir
 
-# Canon MX320 (STR #4482)
+# Canon MX320 (Issue #4482)
 0x04A9 0x1736 unidir
 
-# All Intermec devices (STR #4553)
+# All Intermec devices (Issue #4553)
 0x067e no-reattach
 
-# HP LaserJet 1150 (STR #4549)
+# HP LaserJet 1150 (Issue #4549)
 0x03f0 0x0f17 delay-close
 
-# HP LaserJet 1300 (STR #4549)
+# HP LaserJet 1300 (Issue #4549)
 0x03f0 0x1017 delay-close
 0x03f0 0x1117 delay-close
 
-# HP LaserJet 1320 (STR #4549)
+# HP LaserJet 1320 (Issue #4549)
 0x03f0 0x1d17 delay-close
 
 # Canon, Inc. MP530 Printer
 0x04a9 0x1712 unidir
+
+# Xerox WorkCentre 3220 (https://bugs.launchpad.net/bugs/1406203, Issue #4789)
+0x0924 0x4294 no-reattach
+
+# Lexmark C540n (Issue #4778)
+0x043d 0x0139 no-reattach

config-scripts/cups-common.m4

@@ -17,7 +17,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION=2.1.3
+CUPS_VERSION="AC_PACKAGE_VERSION"
 
 case "$CUPS_VERSION" in
 	*svn)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CUPS 2.1.3.
+# Generated by GNU Autoconf 2.68 for CUPS 2.1.4.
 #
 # Report bugs to <https://www.cups.org/str.php>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CUPS'
 PACKAGE_TARNAME='cups'
-PACKAGE_VERSION='2.1.3'
-PACKAGE_STRING='CUPS 2.1.3'
+PACKAGE_VERSION='2.1.4'
+PACKAGE_STRING='CUPS 2.1.4'
 PACKAGE_BUGREPORT='https://www.cups.org/str.php'
 PACKAGE_URL='https://www.cups.org/'
 
@@ -1447,7 +1447,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CUPS 2.1.3 to adapt to many kinds of systems.
+\`configure' configures CUPS 2.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1508,7 +1508,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CUPS 2.1.3:";;
+     short | recursive ) echo "Configuration of CUPS 2.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1687,7 +1687,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CUPS configure 2.1.3
+CUPS configure 2.1.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2151,7 +2151,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CUPS $as_me 2.1.3, which was
+It was created by CUPS $as_me 2.1.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2526,7 +2526,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION=2.1.3
+CUPS_VERSION="2.1.4"
 
 case "$CUPS_VERSION" in
 	*svn)
@@ -10765,7 +10765,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CUPS $as_me 2.1.3, which was
+This file was extended by CUPS $as_me 2.1.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10828,7 +10828,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CUPS config.status 2.1.3
+CUPS config.status 2.1.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.ac 13031 2016-01-04 14:43:04Z msweet $"
+dnl "$Id: configure.ac 13087 2016-02-12 18:53:24Z msweet $"
 dnl
 dnl Configuration script for CUPS.
 dnl
@@ -17,7 +17,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.1.3], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.1.4], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
@@ -95,5 +95,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.ac 13031 2016-01-04 14:43:04Z msweet $".
+dnl End of "$Id: configure.ac 13087 2016-02-12 18:53:24Z msweet $".
 dnl

cups/cups.h

@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 13031 2016-01-04 14:43:04Z msweet $"
+ * "$Id: cups.h 13087 2016-02-12 18:53:24Z msweet $"
  *
  * API definitions for CUPS.
  *
@@ -58,10 +58,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			2.0103
+#  define CUPS_VERSION			2.0104
 #  define CUPS_VERSION_MAJOR		2
 #  define CUPS_VERSION_MINOR		1
-#  define CUPS_VERSION_PATCH		3
+#  define CUPS_VERSION_PATCH		4
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
@@ -636,5 +636,5 @@ extern int		cupsSetServerCredentials(const char *path, const char *common_name,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 13031 2016-01-04 14:43:04Z msweet $".
+ * End of "$Id: cups.h 13087 2016-02-12 18:53:24Z msweet $".
  */

doc/help/man-cupsctl.html

@@ -45,15 +45,15 @@ The following options are recognized:
 <dd style="margin-left: 5.0em">Specifies an alternate username to use when authenticating with the scheduler.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies the server address.
-<dt><b>--fR[fBno-fR]fBdebug-logging</b>
+<dt><b>--</b>[<b>no-</b>]<b>debug-logging</b>
 <dd style="margin-left: 5.0em">Enables (disables) debug logging to the <i>error_log</i> file.
-<dt><b>--fR[fBno-fR]fBremote-admin</b>
+<dt><b>--</b>[<b>no-</b>]<b>remote-admin</b>
 <dd style="margin-left: 5.0em">Enables (disables) remote administration.
-<dt><b>--fR[fBno-fR]fBremote-any</b>
+<dt><b>--</b>[<b>no-</b>]<b>remote-any</b>
 <dd style="margin-left: 5.0em">Enables (disables) printing from any address, e.g., the Internet.
-<dt><b>--fR[fBno-fR]fBshare-printers</b>
+<dt><b>--</b>[<b>no-</b>]<b>share-printers</b>
 <dd style="margin-left: 5.0em">Enables (disables) sharing of local printers with other computers.
-<dt><b>--fR[fBno-fR]fBuser-cancel-any</b>
+<dt><b>--</b>[<b>no-</b>]<b>user-cancel-any</b>
 <dd style="margin-left: 5.0em">Allows (prevents) users to cancel jobs owned by others.
 </dl>
 <h2 class="title"><a name="EXAMPLES">Examples</a></h2>

doc/help/man-cupsd.html

@@ -13,7 +13,7 @@ cupsd - cups scheduler
 <b>cupsd</b>
 [
 <b>-c</b>
-<i>config-file</i>
+<i>cupsd.conf</i>
 ] [
 <b>-f</b>
 ] [
@@ -23,17 +23,20 @@ cupsd - cups scheduler
 ] [
 <b>-l</b>
 ] [
+<b>-s</b>
+<i>cups-files.conf</i>
+] [
 <b>-t</b>
 ]
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 <b>cupsd</b>
-is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1. If no options are specified on the command-line then the default configuration file
+is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1, and supports most of the requirements for IPP Everywhere. If no options are specified on the command-line then the default configuration file
 <i>/etc/cups/cupsd.conf</i>
 will be used.
 <h2 class="title"><a name="OPTIONS">Options</a></h2>
 <dl class="man">
-<dt><b>-c</b><i> config-file</i>
-<dd style="margin-left: 5.0em">Uses the named configuration file.
+<dt><b>-c</b><i> cupsd.conf</i>
+<dd style="margin-left: 5.0em">Uses the named cupsd.conf configuration file.
 <dt><b>-f</b>
 <dd style="margin-left: 5.0em">Run
 <b>cupsd</b>
@@ -54,6 +57,8 @@ when it is run from
 <b>launchd</b>(8)
 or
 <b>systemd</b>(8).
+<dt><b>-s</b><i> cups-files.conf</i>
+<dd style="margin-left: 5.0em">Uses the named cups-files.conf configuration file.
 <dt><b>-t</b>
 <dd style="margin-left: 5.0em">Test the configuration file for syntax errors.
 </dl>
@@ -99,6 +104,7 @@ in the foreground with a test configuration file called
 <a href="man-backend.html?TOPIC=Man+Pages"><b>backend</b>(7),</a>
 <a href="man-classes.conf.html?TOPIC=Man+Pages"><b>classes.conf</b>(5),</a>
 <a href="man-cups.html?TOPIC=Man+Pages"><b>cups</b>(1),</a>
+<a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
 <a href="man-cups-lpd.html?TOPIC=Man+Pages"><b>cups-lpd</b>(8),</a>
 <a href="man-cupsd.conf.html?TOPIC=Man+Pages"><b>cupsd.conf</b>(5),</a>
 <a href="man-cupsd-helper.html?TOPIC=Man+Pages"><b>cupsd-helper</b>(8),</a>
@@ -111,7 +117,7 @@ in the foreground with a test configuration file called
 <b>systemd</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2015 by Apple Inc.
+Copyright &copy; 2007-2016 by Apple Inc.
 
 </body>
 </html>

doc/help/man-ppdcfile.html

@@ -45,7 +45,7 @@ This man page provides a quick reference to the supported keywords and should be
 <dd style="margin-left: 5.0em"><dt><b>Darkness </b><i>temperature </i><b>"</b><i>name</i><b>/</b><i>text</i><b>"</b>
 <dd style="margin-left: 5.0em"><dt><b>DriverType </b><i>type</i>
 <dd style="margin-left: 5.0em"><dt><b>Duplex </b><i>type</i>
-<dd style="margin-left: 5.0em"><dt><b>Filter Imime-type cost program</b>
+<dd style="margin-left: 5.0em"><dt><b>Filter </b><i>mime-type cost program</i>
 <dd style="margin-left: 5.0em"><dt><b>Finishing </b><i>name</i>
 <dd style="margin-left: 5.0em"><dt><b>Finishing "</b><i>name</i><b>/</b><i>text</i><b>"</b>
 <dd style="margin-left: 5.0em"><dt><b>Font *</b>

doc/pt_BR/index.html.in

@@ -0,0 +1,107 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>Home - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+</HEAD>
+<BODY>
+<TABLE CLASS="page" SUMMARY="{title}">
+<TR><TD CLASS="body">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
+<TR HEIGHT="36">
+<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
+SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
+<TD CLASS="sel"><A HREF="/">&nbsp;&nbsp;In&iacute;cio&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/admin">&nbsp;&nbsp;Administra&ccedil;&atilde;o&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/help/">&nbsp;&nbsp;Ajuda&nbsp;online&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/jobs/">&nbsp;&nbsp;Trabalhos&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel"><A HREF="/printers/">&nbsp;&nbsp;Impressoras&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Procurar ajuda"
+AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+</TABLE>
+
+<TABLE CLASS="indent" SUMMARY="">
+<TR><TD STYLE="padding-right: 20px;">
+
+<H1>CUPS @CUPS_VERSION@</H1>
+
+<P>CUPS &eacute; o sistema de impress&atilde;o de c&oacute;digo aberto e baseado em padr&otilde;es desenvolvido pela
+<A HREF="http://www.apple.com/">Apple Inc.</A> para o OS<SUP>&reg;</SUP> X e 
+outros sistemas operacionais similares ao UNIX<SUP>&reg;</SUP>.</P>
+
+</TD>
+<TD><A HREF="http://www.cups.org/"><IMG SRC="images/cups-icon.png" WIDTH="128"
+HEIGHT="128" ALT="CUPS"></A></TD>
+</TR>
+</TABLE>
+
+<TABLE CLASS="indent" SUMMARY="">
+<TR><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-right: 20px;">
+
+<H2>CUPS para usu&aacute;rios</H2>
+
+<P><A HREF="help/overview.html">Vis&atilde;o geral do CUPS</A></P>
+
+<P><A HREF="help/options.html">Impress&atilde;o e op&ccedil;&otilde;es em linha de comando</A></P>
+
+<P><A HREF="help/whatsnew.html">O que h&aacute; de novo no CUPS 1.7</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">F&oacute;rum de usu&aacute;rios</A></P>
+
+</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;">
+
+<H2>CUPS para administradores</H2>
+
+<P><A HREF="admin">Adicionar impressoras e classes</A></P>
+
+<P><A HREF="help/policies.html">Gerenciar pol&iacute;ticas de opera&ccedil;&atilde;o</A></P>
+
+<P><A HREF="help/accounting.html">B&aacute;sico de contabilidade de impress&atilde;o</A></P>
+
+<P><A HREF="help/security.html">Seguran&ccedil;a do servidor</A></P>
+
+<P><A HREF="help/kerberos.html">Usar autentica&ccedil;&atilde;o via kerberos</A></P>
+
+<P><A HREF="help/network.html">Usar impressoras de rede</A></P>
+
+<P><A HREF="help/ref-cupsd-conf.html">Refer&ecirc;ncia para o cupsd.conf</A></P>
+
+<P><A HREF="http://www.cups.org/ppd.php">Encontrar drivers de impressora</A></P>
+
+</TD><TD VALIGN="top" STYLE="padding-left: 20px;">
+
+<H2>CUPS para desenvolvedores</H2>
+
+<P><A HREF="help/api-overview.html">Introdu&ccedil;&atilde;o &agrave; programa&ccedil;&atilde;o do CUPS</A></P>
+
+<P><A HREF="help/api-cups.html">API do CUPS</A></P>
+
+<P><A HREF="help/api-filter.html">Programa&ccedil;&atilde;o de filtros e retaguarda</A></P>
+
+<P><A HREF="help/api-httpipp.html">APIs HTTP e IPP</A></P>
+
+<P><A HREF="help/api-ppd.html">API PPD</A></P>
+
+<P><A HREF="help/api-raster.html">API de rasteriza&ccedil;&atilde;o</A></P>
+
+<P><A HREF="help/ref-ppdcfile.html">Refer&ecirc;ncia para o compilador de arquivos de informa&ccedil;&atilde;o de driver PPD</A></P>
+
+<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">F&oacute;rum de desenvolvedores</A></P>
+
+</TD></TR>
+</TABLE>
+
+</TD></TR>
+<TR><TD>&nbsp;</TD></TR>
+<TR><TD CLASS="trailer">CUPS e o logo do CUPS s&atilde;o marcas registradas de 
+<A HREF="http://www.apple.com">Apple Inc.</A> Copyright 2007-2014 Apple
+Inc. Todos os direitos reservados.</TD></TR>
+</TABLE>
+</BODY>
+</HTML>

everywhere/README.txt

@@ -0,0 +1,65 @@
+README.txt - 2014-08-28
+-----------------------
+
+INTRODUCTION
+
+    This directory contains the IPP Everywhere Printer Self-Certification tools.
+
+    In addition to the files in this directory, you must also download and
+    extract one or more PWG Raster Format file archives from:
+
+      http://ftp.pwg.org/pub/pwg/ipp/examples/
+
+    These archives are used for the Document Data tests.
+
+
+CONTENTS
+
+    Scripts for running the self-certification tests:
+
+      bonjour-tests.bat   Bonjour Tests for Windows
+      bonjour-tests.sh    Bonjour Tests for Linux and OS X
+
+      ipp-tests.bat       IPP Tests for Windows
+      ipp-tests.sh        IPP Tests for Linux and OS X
+
+      document-tests.bat  Document Data Tests for Windows
+      document-tests.sh   Document Data Tests for Linux and OS X
+
+    Tools:
+
+      ippfind             Tool for finding printers with Bonjour/DNS-SD
+      ippserver           Sample IPP server, useful for testing
+      ipptool             IPP test tool
+
+    Documentation:
+
+      LICENSE.txt         CUPS software license
+      man-*.html          HTML documentation for the tools
+      README.txt          This README file
+
+
+GETTING SUPPORT AND OTHER RESOURCES
+
+    The IPP Everywhere home page provides access to all information relevant to
+    IPP Eveywhere:
+
+      http://www.pwg.org/ipp/everywhere.html
+
+    The "ippeveselfcert@pwg.org" mailing list is used to discuss IPP Everywhere
+    Printer Self-Certification.  You can subscribe from the following page:
+
+      https://www.pwg.org/mailman/listinfo/ippeveselfcert
+
+
+LEGAL STUFF
+
+    These tools are Copyright 2014 by The Printer Working Group and Copyright
+    2007-2014 by Apple Inc.  CUPS and the CUPS logo are trademarks of Apple Inc.
+    PWG and IPP Everywhere are trademarks of the IEEE-ISTO.
+
+    CUPS is provided under the terms of version 2 of the GNU General Public
+    License and GNU Library General Public License. This program is distributed
+    in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the file "LICENSE.txt" for more information.

everywhere/bonjour-access-tests.test

@@ -0,0 +1,42 @@
+#
+# "$Id: bonjour-access-tests.test 12120 2014-08-27 20:52:33Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 2001-2006 by Easy Software Products. All rights reserved.
+#
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
+#
+# Usage:
+#
+#   ./ipptool -tI printer-uri bonjour-access-tests.test
+#
+
+FILE-ID "org.pwg.ipp-everywhere.20140826.bonjour"
+
+{
+	# The name of the test...
+	NAME "Validate access using Get-Printer-Attributes"
+
+	# The operation to use
+	OPERATION Get-Printer-Attributes
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+
+	# What statuses are OK?
+	STATUS successful-ok
+}
+
+#
+# End of "$Id: bonjour-access-tests.test 12120 2014-08-27 20:52:33Z msweet $".
+#

everywhere/bonjour-tests.bat

@@ -0,0 +1,391 @@
+@echo off
+::
+::  "$Id: bonjour-tests.bat 12249 2014-11-14 12:54:05Z msweet $"
+::
+:: IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
+::
+:: Copyright 2014 by The Printer Working Group.
+::
+:: This program may be copied and furnished to others, and derivative works
+:: that comment on, or otherwise explain it or assist in its implementation may
+:: be prepared, copied, published and distributed, in whole or in part, without
+:: restriction of any kind, provided that the above copyright notice and this
+:: paragraph are included on all such copies and derivative works.
+::
+:: The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+:: WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+:: WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+::
+:: Usage:
+::
+::   bonjour-tests.bat 'Printer Name'
+::
+
+set PLIST=%1 Bonjour Results.plist
+echo Sending output to "%PLIST%"...
+
+:: Write the standard XML plist header...
+echo ^<?xml version=^"1.0^" encoding=^"UTF-8^"?^> >"%PLIST%"
+echo ^<!DOCTYPE plist PUBLIC ^"-//Apple Computer//DTD PLIST 1.0//EN^" ^"http://www.apple.com/DTDs/PropertyList-1.0.dtd^"^> >>"%PLIST%"
+echo ^<plist version=^"1.0^"^> >>"%PLIST%"
+echo ^<dict^> >>"%PLIST%"
+echo ^<key^>Tests^</key^>^<array^> >>"%PLIST%"
+
+set total=0
+set pass=0
+set fail=0
+set skip=0
+
+:: B-1. IPP Browse test: Printers appear in a search for "_ipp._tcp,_print" services?
+set /a total+=1
+set <NUL /p="B-1. IPP Browse test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-1. IPP Browse test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+set result=FAIL
+ippfind _ipp._tcp,_print.local. --name "%1" --quiet && set result=PASS
+if "%result%" == "PASS" (
+	set /a pass+=1
+) else (
+	set /a fail+=1
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+) else (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-2. IPP TXT keys test: The IPP TXT record contains all required keys.
+set /a total+=1
+set <NUL /p="B-2. IPP TXT keys test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-2. IPP TXT keys test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+set result=FAIL
+ippfind "%1._ipp._tcp.local." --txt adminurl --txt pdl --txt rp --txt UUID --quiet && set result=PASS
+if "%result%" == "PASS" (
+	set /a pass+=1
+) else (
+	set /a fail+=1
+	echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo adminurl="{txt_adminurl}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo pdl="{txt_pdl}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo rp="{txt_rp}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo UUID="{txt_uuid}" ";" >>"%PLIST%"
+	echo ^</string^>^</array^> >>"%PLIST%"
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+
+	ippfind "%1._ipp._tcp.local." -x echo adminurl="{txt_adminurl}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo pdl="{txt_pdl}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo rp="{txt_rp}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo UUID="{txt_uuid}" ";"
+) else (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-3. IPP Resolve test: Printer responds to an IPP Get-Printer-Attributes request using the resolved hostname, port, and resource path.
+set /a total+=1
+set <NUL /p="B-3. IPP Resolve test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-3. IPP Resolve test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+set result=FAIL
+(ippfind "%1._ipp._tcp.local." --ls && set result=PASS) >nul:
+if "%result%" == "PASS" (
+	set /a pass+=1
+) else (
+	set /a fail+=1
+	echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." --ls >>"%PLIST%"
+	echo ^</string^>^</array^> >>"%PLIST%"
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+) else (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-4. IPP TXT values test: The IPP TXT record values match the reported IPP attribute values.
+set /a total+=1
+set <NUL /p="B-4. IPP TXT values test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-4. IPP TXT values test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+set result=FAIL
+ippfind "%1._ipp._tcp.local." --txt-adminurl ^^^(http:^|https:^)// --txt-pdl image/pwg-raster --txt-pdl image/jpeg --txt-rp ^^ipp/^(print^|print/[^^/]+^)$ --txt-UUID ^^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$ -x ipptool -q -d "ADMINURL={txt_adminurl}" -d "UUID={txt_uuid}" "{}" bonjour-value-tests.test ";" && set result=PASS
+if "%result%" == "PASS" (
+	set /a pass+=1
+) else (
+	set /a fail+=1
+	echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo adminurl="{txt_adminurl}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo pdl="{txt_pdl}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo rp="{txt_rp}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x echo UUID="{txt_uuid}" ";" >>"%PLIST%"
+	ippfind "%1._ipp._tcp.local." -x ipptool -t "{}" bonjour-value-tests.test ";" | findstr /r [TG][EO][DT]: >>"%PLIST%"
+	echo ^</string^>^</array^> >>"%PLIST%"
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+
+	ippfind "%1._ipp._tcp.local." -x echo adminurl="{txt_adminurl}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo pdl="{txt_pdl}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo rp="{txt_rp}" ";"
+	ippfind "%1._ipp._tcp.local." -x echo UUID="{txt_uuid}" ";"
+	ippfind "%1._ipp._tcp.local." -x ipptool -t "{}" bonjour-value-tests.test ";" | findstr /r [TG][EO][DT]:
+) else (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5. TLS tests: Performed only if TLS is supported
+set /a total+=1
+set <NUL /p="B-5. TLS tests: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5. TLS tests^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+set result=SKIP
+ippfind "%1._ipp._tcp.local." --txt tls --quiet && set result=PASS
+if "%result%" == "PASS" (
+	set /a pass+=1
+	set HAVE_TLS=1
+) else (
+	set /a skip+=1
+	set HAVE_TLS=0
+)
+
+echo %result%
+if "%result%" == "SKIP" (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+) else (
+	echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5.1 HTTP Upgrade test: Printer responds to an IPP Get-Printer-Attributes request after doing an HTTP Upgrade to TLS.
+set /a total+=1
+set <NUL /p="B-5.1 HTTP Upgrade test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5.1 HTTP Upgrade test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+if "%HAVE_TLS%" == "1" (
+	set result=FAIL
+	ippfind "%1._ipp._tcp.local." -x ipptool -E -q "{}" bonjour-access-tests.test ";" && set result=PASS
+	if "%result%" == "PASS" (
+		set /a pass+=1
+	) else (
+		set /a fail+=1
+		echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST"
+		ippfind "%1._ipp._tcp.local." -x ipptool -E -q "{}" bonjour-access-tests.test ";" >>"%PLIST%"
+		echo ^</string^>^</array^> >>"%PLIST%"
+	)
+) else (
+	set /a skip+=1
+	set result=SKIP
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+) else (
+	if "%result%" == "SKIP" (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+		echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+	) else (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	)
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5.2 IPPS Browse test: Printer appears in a search for "_ipps._tcp,_print" services.
+set /a total+=1
+set <NUL /p="B-5.2 IPPS Browse test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5.2 IPPS Browse test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+if "%HAVE_TLS%" == "1" (
+	set result=FAIL
+	ippfind _ipps._tcp,_print.local. --name "%1" --quiet && set result=PASS
+	if "%result%" == "PASS" (
+		set /a pass+=1
+	) else (
+		set /a fail+=1
+	)
+) else (
+	set /a skip+=1
+	set result=SKIP
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+) else (
+	if "%result%" == "SKIP" (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+		echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+	) else (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	)
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5.3 IPPS TXT keys test: The TXT record for IPPS contains all required keys
+set /a total+=1
+set <NUL /p="B-5.3 IPPS TXT keys test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5.3 IPPS TXT keys test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+if "%HAVE_TLS%" == "1" (
+	set result=FAIL
+	ippfind "%1._ipps._tcp.local." --txt adminurl --txt pdl --txt rp --txt TLS --txt UUID --quiet && set result=PASS
+	if "%result%" == "PASS" (
+		set /a pass+=1
+	) else (
+		set /a fail+=1
+	        echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo adminurl={txt_adminurl}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo pdl={txt_pdl}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo rp={txt_rp}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo TLS={txt_tls}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo UUID={txt_uuid}" ";" >>"%PLIST%"
+	        echo ^</string^>^</array^> >>"%PLIST%"
+	)
+) else (
+	set /a skip+=1
+	set result=SKIP
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+
+        ippfind "%1._ipps._tcp.local." -x echo     adminurl={txt_adminurl}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo     pdl={txt_pdl}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo     rp={txt_rp}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo     TLS={txt_tls}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo     UUID={txt_uuid}" ";"
+) else (
+	if "%result%" == "SKIP" (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+		echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+	) else (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	)
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5.4 IPPS Resolve test: Printer responds to an IPPS Get-Printer-Attributes request using the resolved hostname, port, and resource path.
+set /a total+=1
+set <NUL /p="B-5.4 IPPS Resolve test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5.4 IPPS Resolve test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+if "%HAVE_TLS%" == "1" (
+	set result=FAIL
+	(ippfind "%1._ipps._tcp.local." --ls && set result=PASS) >nul:
+	if "%result%" == "PASS" (
+		set /a pass+=1
+	) else (
+		set /a fail+=1
+		echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+		ippfind "%1._ipps._tcp.local." --ls >>"%PLIST%"
+		echo ^</string^>^</array^> >>"%PLIST%"
+	)
+) else (
+	set /a skip+=1
+	set result=SKIP
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+) else (
+	if "%result%" == "SKIP" (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+		echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+	) else (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	)
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: B-5.5 IPPS TXT values test: The TXT record values for IPPS match the reported IPPS attribute values.
+set /a total+=1
+set <NUL /p="B-5.5 IPPS TXT values test: "
+echo ^<dict^>^<key^>Name^</key^>^<string^>B-5.5 IPPS TXT values test^</string^> >>"%PLIST%"
+echo ^<key^>FileId^</key^>^<string^>org.pwg.ipp-everywhere.20140826.bonjour^</string^> >>"%PLIST%"
+
+if "%HAVE_TLS%" == "1" (
+	set result=FAIL
+	ippfind "%1._ipps._tcp.local." --txt-adminurl ^^^(http:^|https:^)// --txt-pdl image/pwg-raster --txt-pdl image/jpeg --txt-rp ^^ipp/^(print^|print/[^^/]+^)$ --txt-UUID ^^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$ -x ipptool -q "{}" bonjour-value-tests.test ";" && set result=PASS
+	if "%result%" == "PASS" (
+		set /a pass+=1
+	) else (
+		set /a fail+=1
+	        echo ^<key^>Errors^</key^>^<array^>^<string^> >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo adminurl="{txt_adminurl}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo pdl="{txt_pdl}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo rp="{txt_rp}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo TLS="{txt_tls}" ";" >>"%PLIST%"
+	        ippfind "%1._ipps._tcp.local." -x echo UUID="{txt_uuid}" ";" >>"%PLIST%"
+		ippfind "%1._ipps._tcp.local." -x ipptool -t "{}" bonjour-value-tests.test ";" | findstr /r [TG][EO][DT]: >>"%PLIST"
+	        echo ^</string^>^</array^> >>"%PLIST%"
+	)
+) else (
+	set /a skip+=1
+	set result=SKIP
+)
+
+echo %result%
+if "%result%" == "FAIL" (
+	echo ^<key^>Successful^</key^>^<false /^> >>"%PLIST%"
+
+        ippfind "%1._ipps._tcp.local." -x echo adminurl="{txt_adminurl}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo pdl="{txt_pdl}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo rp="{txt_rp}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo TLS="{txt_tls}" ";"
+        ippfind "%1._ipps._tcp.local." -x echo UUID="{txt_uuid}" ";"
+	ippfind "%1._ipp._tcp.local." -x ipptool -t "{}" bonjour-value-tests.test ";" | findstr /r [TG][EO][DT]:
+) else (
+	if "%result%" == "SKIP" (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+		echo ^<key^>Skipped^</key^>^<true /^> >>"%PLIST%"
+	) else (
+		echo ^<key^>Successful^</key^>^<true /^> >>"%PLIST%"
+	)
+)
+echo ^</dict^> >>"%PLIST%"
+
+:: Finish up...
+echo ^</array^> >>"%PLIST%"
+echo ^<key^>Successful^</key^> >>"%PLIST%"
+if %fail% gtr 0 (
+	echo ^<false /^> >>"%PLIST%"
+) else (
+	echo ^<true /^> >>"%PLIST%"
+)
+echo ^</dict^> >>"%PLIST%"
+echo ^</plist^> >>"%PLIST%"
+
+set /a score=%pass% + %skip%
+set /a score=100 * %score% / %total%
+echo Summary: %total% tests, %pass% passed, %fail% failed, %skip% skipped
+echo Score: %score%%%
+
+::
+:: End of "$Id: bonjour-tests.bat 12249 2014-11-14 12:54:05Z msweet $".
+::

everywhere/bonjour-tests.sh

@@ -0,0 +1,344 @@
+#!/bin/sh
+#
+#  "$Id: bonjour-tests.sh 12144 2014-09-02 13:40:27Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+#
+# This program may be copied and furnished to others, and derivative works
+# that comment on, or otherwise explain it or assist in its implementation may
+# be prepared, copied, published and distributed, in whole or in part, without
+# restriction of any kind, provided that the above copyright notice and this
+# paragraph are included on all such copies and derivative works.
+#
+# The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+# WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+# WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Usage:
+#
+#   ./bonjour-tests.sh "Printer Name"
+#
+
+if test -x ../test/ippfind-static; then
+	IPPFIND="../test/ippfind-static"
+elif test -x ./ippfind; then
+	IPPFIND="./ippfind"
+else
+	IPPFIND="ippfind"
+fi
+
+if test -x ../test/ipptool-static; then
+	IPPTOOL="../test/ipptool-static"
+elif test -x ./ipptool; then
+	IPPTOOL="./ipptool"
+else
+	IPPTOOL="ipptool"
+fi
+
+PLIST="$1 Bonjour Results.plist"
+
+#
+# Figure out the proper echo options...
+#
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+        ac_n=-n
+        ac_c=
+else
+        ac_n=
+        ac_c='\c'
+fi
+
+# Special case "_failN" name to show bad/missing TXT keys
+if test "$2" = _fail2 -o "$2" = _fail4 -o "$2" = _fail5.3 -o "$2" = _fail5.5; then
+	echo "FAIL"
+	echo "<key>Errors</key><array>" >>"$PLIST"
+	if test "${IPPFIND_TXT_ADMINURL:-NOTSET}" = NOTSET; then
+		echo "   adminurl is not set."
+		echo "<string>adminurl is not set.</string>" >>"$PLIST"
+	elif test "$2" = _fail4 -o "$2" = _fail5.5; then
+		case "$IPPFIND_TXT_ADMINURL" in
+			http://* | https://*)
+				;;
+			*)
+				echo "   adminurl has bad value '$IPPFIND_TXT_ADMINURL'."
+				echo "<string>adminurl has bad value '$IPPFIND_TXT_ADMINURL'.</string>" >>"$PLIST"
+				;;
+		esac
+	fi
+
+	if test "${IPPFIND_TXT_PDL:-NOTSET}" = NOTSET; then
+		echo "   pdl is not set."
+		echo "<string>pdl is not set.</string>" >>"$PLIST"
+	elif test "$2" = _fail4 -o "$2" = _fail5.5; then
+		case "$IPPFIND_TXT_PDL" in
+			*image/jpeg*)
+				;;
+			*)
+				echo "   pdl is missing image/jpeg: '$IPPFIND_TXT_PDL'"
+				echo "<string>pdl is missing image/jpeg: '$IPPFIND_TXT_PDL'.</string>" >>"$PLIST"
+				;;
+		esac
+
+		case "$IPPFIND_TXT_PDL" in
+			*image/pwg-raster*)
+				;;
+			*)
+				echo "   pdl is missing image/pwg-raster: '$IPPFIND_TXT_PDL'"
+				echo "<string>pdl is missing image/pwg-raster: '$IPPFIND_TXT_PDL'.</string>" >>"$PLIST"
+				;;
+		esac
+	fi
+
+	if test "${IPPFIND_TXT_RP:-NOTSET}" = NOTSET; then
+		echo "   rp is not set."
+		echo "<string>rp is not set.</string>" >>"$PLIST"
+	elif test "$2" = _fail4 -o "$2" = _fail5.5; then
+		case "$IPPFIND_TXT_RP" in
+			ipp/print | ipp/print/*)
+				;;
+			*)
+				echo "   rp has bad value '$IPPFIND_TXT_RP'"
+				echo "<string>rp has bad value '$IPPFIND_TXT_RP'.</string>" >>"$PLIST"
+				;;
+		esac
+	fi
+
+	if test "${IPPFIND_TXT_UUID:-NOTSET}" = NOTSET; then
+		echo "   UUID is not set."
+		echo "<string>UUID is not set.</string>" >>"$PLIST"
+	elif test "$2" = _fail4 -o "$2" = _fail5.5; then
+		case "$IPPFIND_TXT_UUID" in
+			[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]-[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])
+				;;
+			*)
+				echo "   UUID has bad value '$IPPFIND_TXT_UUID'"
+				echo "<string>UUID has bad value '$IPPFIND_TXT_UUID'.</string>" >>"$PLIST"
+				;;
+		esac
+	fi
+
+	if test "$2" = _fail4 -o "$2" = _fail5.5; then
+		$IPPTOOL -t $IPPFIND_SERVICE_URI bonjour-value-tests.test
+		$IPPTOOL -t $IPPFIND_SERVICE_URI bonjour-value-tests.test | egrep '(GOT|EXPECTED):' | sed -e '1,$s/^[ 	]*//' | awk '{print "<string>" $0 "</string>" }' >>"$PLIST"
+	fi
+
+	echo "</array>" >>"$PLIST"
+	echo "<key>Successful</key><false />" >>"$PLIST"
+	echo "</dict>" >>"$PLIST"
+
+	exit 0
+fi
+
+
+# Write the standard XML plist header...
+cat >"$PLIST" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>Tests</key><array>
+EOF
+
+total=0
+pass=0
+fail=0
+skip=0
+
+# start_test "name"
+start_test() {
+	total=`expr $total + 1`
+	echo $ac_n "$1: $ac_c"
+	echo "<dict><key>Name</key><string>$1</string>" >>"$PLIST"
+	echo "<key>FileId</key><string>org.pwg.ipp-everywhere.20140826.bonjour</string>" >>"$PLIST"
+}
+# end_test PASS/FAIL/SKIP
+end_test() {
+	echo $1
+	if test $1 = FAIL; then
+		echo "<key>Successful</key><false />" >>"$PLIST"
+	elif test $1 = SKIP; then
+		echo "<key>Successful</key><true />" >>"$PLIST"
+		echo "<key>Skipped</key><true />" >>"$PLIST"
+	else
+		echo "<key>Successful</key><true />" >>"$PLIST"
+	fi
+	echo "</dict>" >>"$PLIST"
+}
+
+# B-1. IPP Browse test: Printers appear in a search for "_ipp._tcp,_print" services?
+start_test "B-1. IPP Browse test"
+$IPPFIND _ipp._tcp,_print.local. --name "$1" --quiet
+if test $? = 0; then
+	pass=`expr $pass + 1`
+	end_test PASS
+else
+	fail=`expr $fail + 1`
+	end_test FAIL
+fi
+
+# B-2. IPP TXT keys test: The IPP TXT record contains all required keys.
+start_test "B-2. IPP TXT keys test"
+$IPPFIND "$1._ipp._tcp.local." --txt adminurl --txt pdl --txt rp --txt UUID --quiet
+if test $? = 0; then
+	pass=`expr $pass + 1`
+	end_test PASS
+else
+	fail=`expr $fail + 1`
+	$IPPFIND "$1._ipp._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail2 \;
+fi
+
+# B-3. IPP Resolve test: Printer responds to an IPP Get-Printer-Attributes request using the resolved hostname, port, and resource path.
+start_test "B-3. IPP Resolve test"
+$IPPFIND "$1._ipp._tcp.local." --ls >/dev/null
+if test $? = 0; then
+	pass=`expr $pass + 1`
+	end_test PASS
+else
+	fail=`expr $fail + 1`
+	echo "<key>Errors</key><array>" >>"$PLIST"
+	$IPPFIND "$1._ipp._tcp.local." --ls | awk '{ print "<string>" $0 "</string>" }' >>"$PLIST"
+	echo "</array>" >>"$PLIST"
+	end_test FAIL
+fi
+
+# B-4. IPP TXT values test: The IPP TXT record values match the reported IPP attribute values.
+start_test "B-4. IPP TXT values test"
+$IPPFIND "$1._ipp._tcp.local." --txt-adminurl '^(http:|https:)//' --txt-pdl 'image/pwg-raster' --txt-pdl 'image/jpeg' --txt-rp '^ipp/(print|print/[^/]+)$' --txt-UUID '^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$' -x $IPPTOOL -q '{}' bonjour-value-tests.test \;
+if test $? = 0; then
+	pass=`expr $pass + 1`
+	end_test PASS
+else
+	fail=`expr $fail + 1`
+	$IPPFIND "$1._ipp._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail4 \;
+fi
+
+# B-5. TLS tests: Performed only if TLS is supported
+start_test "B-5. TLS tests"
+$IPPFIND "$1._ipp._tcp.local." --txt tls --quiet
+if test $? = 0; then
+	pass=`expr $pass + 1`
+	HAVE_TLS=1
+	end_test PASS
+else
+	skip=`expr $skip + 1`
+	HAVE_TLS=0
+	end_test SKIP
+fi
+
+# B-5.1 HTTP Upgrade test: Printer responds to an IPP Get-Printer-Attributes request after doing an HTTP Upgrade to TLS.
+start_test "B-5.1 HTTP Upgrade test"
+if test $HAVE_TLS = 1; then
+	error=`$IPPFIND "$1._ipp._tcp.local." -x $IPPTOOL -E -q '{}' bonjour-access-tests.test \; 2>&1`
+	if test $? = 0; then
+		pass=`expr $pass + 1`
+		end_test PASS
+	else
+		fail=`expr $fail + 1`
+		echo "<key>Errors</key><array><string>$error</string></array>" >>"$PLIST"
+
+		end_test FAIL
+		echo "    $error"
+	fi
+else
+	skip=`expr $skip + 1`
+	end_test SKIP
+fi
+
+# B-5.2 IPPS Browse test: Printer appears in a search for "_ipps._tcp,_print" services.
+start_test "B-5.2 IPPS Browse test"
+if test $HAVE_TLS = 1; then
+	$IPPFIND _ipps._tcp,_print.local. --name "$1" --quiet
+	if test $? = 0; then
+		pass=`expr $pass + 1`
+		end_test PASS
+	else
+		fail=`expr $fail + 1`
+		end_test FAIL
+	fi
+else
+	skip=`expr $skip + 1`
+	end_test SKIP
+fi
+
+# B-5.3 IPPS TXT keys test: The TXT record for IPPS contains all required keys
+start_test "B-5.3 IPPS TXT keys test"
+if test $HAVE_TLS = 1; then
+	$IPPFIND "$1._ipps._tcp.local." --txt adminurl --txt pdl --txt rp --txt TLS --txt UUID --quiet
+	if test $? = 0; then
+		pass=`expr $pass + 1`
+		end_test PASS
+	else
+		fail=`expr $fail + 1`
+		$IPPFIND "$1._ipps._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail5.3 \;
+	fi
+else
+	skip=`expr $skip + 1`
+	end_test SKIP
+fi
+
+# B-5.4 IPPS Resolve test: Printer responds to an IPPS Get-Printer-Attributes request using the resolved hostname, port, and resource path.
+start_test "B-5.4 IPPS Resolve test"
+if test $HAVE_TLS = 1; then
+	$IPPFIND "$1._ipps._tcp.local." --ls >/dev/null
+	if test $? = 0; then
+		pass=`expr $pass + 1`
+		end_test PASS
+	else
+		fail=`expr $fail + 1`
+		echo "<key>Errors</key><array>" >>"$PLIST"
+		$IPPFIND "$1._ipps._tcp.local." --ls | awk '{ print "<string>" $0 "</string>" }' >>"$PLIST"
+		echo "</array>" >>"$PLIST"
+		end_test FAIL
+	fi
+else
+	skip=`expr $skip + 1`
+	end_test SKIP
+fi
+
+# B-5.5 IPPS TXT values test: The TXT record values for IPPS match the reported IPPS attribute values.
+start_test "B-5.5 IPPS TXT values test"
+if test $HAVE_TLS = 1; then
+	$IPPFIND "$1._ipps._tcp.local." --txt-adminurl '^(http:|https:)//' --txt-pdl 'image/pwg-raster' --txt-pdl 'image/jpeg' --txt-rp '^ipp/(print|print/[^/]+)$' --txt-UUID '^[0-9a-fA-F]{8,8}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{4,4}-[0-9a-fA-F]{12,12}$' -x $IPPTOOL -q '{}' bonjour-value-tests.test \;
+	if test $? = 0; then
+		pass=`expr $pass + 1`
+		end_test PASS
+	else
+		fail=`expr $fail + 1`
+		$IPPFIND "$1._ipps._tcp.local." -x ./bonjour-tests.sh '{service_name}' _fail5.5 \;
+	fi
+else
+	skip=`expr $skip + 1`
+	end_test SKIP
+fi
+
+# Finish up...
+if test $fail -gt 0; then
+	cat >>"$PLIST" <<EOF
+</array>
+<key>Successful</key>
+<false />
+EOF
+else
+	cat >>"$PLIST" <<EOF
+</array>
+<key>Successful</key>
+<true />
+EOF
+fi
+
+cat >>"$PLIST" <<EOF
+</dict>
+</plist>
+EOF
+
+score=`expr $pass + $skip`
+score=`expr 100 \* $score / $total`
+echo "Summary: $total tests, $pass passed, $fail failed, $skip skipped"
+echo "Score: ${score}%"
+
+#
+# End of "$Id: bonjour-tests.sh 12144 2014-09-02 13:40:27Z msweet $".
+#

everywhere/bonjour-value-tests.test

@@ -0,0 +1,47 @@
+#
+# "$Id: bonjour-value-tests.test 12143 2014-09-02 13:37:30Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 2001-2006 by Easy Software Products. All rights reserved.
+#
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
+#
+# Usage:
+#
+#   (run from within ippfind)
+#   ippfind ... -x ipptool -t "{}" bonjour-value-tests.test ";"
+#
+
+FILE-ID "org.pwg.ipp-everywhere.20140826.bonjour"
+
+{
+	# The name of the test...
+	NAME "Validate TXT record values using Get-Printer-Attributes"
+
+	# The operation to use
+	OPERATION Get-Printer-Attributes
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+
+	# What statuses are OK?
+	STATUS successful-ok
+
+	# What attributes do we expect?
+	EXPECT printer-more-info OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "$ENV[IPPFIND_TXT_ADMINURL]"
+	EXPECT printer-uuid OF-TYPE uri IN-GROUP printer-attributes-tag COUNT 1 WITH-VALUE "urn:uuid:$ENV[IPPFIND_TXT_UUID]"
+}
+
+#
+# End of "$Id: bonjour-value-tests.test 12143 2014-09-02 13:37:30Z msweet $".
+#

everywhere/document-tests.bat

@@ -0,0 +1,28 @@
+@echo off
+::
+::  "$Id: document-tests.bat 12249 2014-11-14 12:54:05Z msweet $"
+::
+:: IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
+::
+:: Copyright 2014 by The Printer Working Group.
+::
+:: This program may be copied and furnished to others, and derivative works
+:: that comment on, or otherwise explain it or assist in its implementation may
+:: be prepared, copied, published and distributed, in whole or in part, without
+:: restriction of any kind, provided that the above copyright notice and this
+:: paragraph are included on all such copies and derivative works.
+::
+:: The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+:: WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+:: WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+::
+:: Usage:
+::
+::   document-tests.bat 'Printer Name'
+::
+
+ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 Document Results.plist\"" -I "{}" document-tests.test ";"
+
+::
+:: End of "$Id: document-tests.bat 12249 2014-11-14 12:54:05Z msweet $".
+::

everywhere/document-tests.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+#  "$Id: document-tests.sh 12127 2014-08-28 18:57:27Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+#
+# This program may be copied and furnished to others, and derivative works
+# that comment on, or otherwise explain it or assist in its implementation may
+# be prepared, copied, published and distributed, in whole or in part, without
+# restriction of any kind, provided that the above copyright notice and this
+# paragraph are included on all such copies and derivative works.
+#
+# The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+# WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+# WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Usage:
+#
+#   ./document-tests.sh "Printer Name"
+#
+
+if test -x ../test/ippfind-static; then
+	IPPFIND="../test/ippfind-static"
+elif test -x ./ippfind; then
+	IPPFIND="./ippfind"
+else
+	IPPFIND="ippfind"
+fi
+
+if test -x ../test/ipptool-static; then
+	IPPTOOL="../test/ipptool-static"
+elif test -x ./ipptool; then
+	IPPTOOL="./ipptool"
+else
+	IPPTOOL="ipptool"
+fi
+
+for file in color.jpg document-a4.pdf document-letter.pdf; do
+	if test ! -f $file -a -f ../test/$file; then
+		ln -s ../test/$file .
+	fi
+done
+
+if test "`ls -d pwg-raster-samples-*dpi-20111130 2>/dev/null`" = ""; then
+	echo "You must first download and extract the PWG Raster Format sample files from:"
+	echo ""
+	echo "    http://ftp.pwg.org/pub/pwg/ipp/examples/"
+	echo ""
+	echo "Before you can run this script."
+	exit 1
+fi
+
+$IPPFIND "$1._ipp._tcp.local." -x $IPPTOOL -P "$1 Document Results.plist" -I '{}' document-tests.test \;
+
+#
+# End of "$Id: document-tests.sh 12127 2014-08-28 18:57:27Z msweet $".
+#

everywhere/document-tests.test

@@ -0,0 +1,618 @@
+#
+# "$Id: document-tests.test 12127 2014-08-28 18:57:27Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 2001-2006 by Easy Software Products. All rights reserved.
+#
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
+#
+# Usage:
+#
+#   ./ipptool -tI printer-uri document-tests.test
+#
+# This test file depends on document data files available at:
+#
+#   http://ftp.pwg.org/pub/pwg/ipp/examples
+#
+# The ZIP files should be extracted in the same directory as the test files,
+# for example the 600dpi files will exist in a directory called
+# "pwg-raster-samples-600dpi-20111130".  The script used to generate the raster
+# data is available in the "everywhere" subdirectory of the CUPS source code.
+#
+
+FILE-ID "org.pwg.ipp-everywhere.20140826.document"
+
+{
+	NAME "D-1. PWG Raster Format Tests (mandatory)"
+	OPERATION Get-Printer-Attributes
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+
+	STATUS successful-ok
+
+	EXPECT compression-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "deflate" DEFINE-MATCH HAVE_DEFLATE
+	EXPECT compression-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "gzip" DEFINE-MATCH HAVE_GZIP
+
+	EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag WITH-VALUE "image/pwg-raster"
+
+	EXPECT pwg-raster-document-resolution-supported OF-TYPE resolution IN-GROUP printer-attributes-tag DEFINE-VALUE RASTER_RESOLUTION
+
+	EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "black-1" DEFINE-MATCH HAVE_BLACK
+	EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "sgray-8" DEFINE-MATCH HAVE_SGRAY
+	EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "srgb-8" DEFINE-MATCH HAVE_SRGB
+	EXPECT pwg-raster-document-type-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "cmyk-8" DEFINE-MATCH HAVE_CMYK
+}
+
+#### 1.1 NO COMPRESSION ####
+{
+	SKIP-IF-NOT-DEFINED HAVE_BLACK
+	NAME "D-1.1 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, black-1"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, black-1"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SGRAY
+	NAME "D-1.1 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, sgray-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, sgray-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SRGB
+	NAME "D-1.1 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, srgb-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, srgb-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_CMYK
+	NAME "D-1.1 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, cmyk-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, cmyk-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### 1.2 DEFLATE COMPRESSION ####
+{
+	SKIP-IF-NOT-DEFINED HAVE_BLACK
+	SKIP-IF-NOT-DEFINED HAVE_DEFLATE
+	NAME "D-1.2 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, black-1, deflate"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, black-1\, deflate"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression deflate
+	COMPRESSION deflate
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SGRAY
+	SKIP-IF-NOT-DEFINED HAVE_DEFLATE
+	NAME "D-1.2 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, sgray-8, deflate"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, sgray-8\, deflate"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression deflate
+	COMPRESSION deflate
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SRGB
+	SKIP-IF-NOT-DEFINED HAVE_DEFLATE
+	NAME "D-1.2 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, srgb-8, deflate"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, srgb-8\, deflate"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression deflate
+	COMPRESSION deflate
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_CMYK
+	SKIP-IF-NOT-DEFINED HAVE_DEFLATE
+	NAME "D-1.2 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, cmyk-8, deflate"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, cmyk-8\, deflate"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression deflate
+	COMPRESSION deflate
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### 1.3 GZIP COMPRESSION ####
+{
+	SKIP-IF-NOT-DEFINED HAVE_BLACK
+	SKIP-IF-NOT-DEFINED HAVE_GZIP
+	NAME "D-1.3 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, black-1, gzip"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, black-1\, gzip"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression gzip
+	COMPRESSION gzip
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SGRAY
+	SKIP-IF-NOT-DEFINED HAVE_GZIP
+	NAME "D-1.3 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, sgray-8, gzip"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, sgray-8\, gzip"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression gzip
+	COMPRESSION gzip
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SRGB
+	SKIP-IF-NOT-DEFINED HAVE_GZIP
+	NAME "D-1.3 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, srgb-8, gzip"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, srgb-8\, gzip"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression gzip
+	COMPRESSION gzip
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_CMYK
+	SKIP-IF-NOT-DEFINED HAVE_GZIP
+	NAME "D-1.3 Print color.jpg-4x6.pwg @ $RASTER_RESOLUTION, cmyk-8, gzip"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg-4x6.pwg @ $RASTER_RESOLUTION\, cmyk-8\, gzip"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	ATTR keyword compression gzip
+	COMPRESSION gzip
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### 1.4 A4 TESTS ####
+{
+	SKIP-IF-NOT-DEFINED HAVE_BLACK
+	NAME "D-1.4 Print document-a4.pwg @ $RASTER_RESOLUTION, black-1"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-a4.pwg @ $RASTER_RESOLUTION\, black-1"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/black-1/document-a4-black-1-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SGRAY
+	NAME "D-1.4 Print document-a4.pwg @ $RASTER_RESOLUTION, sgray-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-a4.pwg @ $RASTER_RESOLUTION\, sgray-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SRGB
+	NAME "D-1.4 Print document-a4.pwg @ $RASTER_RESOLUTION, srgb-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-a4.pwg @ $RASTER_RESOLUTION\, srgb-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_CMYK
+	NAME "D-1.4 Print document-a4.pwg @ $RASTER_RESOLUTION, cmyk-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-a4.pwg @ $RASTER_RESOLUTION\, cmyk-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### 1.5 US Letter TESTS ####
+{
+	SKIP-IF-NOT-DEFINED HAVE_BLACK
+	NAME "D-1.5 Print document-letter.pwg @ $RASTER_RESOLUTION, black-1"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pwg @ $RASTER_RESOLUTION\, black-1"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/black-1/document-letter-black-1-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SGRAY
+	NAME "D-1.5 Print document-letter.pwg @ $RASTER_RESOLUTION, sgray-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pwg @ $RASTER_RESOLUTION\, sgray-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_SRGB
+	NAME "D-1.5 Print document-letter.pwg @ $RASTER_RESOLUTION, srgb-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pwg @ $RASTER_RESOLUTION\, srgb-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_CMYK
+	NAME "D-1.5 Print document-letter.pwg @ $RASTER_RESOLUTION, cmyk-8"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pwg @ $RASTER_RESOLUTION\, cmyk-8"
+	ATTR mimeMediaType document-format "image/pwg-raster"
+	FILE "pwg-raster-samples-${RASTER_RESOLUTION}-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg"
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### JPEG Tests
+{
+	NAME "D-2. JPEG Tests (mandatory)"
+	OPERATION Get-Printer-Attributes
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+
+	STATUS successful-ok
+
+	EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag WITH-VALUE "image/jpeg"
+}
+{
+	NAME "D-2.1 Print color.jpg with defaults"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg with defaults"
+	ATTR mimeMediaType document-format "image/jpeg"
+	FILE "color.jpg"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	NAME "D-2.2 Print color.jpg with copies=2"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg with copies=2"
+	ATTR mimeMediaType document-format "image/jpeg"
+	GROUP job-attributes-tag
+	ATTR integer copies 2
+	FILE "color.jpg"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	NAME "D-2.3 Print color.jpg with print-color-mode=monochrome"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg with print-color-mode=monochrome"
+	ATTR mimeMediaType document-format "image/jpeg"
+	GROUP job-attributes-tag
+	ATTR keyword print-color-mode monochrome
+	FILE "color.jpg"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	NAME "D-2.4 Print color.jpg with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+	ATTR mimeMediaType document-format "image/jpeg"
+	ATTR boolean ipp-attribute-fidelity true
+	GROUP job-attributes-tag
+	ATTR keyword media na_letter_8.5x11in
+	FILE "color.jpg"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	NAME "D-2.5 Print color.jpg with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "color.jpg with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+	ATTR mimeMediaType document-format "image/jpeg"
+	ATTR boolean ipp-attribute-fidelity true
+	GROUP job-attributes-tag
+	ATTR keyword media iso_a4_210x297mm
+	FILE "color.jpg"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#### PDF Tests
+{
+	NAME "D-3. PDF Tests (if PDF is supported)"
+	OPERATION Get-Printer-Attributes
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+
+	STATUS successful-ok
+
+	EXPECT document-format-supported OF-TYPE mimeMediaType IN-GROUP printer-attributes-tag WITH-VALUE "application/pdf" DEFINE-MATCH HAVE_PDF
+	EXPECT sides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "two-sided-long-edge" DEFINE-MATCH HAVE_DUPLEX
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	NAME "D-3.1 Print document-letter.pdf with defaults"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pdf with defaults"
+	ATTR mimeMediaType document-format "application/pdf"
+	FILE "document-letter.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	NAME "D-3.2 Print document-letter.pdf with copies=2"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pdf with copies=2"
+	ATTR mimeMediaType document-format "application/pdf"
+	GROUP job-attributes-tag
+	ATTR integer copies 2
+	FILE "document-letter.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	NAME "D-3.3 Print document-letter.pdf with page-ranges=3-3 and print-color-mode=monochrome"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pdf with page-ranges=3-3 and print-color-mode=monochrome"
+	ATTR mimeMediaType document-format "application/pdf"
+	GROUP job-attributes-tag
+	ATTR rangeOfInteger page-ranges 3-3
+	ATTR keyword print-color-mode monochrome
+	FILE "document-letter.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	SKIP-IF-NOT-DEFINED HAVE_DUPLEX
+	NAME "D-3.4 Print document-letter.pdf with sides=two-sided-long-edge"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pdf with sides=two-sided-long-edge"
+	ATTR mimeMediaType document-format "application/pdf"
+	GROUP job-attributes-tag
+	ATTR keyword sides two-sided-long-edge
+	FILE "document-letter.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	NAME "D-3.5 Print document-letter.pdf with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-letter.pdf with media=iso_a4_210x297mm and ipp-attribute-fidelity=true"
+	ATTR mimeMediaType document-format "application/pdf"
+	ATTR boolean ipp-attribute-fidelity true
+	GROUP job-attributes-tag
+	ATTR keyword media iso_a4_210x297mm
+	FILE "document-letter.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+{
+	SKIP-IF-NOT-DEFINED HAVE_PDF
+	NAME "D-3.6 Print document-a4.pdf with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+	OPERATION Print-Job
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR naturalLanguage attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR name job-name "document-a4.pdf with media=na_letter_8.5x11in and ipp-attribute-fidelity=true"
+	ATTR mimeMediaType document-format "application/pdf"
+	ATTR boolean ipp-attribute-fidelity true
+	GROUP job-attributes-tag
+	ATTR keyword media na_letter_8.5x11in
+	FILE "document-a4.pdf"
+
+	STATUS successful-ok
+	STATUS server-error-busy REPEAT-MATCH REPEAT-LIMIT 30
+}
+
+#
+# End of "$Id: document-tests.test 12127 2014-08-28 18:57:27Z msweet $".
+#

everywhere/ipp-tests.bat

@@ -0,0 +1,28 @@
+@echo off
+::
+::  "$Id: ipp-tests.bat 12249 2014-11-14 12:54:05Z msweet $"
+::
+:: IPP Everywhere Printer Self-Certification Manual 1.0: Section 6: IPP Tests.
+::
+:: Copyright 2014 by The Printer Working Group.
+::
+:: This program may be copied and furnished to others, and derivative works
+:: that comment on, or otherwise explain it or assist in its implementation may
+:: be prepared, copied, published and distributed, in whole or in part, without
+:: restriction of any kind, provided that the above copyright notice and this
+:: paragraph are included on all such copies and derivative works.
+::
+:: The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+:: WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+:: WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+::
+:: Usage:
+::
+::   ipp-tests.bat 'Printer Name'
+::
+
+ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 IPP Results.plist\"" -I "{}" ipp-tests.test ";"
+
+::
+:: End of "$Id: ipp-tests.bat 12249 2014-11-14 12:54:05Z msweet $".
+::

everywhere/ipp-tests.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+#  "$Id: ipp-tests.sh 12127 2014-08-28 18:57:27Z msweet $"
+#
+# IPP Everywhere Printer Self-Certification Manual 1.0: Section 6: IPP Tests.
+#
+# Copyright 2014 by The Printer Working Group.
+#
+# This program may be copied and furnished to others, and derivative works
+# that comment on, or otherwise explain it or assist in its implementation may
+# be prepared, copied, published and distributed, in whole or in part, without
+# restriction of any kind, provided that the above copyright notice and this
+# paragraph are included on all such copies and derivative works.
+#
+# The IEEE-ISTO and the Printer Working Group DISCLAIM ANY AND ALL WARRANTIES,
+# WHETHER EXPRESS OR IMPLIED INCLUDING (WITHOUT LIMITATION) ANY IMPLIED
+# WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Usage:
+#
+#   ./ipp-tests.sh "Printer Name"
+#
+
+if test -x ../test/ippfind-static; then
+	IPPFIND="../test/ippfind-static"
+elif test -x ./ippfind; then
+	IPPFIND="./ippfind"
+else
+	IPPFIND="ippfind"
+fi
+
+if test -x ../test/ipptool-static; then
+	IPPTOOL="../test/ipptool-static"
+elif test -x ./ipptool; then
+	IPPTOOL="./ipptool"
+else
+	IPPTOOL="ipptool"
+fi
+
+for file in color.jpg; do
+	if test ! -f $file -a -f ../test/$file; then
+		ln -s ../test/$file .
+	fi
+done
+
+$IPPFIND "$1._ipp._tcp.local." -x $IPPTOOL -P "$1 IPP Results.plist" -I '{}' ipp-tests.test \;
+
+#
+# End of "$Id: ipp-tests.sh 12127 2014-08-28 18:57:27Z msweet $".
+#

everywhere/make-ippeveselfcert.sh

@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# "$Id: make-ippeveselfcert.sh 12130 2014-08-28 22:40:36Z msweet $"
+#
+#   Make an IPP Everywhere Printer self-certification package.
+#
+#   Copyright 2014 The Printer Working Group.
+#   Copyright 2007-2013 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
+#
+
+# Make sure we are running in the right directory...
+if test ! -f everywhere/make-ippeveselfcert.sh; then
+        echo "Run this script from the top-level CUPS source directory, e.g.:"
+        echo ""
+        echo "    everywhere/make-ippeveselfcert.sh $*"
+        echo ""
+        exit 1
+fi
+
+if test $# != 2; then
+	echo "Usage: everywhere/make-ippeveselfcert.sh platform YYYYMMDD"
+	exit 1
+fi
+
+platform="$1"
+fileversion="$2"
+
+echo Creating package directory...
+pkgdir="sw-ippeveselfcert10-$fileversion"
+
+test -d $pkgdir && rm -r $pkgdir
+mkdir $pkgdir || exit 1
+
+echo Copying package files
+cp LICENSE.txt $pkgdir
+cp doc/help/man-ipp*.html $pkgdir
+cp everywhere/README.txt $pkgdir
+cp everywhere/man-ippserver.html $pkgdir
+cp everywhere/*-tests.* $pkgdir
+cp test/color.jpg $pkgdir
+cp test/document-*.pdf $pkgdir
+cp test/ippfind-static $pkgdir/ippfind
+cp test/ippserver $pkgdir
+cp test/ipptool-static $pkgdir/ipptool
+cp test/printer.png $pkgdir
+
+if test x$platform = xosx; then
+	pkgfile="$pkgdir-osx.dmg"
+	echo Creating disk image $pkgfile...
+	test -f $pkgfile && rm $pkgfile
+	hdiutil create -srcfolder $pkgdir $pkgfile
+else
+	pkgfile="$pkgdir-$platform.tar.gz"
+	echo Creating archive $pkgfile...
+	tar czf $pkgfile $pkgdir || exit 1
+fi
+
+echo Removing temporary files...
+rm -r $pkgdir
+
+echo Done.
+
+#
+# End of "$Id: make-ippeveselfcert.sh 12130 2014-08-28 22:40:36Z msweet $".
+#

everywhere/man-ippserver.html

@@ -0,0 +1,151 @@
+<!DOCTYPE HTML>
+<html>
+<!-- SECTION: Man Pages -->
+<head>
+	<link rel="stylesheet" type="text/css" href="../cups-printable.css">
+	<title>ippserver(1)</title>
+</head>
+<body>
+<h1 class="title">ippserver(1)</h1>
+<h2 class="title"><a name="NAME">Name</a></h2>
+ippserver - a simple internet printing protocol server
+<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
+<b>ippserver</b>
+[
+<b>-2</b>
+] [
+<b>-M</b>
+<i>manufacturer</i>
+] [
+<b>-P</b>
+] [
+<b>-c</b>
+<i>command</i>
+] [
+<b>-d</b>
+<i>spool-directory</i>
+] [
+<b>-f</b>
+<i>type/subtype[,...]</i>
+] [
+<b>-h</b>
+] [
+<b>-i</b>
+<i>iconfile.png</i>
+] [
+<b>-k</b>
+] [
+<b>-l</b>
+<i>location</i>
+] [
+<b>-m</b>
+<i>model</i>
+] [
+<b>-n</b>
+<i>hostname</i>
+] [
+<b>-p</b>
+<i>port</i>
+] [
+<b>-r</b>
+<i>subtype</i>
+] [
+<b>-s</b>
+<i>speed[,color-speed]</i>
+] [
+<b>-v[vvv]</b>
+]
+<i>service-name</i>
+<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
+<b>ippserver</b>
+is a simple Internet Printing Protocol (IPP) server conforming to the IPP Everywhere (PWG 5100.14) specification. It can be used to test client software or act as a very basic print server that runs a command for every job that is printed.
+<h2 class="title"><a name="OPTIONS">Options</a></h2>
+The following options are recognized by
+<b>ippserver:</b>
+<dl class="man">
+<dt><b>-2</b>
+<dd style="margin-left: 5.0em">Report support for two-sided (duplex) printing.
+<dt><b>-M </b><i>manufacturer</i>
+<dd style="margin-left: 5.0em">Set the manufacturer of the printer.
+The default is "Test".
+<dt><b>-P</b>
+<dd style="margin-left: 5.0em">Report support for PIN printing.
+<dt><b>-c </b><i>command</i>
+<dd style="margin-left: 5.0em">Run the specified command for each document that is printed.
+<dt><b>-d </b><i>spool-directory</i>
+<dd style="margin-left: 5.0em">Specifies the directory that will hold the print files.
+The default is a directory under the user's current temporary directory.
+<dt><b>-f </b><i>type/subtype[,...]</i>
+<dd style="margin-left: 5.0em">Specifies a list of MIME media types that the server will accept.
+The default is "application/pdf,image/jpeg,image/pwg-raster".
+<dt><b>-h</b>
+<dd style="margin-left: 5.0em">Shows program help.
+<dt><b>-i </b><i>iconfile.png</i>
+<dd style="margin-left: 5.0em">Specifies the printer icon file for the server.
+The default is "printer.png".
+<dt><b>-k</b>
+<dd style="margin-left: 5.0em">Keeps the print documents in the spool directory rather than deleting them.
+<dt><b>-l </b><i>location</i>
+<dd style="margin-left: 5.0em">Specifies the human-readable location string that is reported by the server.
+The default is the empty string.
+<dt><b>-m </b><i>model</i>
+<dd style="margin-left: 5.0em">Specifies the model name of the printer.
+The default is "Printer".
+<dt><b>-n </b><i>hostname</i>
+<dd style="margin-left: 5.0em">Specifies the hostname that is reported by the server.
+The default is the name returned by the
+<b>hostname</b>(1)
+command.
+<dt><b>-p </b><i>port</i>
+<dd style="margin-left: 5.0em">Specifies the port number to listen on.
+The default is a user-specific number from 8000 to 8999.
+<dt><b>-r </b><i>subtype</i>
+<dd style="margin-left: 5.0em">Specifies the Bonjour subtype(s) to advertise.
+Separate multiple subtypes with a comma.
+The default is "_print".
+<dt><b>-s </b><i>speed[,color-speed]</i>
+<dd style="margin-left: 5.0em">Specifies the printer speed in pages per minute.
+If two numbers are specified and the second number is greater than zero, the server will report support for color printing.
+The default is "10,0".
+<dt><b>-v[vvv]</b>
+<dd style="margin-left: 5.0em">Be (very) verbose when logging activity to the standard output.
+</dl>
+<h2 class="title"><a name="EXIT_STATUS">Exit Status</a></h2>
+The
+<b>ippserver</b>
+program returns 1 if it is unable to process the command-line arguments or register the IPP service.
+Otherwise
+<b>ippserver</b>
+will run continuously until terminated.
+<h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
+The
+<b>ippserver</b>
+program is unique to CUPS and conforms to the IPP Everywhere (PWG 5100.14) specification.
+<h2 class="title"><a name="ENVIRONMENT">Environment</a></h2>
+<b>ippserver</b>
+adds environment variables starting with "IPP_" for all IPP Job attributes in the print request.
+For example, when executing a command for an IPP Job containing the "media" Job Template attribute, the "IPP_MEDIA" environment variable will be set to the value of that attribute.
+<p>Enumerated values are converted to their keyword equivalents.
+For example, a "print-quality" Job Template attribute with a enum value of 3 will become the "IPP_PRINT_QUALITY" environment variable with a value of "draft".
+<h2 class="title"><a name="EXAMPLES">Examples</a></h2>
+Run
+<b>ippserver</b>
+with a service name of My Cool Printer:
+<pre class="man">
+
+    ippserver "My Cool Printer"
+</pre>
+<p>Run the
+<b>file</b>(1)
+command whenever a job is sent to the server:
+<pre class="man">
+
+    ippserver -c file "My Cool Printer"
+</pre>
+<h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
+PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
+<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
+Copyright &copy; 2007-2014 by Apple Inc.
+
+</body>
+</html>

man/cupsctl.man

@@ -3,7 +3,7 @@
 .\"
 .\" cupsctl man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 2007 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsctl 8 "CUPS" "11 June 2014" "Apple Inc."
+.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -54,19 +54,19 @@ Specifies an alternate username to use when authenticating with the scheduler.
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies the server address.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBdebug\-logging
+\fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
 Enables (disables) debug logging to the \fIerror_log\fR file.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-admin
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
 Enables (disables) remote administration.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-any
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-any\fR
 Enables (disables) printing from any address, e.g., the Internet.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBshare\-printers
+\fB\-\-\fR[\fBno\-\fR]\fBshare\-printers\fR
 Enables (disables) sharing of local printers with other computers.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any
+\fB\-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any\fR
 Allows (prevents) users to cancel jobs owned by others.
 .SH EXAMPLES
 Display the current settings:

man/cupsd.man.in

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsd.man.in 12854 2015-08-28 14:08:00Z msweet $"
+.\" "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $"
 .\"
 .\" cupsd man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,14 +12,14 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsd 8 "CUPS" "8 July 2014" "Apple Inc."
+.TH cupsd 8 "CUPS" "12 February 2016" "Apple Inc."
 .SH NAME
 cupsd \- cups scheduler
 .SH SYNOPSIS
 .B cupsd
 [
 .B \-c
-.I config-file
+.I cupsd.conf
 ] [
 .B \-f
 ] [
@@ -27,19 +27,22 @@ cupsd \- cups scheduler
 ] [
 .B \-h
 ] [
-.B -l
+.B \-l
 ] [
-.B -t
+.B \-s
+.I cups-files.conf
+] [
+.B \-t
 ]
 .SH DESCRIPTION
 .B cupsd
-is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1. If no options are specified on the command-line then the default configuration file
+is the scheduler for CUPS. It implements a printing system based upon the Internet Printing Protocol, version 2.1, and supports most of the requirements for IPP Everywhere. If no options are specified on the command-line then the default configuration file
 .I /etc/cups/cupsd.conf
 will be used.
 .SH OPTIONS
 .TP 5
-.BI \-c \ config-file
-Uses the named configuration file.
+.BI \-c \ cupsd.conf
+Uses the named cupsd.conf configuration file.
 .TP 5
 .B \-f
 Run
@@ -65,6 +68,9 @@ when it is run from
 or
 .BR systemd (8).
 .TP 5
+.BI \-s \ cups-files.conf
+Uses the named cups-files.conf configuration file.
+.TP 5
 .B \-t
 Test the configuration file for syntax errors.
 .SH FILES
@@ -109,6 +115,7 @@ in the foreground with a test configuration file called
 .BR backend (7),
 .BR classes.conf (5),
 .BR cups (1),
+.BR cups-files.conf (5),
 .BR cups-lpd (8),
 .BR cupsd.conf (5),
 .BR cupsd-helper (8),
@@ -121,7 +128,7 @@ in the foreground with a test configuration file called
 .BR systemd (8),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2015 by Apple Inc.
+Copyright \[co] 2007-2016 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.man.in 12854 2015-08-28 14:08:00Z msweet $".
+.\" End of "$Id: cupsd.man.in 13087 2016-02-12 18:53:24Z msweet $".
 .\"

man/ppdcfile.man

@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: ppdcfile.man 12854 2015-08-28 14:08:00Z msweet $"
+.\" "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $"
 .\"
 .\" ppdcfile man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2007 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH ppdcfile 5 "CUPS" "12 June 2014" "Apple Inc."
+.TH ppdcfile 5 "CUPS" "5 March 2016" "Apple Inc."
 .SH NAME
 ppdcfile \- cups ppd compiler source file format
 .SH DESCRIPTION
@@ -82,7 +82,7 @@ Directives may be placed anywhere on a line and are followed by one or more valu
 .TP 5
 \fBDuplex \fItype\fR
 .TP 5
-\fBFilter \Imime-type cost program\fR
+\fBFilter \fImime-type cost program\fR
 .TP 5
 \fBFinishing \fIname\fR
 .TP 5
@@ -161,5 +161,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id: ppdcfile.man 12854 2015-08-28 14:08:00Z msweet $".
+.\" End of "$Id: ppdcfile.man 13117 2016-03-07 18:36:16Z msweet $".
 .\"

scheduler/cups-lpd.c

@@ -1,9 +1,7 @@
 /*
- * "$Id: cups-lpd.c 12611 2015-05-06 15:30:36Z msweet $"
- *
  * Line Printer Daemon interface for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -17,6 +15,7 @@
  * Include necessary headers...
  */
 
+#define _CUPS_NO_DEPRECATED
 #include <cups/cups-private.h>
 #include <syslog.h>
 #include <unistd.h>
@@ -346,7 +345,7 @@ create_job(http_t        *http,		/* I - HTTP connection */
   * Setup the Create-Job request...
   */
 
-  request = ippNewRequest(IPP_CREATE_JOB);
+  request = ippNewRequest(IPP_OP_CREATE_JOB);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                    "localhost", 0, "/printers/%s", dest);
@@ -361,10 +360,6 @@ create_job(http_t        *http,		/* I - HTTP connection */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
                  NULL, title);
 
-  if (docname[0])
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "document-name",
-                 NULL, docname);
-
   cupsEncodeOptions(request, num_options, options);
 
  /*
@@ -375,7 +370,7 @@ create_job(http_t        *http,		/* I - HTTP connection */
 
   response = cupsDoRequest(http, request, uri);
 
-  if (!response || cupsLastError() > IPP_OK_CONFLICT)
+  if (!response || cupsLastError() > IPP_STATUS_OK_CONFLICTING)
   {
     syslog(LOG_ERR, "Unable to create job - %s", cupsLastErrorString());
 
@@ -451,7 +446,7 @@ get_printer(http_t        *http,	/* I - HTTP connection */
   if (shared)
     *shared = 0;
   if (state)
-    *state = IPP_PRINTER_STOPPED;
+    *state = IPP_PSTATE_STOPPED;
   if (options)
     *options = NULL;
 
@@ -467,7 +462,7 @@ get_printer(http_t        *http,	/* I - HTTP connection */
   * Setup the Get-Printer-Attributes request...
   */
 
-  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+  request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
 		   "localhost", 0, "/printers/%s", dest);
@@ -486,7 +481,7 @@ get_printer(http_t        *http,	/* I - HTTP connection */
 
   response = cupsDoRequest(http, request, "/");
 
-  if (!response || cupsLastError() > IPP_OK_CONFLICT)
+  if (!response || cupsLastError() > IPP_STATUS_OK_CONFLICTING)
   {
    /*
     * If we can't find the printer by name, look up the printer-name
@@ -506,7 +501,7 @@ get_printer(http_t        *http,	/* I - HTTP connection */
     * Setup the CUPS-Get-Printers request...
     */
 
-    request = ippNewRequest(CUPS_GET_PRINTERS);
+    request = ippNewRequest(IPP_OP_CUPS_GET_PRINTERS);
 
     ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                   "requested-attributes",
@@ -519,7 +514,7 @@ get_printer(http_t        *http,	/* I - HTTP connection */
 
     response = cupsDoRequest(http, request, "/");
 
-    if (!response || cupsLastError() > IPP_OK_CONFLICT)
+    if (!response || cupsLastError() > IPP_STATUS_OK_CONFLICTING)
     {
       syslog(LOG_ERR, "Unable to get list of printers - %s",
              cupsLastErrorString());
@@ -734,7 +729,7 @@ print_file(http_t     *http,		/* I - HTTP connection */
   * Setup the Send-Document request...
   */
 
-  request = ippNewRequest(IPP_SEND_DOCUMENT);
+  request = ippNewRequest(IPP_OP_SEND_DOCUMENT);
 
   snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", id);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri);
@@ -760,7 +755,7 @@ print_file(http_t     *http,		/* I - HTTP connection */
 
   ippDelete(cupsDoFileRequest(http, request, uri, filename));
 
-  if (cupsLastError() > IPP_OK_CONFLICT)
+  if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
   {
     syslog(LOG_ERR, "Unable to send document - %s", cupsLastErrorString());
 
@@ -815,7 +810,7 @@ recv_print_job(
   * Connect to the server...
   */
 
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+  http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
   if (!http)
   {
     syslog(LOG_ERR, "Unable to connect to server: %s", strerror(errno));
@@ -1245,8 +1240,7 @@ remove_jobs(const char *dest,		/* I - Destination */
   * Try connecting to the local server...
   */
 
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
+  if ((http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL)) == NULL)
   {
     syslog(LOG_ERR, "Unable to connect to server %s: %s", cupsServer(),
            strerror(errno));
@@ -1269,7 +1263,7 @@ remove_jobs(const char *dest,		/* I - Destination */
       list ++;
 
    /*
-    * Build an IPP_CANCEL_JOB request, which requires the following
+    * Build an IPP_OP_CANCEL_JOB request, which requires the following
     * attributes:
     *
     *    attributes-charset
@@ -1278,7 +1272,7 @@ remove_jobs(const char *dest,		/* I - Destination */
     *    requesting-user-name
     */
 
-    request = ippNewRequest(IPP_CANCEL_JOB);
+    request = ippNewRequest(IPP_OP_CANCEL_JOB);
 
     sprintf(uri, "ipp://localhost/jobs/%d", id);
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri);
@@ -1292,7 +1286,7 @@ remove_jobs(const char *dest,		/* I - Destination */
 
     ippDelete(cupsDoRequest(http, request, "/jobs"));
 
-    if (cupsLastError() > IPP_OK_CONFLICT)
+    if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
     {
       syslog(LOG_WARNING, "Cancel of job ID %d failed: %s\n", id,
              cupsLastErrorString());
@@ -1366,8 +1360,7 @@ send_state(const char *queue,		/* I - Destination */
   * Try connecting to the local server...
   */
 
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
+  if ((http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL)) == NULL)
   {
     syslog(LOG_ERR, "Unable to connect to server %s: %s", cupsServer(),
            strerror(errno));
@@ -1393,19 +1386,19 @@ send_state(const char *queue,		/* I - Destination */
 
   switch (state)
   {
-    case IPP_PRINTER_IDLE :
+    case IPP_PSTATE_IDLE :
         printf("%s is ready\n", dest);
 	break;
-    case IPP_PRINTER_PROCESSING :
+    case IPP_PSTATE_PROCESSING :
         printf("%s is ready and printing\n", dest);
 	break;
-    case IPP_PRINTER_STOPPED :
+    case IPP_PSTATE_STOPPED :
         printf("%s is not ready\n", dest);
 	break;
   }
 
  /*
-  * Build an IPP_GET_JOBS or IPP_GET_JOB_ATTRIBUTES request, which requires
+  * Build an IPP_OP_GET_JOBS or IPP_OP_GET_JOB_ATTRIBUTES request, which requires
   * the following attributes:
   *
   *    attributes-charset
@@ -1415,7 +1408,7 @@ send_state(const char *queue,		/* I - Destination */
 
   id = atoi(list);
 
-  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
+  request = ippNewRequest(id ? IPP_OP_GET_JOB_ATTRIBUTES : IPP_OP_GET_JOBS);
 
   httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                    "localhost", 0, "/printers/%s", dest);
@@ -1444,7 +1437,7 @@ send_state(const char *queue,		/* I - Destination */
   jobcount = 0;
   response = cupsDoRequest(http, request, "/");
 
-  if (cupsLastError() > IPP_OK_CONFLICT)
+  if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
   {
     printf("get-jobs failed: %s\n", cupsLastErrorString());
     ippDelete(response);
@@ -1473,7 +1466,7 @@ send_state(const char *queue,		/* I - Destination */
 
     jobid     = 0;
     jobsize   = 0;
-    jobstate  = IPP_JOB_PENDING;
+    jobstate  = IPP_JSTATE_PENDING;
     jobname   = "untitled";
     jobuser   = NULL;
     jobdest   = NULL;
@@ -1534,7 +1527,7 @@ send_state(const char *queue,		/* I - Destination */
     * Display the job...
     */
 
-    if (jobstate == IPP_JOB_PROCESSING)
+    if (jobstate == IPP_JSTATE_PROCESSING)
       strlcpy(rankstr, "active", sizeof(rankstr));
     else
     {
@@ -1626,8 +1619,3 @@ smart_gets(char *s,			/* I - Pointer to line buffer */
   else
     return (s);
 }
-
-
-/*
- * End of "$Id: cups-lpd.c 12611 2015-05-06 15:30:36Z msweet $".
- */

scheduler/ipp.c

@@ -1692,7 +1692,24 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
     attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
                         "job-hold-until", NULL, val);
   }
-  if (attr && strcmp(attr->values[0].string.text, "no-hold"))
+
+  if (printer->holding_new_jobs)
+  {
+   /*
+    * Hold all new jobs on this printer...
+    */
+
+    if (attr && strcmp(attr->values[0].string.text, "no-hold"))
+      cupsdSetJobHoldUntil(job, ippGetString(attr, 0, NULL), 0);
+    else
+      cupsdSetJobHoldUntil(job, "indefinite", 0);
+
+    job->state->values[0].integer = IPP_JOB_HELD;
+    job->state_value              = IPP_JOB_HELD;
+
+    ippSetString(job->attrs, &job->reasons, 0, "job-held-on-create");
+  }
+  else if (attr && strcmp(attr->values[0].string.text, "no-hold"))
   {
    /*
     * Hold job until specified time...
@@ -8668,6 +8685,8 @@ release_held_new_jobs(
                     "Printer \"%s\" now printing pending/new jobs (\"%s\").",
                     printer->name, get_username(con));
 
+  cupsdCheckJobs();
+
  /*
   * Everything was ok, so return OK status...
   */

scheduler/job.c

@@ -229,6 +229,7 @@ cupsdCheckJobs(void)
 			*pclass;	/* Printer class destination */
   ipp_attribute_t	*attr;		/* Job attribute */
   time_t		curtime;	/* Current time */
+  const char		*reasons;	/* job-state-reasons value */
 
 
   curtime = time(NULL);
@@ -322,6 +323,25 @@ cupsdCheckJobs(void)
 	((FilterLevel + job->pending_cost) < FilterLimit || FilterLevel == 0))
       cupsdContinueJob(job);
 
+   /*
+    * Skip jobs that where held-on-create
+    */
+
+    reasons = ippGetString(job->reasons, 0, NULL);
+    if (reasons && !strcmp(reasons, "job-held-on-create"))
+    {
+     /*
+      * Check whether the printer is still holding new jobs...
+      */
+
+      printer = cupsdFindDest(job->dest);
+
+      if (printer->holding_new_jobs)
+        continue;
+
+      ippSetString(job->attrs, &job->reasons, 0, "none");
+    }
+
    /*
     * Start pending jobs if the destination is available...
     */
@@ -359,7 +379,7 @@ cupsdCheckJobs(void)
 	                 "Job aborted because the destination printer/class "
 			 "has gone away.");
       }
-      else if (printer && !printer->holding_new_jobs)
+      else if (printer)
       {
        /*
         * See if the printer is available or remote and not printing a job;
@@ -732,8 +752,8 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
   * Add decompression/raw filter as needed...
   */
 
-  if (job->compressions[job->current_file] &&
-      (!job->printer->remote || job->num_files == 1))
+  if ((job->compressions[job->current_file] && (!job->printer->remote || job->num_files == 1)) ||
+      (!job->printer->remote && job->printer->raw && job->num_files > 1))
   {
    /*
     * Add gziptoany filter to the front of the list...

scheduler/main.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 13040 2016-01-11 20:29:13Z msweet $"
+ * "$Id: main.c 13087 2016-02-12 18:53:24Z msweet $"
  *
  * Main loop for the CUPS scheduler.
  *
@@ -2163,17 +2163,16 @@ usage(int status)			/* O - Exit status */
   _cupsLangPuts(fp, _("Options:"));
   _cupsLangPuts(fp, _("  -c cupsd.conf           Set cupsd.conf file to use."));
   _cupsLangPuts(fp, _("  -f                      Run in the foreground."));
-  _cupsLangPuts(fp, _("  -F                      Run in the foreground but "
-                      "detach from console."));
+  _cupsLangPuts(fp, _("  -F                      Run in the foreground but detach from console."));
   _cupsLangPuts(fp, _("  -h                      Show this usage message."));
   _cupsLangPuts(fp, _("  -l                      Run cupsd on demand."));
-  _cupsLangPuts(fp, _("  -t                      Test the configuration "
-                      "file."));
+  _cupsLangPuts(fp, _("  -s cups-files.conf      Set cups-files.conf file to use."));
+  _cupsLangPuts(fp, _("  -t                      Test the configuration file."));
 
   exit(status);
 }
 
 
 /*
- * End of "$Id: main.c 13040 2016-01-11 20:29:13Z msweet $".
+ * End of "$Id: main.c 13087 2016-02-12 18:53:24Z msweet $".
  */

scheduler/type.c

@@ -1,9 +1,7 @@
 /*
- * "$Id: type.c 12577 2015-03-30 19:07:17Z msweet $"
- *
  * MIME typing routines for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -65,7 +63,8 @@ static const char * const debug_ops[] =
 		  "INT",		/* Integer/32-bit word matches */
 		  "LOCALE",		/* Current locale matches string */
 		  "CONTAINS",		/* File contains a string */
-		  "ISTRING"		/* Case-insensitive string matches */
+		  "ISTRING",		/* Case-insensitive string matches */
+		  "REGEX"		/* Regular expression matches */
 		};
 #endif /* DEBUG */
 
@@ -1276,8 +1275,3 @@ mime_patmatch(const char *s,		/* I - String to match against */
 
   return (*s == *pat);
 }
-
-
-/*
- * End of "$Id: type.c 12577 2015-03-30 19:07:17Z msweet $".
- */

templates/de/printer-purge.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Aufträge für {is_class?die Klasse:den Drucker} {printer_name} verwerfen</H2>
+
+<P>Aufträge für {is_class?die Klasse:den Drucker} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+wurden verworfen.</P>
+
+</DIV>

templates/de/replace-ppd.tmpl

@@ -0,0 +1,40 @@
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Ersetze {printer_name} PPD Datei</H2>
+
+<FORM METHOD="POST" ENCTYPE="multipart/form-data" ACTION="/admin">
+
+<INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{?printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PER_QUEUE" VALUE="1">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_IS_COLORMANAGED" VALUE="{?printer_is_colormanaged}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">
+
+<table>
+<tr>
+<TR>
+<TH CLASS="label">Stelle PPD Datei bereit:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE">
+</TR>
+<TR>
+<TD>
+<Input TYPE=SUBMIT VALUE=Upload>
+</TD>
+</TR>
+</table>
+
+</form>
+
+</DIV>
+
+

templates/pt_BR/add-class.tmpl

@@ -0,0 +1,40 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Adicionar classe</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nome:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Pode conter qualquer caracter imprim&iacute;vel, exceto "/", "#", e espa&ccedil;o em branco)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Descri&ccedil;&atilde;o:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Descri&ccedil;&atilde;o leg&iacute;vel para humanos, tal como "HP LaserJet com Duplexador")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Localiza&ccedil;&atilde;o:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Localiza&ccedil;&atilde;o leg&iacute;vel para humanos, tal como "Laborat&oacute;rio 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membros:</TH>
+<TD>
+<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
+{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Adicionar Classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/add-printer.tmpl

@@ -0,0 +1,47 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Adicionar impressora</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+{?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:}
+{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nome:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<SMALL>(Pode conter qualquer caracter imprimível, exceto "/", "#" e espaço em branco)</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Descrição:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<SMALL>(Descrição legível para humanos, tal como "HP LaserJet com Duplexador")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Localização:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<SMALL>(Localização legível para humanos, tal como "Laboratório 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Compartilhamento:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Compartilhar essa Impressora</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continue"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/add-rss-subscription.tmpl

@@ -0,0 +1,44 @@
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
+
+<H2 CLASS="title">Adicionar inscrição RSS</H2>
+
+<TABLE SUMMARY="Formulário para adicionar inscrição RSS">
+<TR>
+<TH CLASS="label">Nome:</TH>
+<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR>
+<SMALL>(Pode conter qualquer caracter imprimível, exceto espaço em branco, "/", "?", e "#")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Fila:</TH>
+<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>All Queues</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD>
+</TR>
+<TR VALIGN="TOP">
+<TH CLASS="label">Eventos:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Trabalho criado<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Trabalho concluído<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Trabalho parado<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Opções do Trabalho alteradas</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Fila parada<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Fila adicionada<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Fila modificada<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Fila apagada</TD>
+<TD>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Servidor iniciado<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Servidor parado<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Servidor reiniciado<BR>
+<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Auditoria de segurança do servidor</TD>
+</TR>
+<TR>
+<TH CLASS="label">Máximo de eventos no Feed:</TH>
+<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Adicionar inscrição RSS"></TD>
+</TR>
+</TABLE>
+
+</FORM>

templates/pt_BR/admin.tmpl

@@ -0,0 +1,102 @@
+<TABLE CLASS="indent" SUMMARY="Tarefas Administrativas">
+<TR><TD VALIGN="TOP">
+
+<H2 CLASS="title">Impressoras</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Adicionar impressora"></FORM>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Encontrar novas impressoras"></FORM>
+<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gerenciar impressoras"></FORM>
+{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Exportar impressoras ao Samba"></FORM>:}
+</P>
+
+<H2 CLASS="title">Classes</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Adicionar classe"></FORM>
+<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gerenciar classes"></FORM>
+</P>
+
+<H2 CLASS="title">Trabalhos</H2>
+
+<P>
+<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gerenciar trabalhos"></FORM>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Servidor</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editar arquivo de configuração"></FORM>
+<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver log de acessos"></FORM>
+<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver log de erros"></FORM>
+<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver log de páginas"></FORM>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+
+{ADVANCEDSETTINGS?<P><B>Configurações do servidor\:</B></P>
+
+<P><A HREF="/admin/">Avançadas <SMALL>&#x25bc;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartilhar impressoras conectadas a este sistema<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Máximo de clientes\:
+<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir impressão a partir da Internet<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Anunciar interface web<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administração remota<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir aos usuários cancelar qualquer trabalho (não apenas os seus próprios)<BR>
+<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Preservar o histórico de trabalhos<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Máximo de trabalhos (0 para sem limite)\:
+<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Reter metadados\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Reter documentos\:
+<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Salvar informação de depuração para solução de problemas<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tamanho máximo do arquivo de log\:
+<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P>
+
+:<P><B>Configurações do servidor:</B></P>
+
+<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Avançadas <SMALL>&#x25b6;</SMALL></A><BR>
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Compartilhar impressoras conectadas a este sistema<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Permitir impressão a partir da Internet<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Permitir administração remota<BR>
+{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Usar autenticação via Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Permitir aos usuários cancelar qualquer trabalho (não apenas seus próprios)<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Salvar informações de depuração para solução de problemas</P>
+
+}
+<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Alterar configurações"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Inscrições RSS</H2>
+
+<P>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Adicionar inscrição RSS"></FORM>
+</P>
+
+</DIV>
+
+{notify_subscription_id?<TABLE CLASS="list" SUMMARY="Inscrições RSS">
+<THEAD><TR><TH>Nome</TH><TH>Eventos</TH><TH>Nome da fila</TH></TR></THEAD>
+<TBODY>{[notify_subscription_id]
+<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
+<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancelar Assinatura"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Todas as filas}</TD></TR>}
+</TBODY>
+</TABLE>:}

templates/pt_BR/choose-device.tmpl

@@ -0,0 +1,53 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Adicionar impressora}</H2>
+
+{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+{op=add-printer?:<TR>
+<TH CLASS="label">Conexão atual\:</TH>
+<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED>
+{current_device_uri}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Impressoras locais\:</TH>
+<TD>
+{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+:}}
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Impressoras de rede descobertas\:</TH>
+<TD>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+:}:}}
+</TD>
+</TR>
+<TR>
+<TR>
+<TH CLASS="label">Outras impressoras de rede\:</TH>
+<TD>
+{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI"
+VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR>
+}:}}
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continar"></TD>
+</TR>
+</TABLE>
+
+</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Ocupado"> Procurando impressoras...</P>}
+
+</DIV>

templates/pt_BR/choose-make.tmpl

@@ -0,0 +1,64 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Adicionar impressora}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+
+<TABLE>
+{op=modify-printer?:<TR>
+<TH CLASS="label">Nome:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Descrição:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Localização:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Compartilhamento:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Não compartilhar:{?printer_is_shared=0?Não compartilhar:Compartilhar}} esta impressora</TD>
+</TR>
+<TR>
+<TH CLASS="label">Fabricante:</TH>
+<TD>
+<SELECT NAME="PPD_MAKE" SIZE="10">
+{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continar"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">Ou forneça um arquivo PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Adicionar impressora:Modificar impressora}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/choose-model.tmpl

@@ -0,0 +1,60 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Adicionar impressora}</H2>
+
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+<TABLE>
+{op=modify-printer?:<TR>
+<TH CLASS="label">Nome:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>}
+<TR>
+<TH CLASS="label">Descrição:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Localização:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Compartilhamento:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}">
+{?printer_is_shared=?Não compartilhar:{?printer_is_shared=0?Não compartilhar:Compartilhar}} esta impressora</TD>
+</TR>
+<TR>
+<TH CLASS="label">Fabricante:</TH>
+<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Selecione outro fabricante"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Modelo:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Driver atual - {current_make_and_model}</OPTION>:}
+{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
+}</SELECT>
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Ou forneça um arquivo PPD:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Adicionar impressora:Modificar impressora}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/choose-serial.tmpl

@@ -0,0 +1,52 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Adicionar impressora}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Taxa de dados (Baud Rate):</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Paridade:</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Nenhum
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Par
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Ímpar
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Bits de Dados:</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Controle de Fluxo:</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Nenhum
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Software)
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Hardware)
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Hardware)
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continar"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/choose-uri.tmpl

@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:}
+<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Exemplos:
+<PRE>
+    http://hostname:631/ipp/
+    http://hostname:631/ipp/port1
+
+    ipp://hostname/ipp/
+    ipp://hostname/ipp/port1
+
+    lpd://hostname/queue
+
+    socket://hostname
+    socket://hostname:9100
+</PRE>
+
+<P>Veja <A HREF="/help/network.html" TARGET="_blank">"Network
+Printers"</A> para a URI correta a ser usada para sua impressora.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continuar"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/class-added.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Adicionar classe</H2>
+
+<P>Classe <A HREF="/classes/{printer_name}">{printer_name}</A> foi adicionada com sucesso.
+
+</DIV>

templates/pt_BR/class-confirm.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Excluir classe {printer_name}</H2>
+
+<P><B>Aviso:</B> Você tem certeza que quer excluir a classe {printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Excluir classe"></FORM></P>
+
+</DIV>

templates/pt_BR/class-deleted.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Excluir classe {printer_name}</H2>
+
+<P>A classe {printer_name} foi excluída com sucesso.
+
+</DIV>

templates/pt_BR/class-jobs-header.tmpl

@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Trabalhos</H3>
+</DIV>

templates/pt_BR/class-modified.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modificar classe {printer_name}</H2>
+
+<P>A classe <A HREF="/classes/{printer_name}">{printer_name}</A> foi modificada com sucesso.
+
+</DIV>

templates/pt_BR/class.tmpl

@@ -0,0 +1,44 @@
+<DIV CLASS="indent">
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?Inativa:{printer_state=4?Processando:Pausada}},
+{printer_is_accepting_jobs=0?Rejeitando trabalhos:Aceitando trabalhos},
+{server_is_sharing_printers=0?Não compartilhada:{printer_is_shared=0?Não compartilhada:Compartilhada}} {default_name={printer_name}?, Padrão do servidor:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Manutenção</OPTION>
+<OPTION VALUE="print-test-page">Imprimir página de teste</OPTION>
+{printer_state=5?<OPTION VALUE="start-class">Resumir classe</OPTION>:<OPTION VALUE="stop-class">Pausar classe</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceitar trabalhos</OPTION>:<OPTION VALUE="reject-jobs">Rejeitar trabalhos</OPTION>}
+<OPTION VALUE="move-jobs">Mover todos trabalhos/OPTION>
+<OPTION VALUE="purge-jobs">Cancelar todos trabalhos</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Ir" STYLE="display: none;">
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administração</OPTION>
+<OPTION VALUE="modify-class">Modificar classe</OPTION>
+<OPTION VALUE="delete-class">Excluir classe</OPTION>
+<OPTION VALUE="set-class-options">Definir opções padrão</OPTION>
+<OPTION VALUE="set-as-default">Definir como servidor padrão</OPTION>
+<OPTION VALUE="set-allowed-users">Definir usuários permitidos</OPTION>
+</SELECT>
+<INPUT TYPE="SUBMIT" VALUE="Ir" STYLE="display: none;">
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Descrição:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Localização:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Membros:</TH><TD>{?member_uris=?None:{member_uris}}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Padrões:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:desconhecido}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>

templates/pt_BR/classes-header.tmpl

@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Nenhuma classe:Mostrando {#printer_name} de {total} classe{total=1?:s}}.</P>

templates/pt_BR/classes.tmpl

@@ -0,0 +1,11 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Class List">
+<THEAD>
+<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&amp;WHICH_JOBS={?WHICH_JOBS}&amp;FIRST={FIRST}&amp;ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>&#x25b2;</SMALL> Nome da fila <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Nome da fila <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Descrição</TH><TH>Localização</TH><TH>Membros</TH><TH>Estado</TH></TR>
+</THEAD>
+<TBODY>
+{[printer_name]
+<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?Nenhum:{member_uris}}</TD><TD>{printer_state=3?Inativa:{printer_state=4?Processando:Pausada}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}

templates/pt_BR/command.tmpl

@@ -0,0 +1,12 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{title} em {printer_name}</H2>
+
+<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16"
+ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Trabalho de comando de impressora
+{job_state=3?pendente:{job_state=4?retido:
+{job_state=5?processando:{job_state=6?parada:
+{job_state=7?cancelado:{job_state=8?abortado:completo}}}}}}{job_state=9?:{job_printer_state_message?,
+<EM>"{job_printer_state_message}"</EM>:}}</P>
+
+</DIV>

templates/pt_BR/edit-config.tmpl

@@ -0,0 +1,24 @@
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value = "{?cupsdconf_default}";
+}
+</SCRIPT>
+
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Editar arquivo de configuração</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Salvar alterações">
+<INPUT TYPE="BUTTON" VALUE="Usar arquivo de configuração padrão"
+onClick="reset_config();"></P>
+
+</FORM>
+
+</DIV>

templates/pt_BR/error-op.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Erro {?title} {?printer_name}</H2>
+
+<P>Erro:</P>
+
+<BLOCKQUOTE>Operação desconhecida "{op}"!</BLOCKQUOTE>
+
+</DIV>

templates/pt_BR/error.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Erro {?title} {?printer_name}</H2>
+
+<P>{?message?{message}:Erro}:</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+
+</DIV>

templates/pt_BR/header.tmpl.in

@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
+	<LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+	<SCRIPT TYPE="text/javascript"><!--
+	/* Show an error if cookies are disabled */
+	function check_cookies() {
+	  if (!navigator.cookieEnabled) {
+		document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+	  }
+	}
+	--></SCRIPT>
+</HEAD>
+<BODY ONLOAD="check_cookies();">
+<TABLE CLASS="page" SUMMARY="{title}">
+<TR><TD CLASS="body">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
+<TR HEIGHT="36">
+<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG
+SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD>
+<TD CLASS="unsel"><A HREF="/">&nbsp;&nbsp;In&iacute;cio&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin">&nbsp;&nbsp;Administra&ccedil;&atilde;o&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/">&nbsp;&nbsp;Classes&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/">&nbsp;&nbsp;Ajuda&nbsp;online&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/">&nbsp;&nbsp;Trabalhos&nbsp;&nbsp;</A></TD>
+<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/">&nbsp;&nbsp;Impressoras&nbsp;&nbsp;</A></TD>
+<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT
+TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Procurar ajuda"
+VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD>
+<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD>
+</TR>
+</TABLE>
+<DIV ID="body">
+

templates/pt_BR/help-header.tmpl

@@ -0,0 +1,51 @@
+<DIV CLASS="indent">
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Pesquisar em 
+{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:todos os documentos}}:</B> <INPUT
+TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER=""
+AUTOSAVE="org.cups.help" RESULTS="20">
+<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Pesquisar">
+<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Limpar"></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Conteúdo">
+<TR><TD>
+
+<H3 CLASS="title">Documentos de ajuda online</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Todos os Documentos</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</TD></TR>
+</TABLE></DIV>
+
+{QUERY?<P>Pesquisar resultados em {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Todos os documentos}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (em <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Nenhum resultado encontrado.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}</H1>
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Ver versão imprimível"></FORM>:
+
+<H1>Ajuda online</H1>
+
+<P>Essa é a interface de ajuda online do CUPS. Forneça expressões de pesquisa
+acima ou clique em qualquer um dos links de documentação para mostrar
+a informação de ajuda online.</P>
+
+<P>Se você é novo no CUPS, leia a página "<a
+href="/help/overview.html">Visão geral do CUPS</a>". Usuários veteranos
+devem ler a página "<a href="/help/whatsnew.html">O que Há de Novo no CUPS
+1.6</a>".</P>
+
+<P>A <A HREF="http://www.cups.org/">Página inicial do CUPS</A> também
+fornece muitos recursos incluindo fórums de discussão de usuários, respostas
+a perguntas frequentes e um formulário para enviar registros de erros e
+pedidos de melhorias.</P>}

templates/pt_BR/job-cancel.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Cancelar trabalho {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Trabalho {job_id}</A> foi cancelado.
+
+</DIV>

templates/pt_BR/job-hold.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Reter trabalho {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Trabalho {job_id}</A> foi retido para não ser impresso.
+
+</DIV>

templates/pt_BR/job-move.tmpl

@@ -0,0 +1,27 @@
+<DIV CLASS="indent">
+
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Mover trabalho {job_id}:Mover todos trabalhos}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Novo destino:</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="{job_id?Mover trabalho:Mover trabalhos}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+
+</DIV>

templates/pt_BR/job-moved.tmpl

@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">{job_id?Mover trabalho {job_id}:Mover trabalhos}</H2>
+
+<P>{job_id?<A HREF="/jobs/{job_id}">Trabalho {job_id} for movido</A>:Todos trabalhos foram movidos} para
+<A HREF="/{is_class?classes:printers}/{job_printer_name}">{job_printer_name}</A>.</P>
+
+</DIV>

templates/pt_BR/job-release.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Liberar trabalho {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Trabalho {job_id}</A> foi liberado para impressão.
+
+</DIV>

templates/pt_BR/job-restart.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Reimprimir trabalho {job_id}</H2>
+
+<P><A HREF="{job_printer_uri}">Trabalho {job_id}</A> foi reiniciado.
+
+</DIV>

templates/pt_BR/jobs-header.tmpl

@@ -0,0 +1,5 @@
+<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Mostrar trabalhos ativos"></FORM>}
+{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Mostrar trabalhos completos"></FORM>}
+{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Mostrar todos trabalhos"></FORM>}</DIV>
+
+<P ALIGN="CENTER">{total=0?Nenhum trabalho:Mostrando {#job_id} de {total} trabalho{total=1?:s}} {?which_jobs=?ativos:{which_jobs=all?:completos}} .</P>

templates/pt_BR/jobs.tmpl

@@ -0,0 +1,36 @@
+{#job_id=0?:
+<TABLE CLASS="list" SUMMARY="Job List">
+<THEAD>
+<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&amp;WHICH_JOBS={?WHICH_JOBS}&amp;FIRST={FIRST}&amp;ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>&#x25b2;</SMALL> ID <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> ID <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Nome</TH><TH>Usuário</TH><TH>Tamanho</TH><TH>Páginas</TH><TH>Estado</TH><TH>Controle</TH></TR>
+</THEAD>
+<TBODY>
+{[job_id]
+<TR VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):}&nbsp;</TD>
+<TD>{?job_name=?Desconhecido:{job_name}}&nbsp;</TD>
+<TD>{?job_originating_user_name=?Oculto:{job_originating_user_name}}&nbsp;</TD>
+<TD>{job_k_octets}k&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Desconhecido:{?job_media_sheets_completed}}&nbsp;</TD>
+<TD>{job_state=3?pendente desde<BR>{time_at_creation}:{job_state=4?retido desde<BR>{time_at_creation}:
+{job_state=5?processando desde<BR>{time_at_processing}:{job_state=6?parado:
+{job_state=7?cancelado em<BR>{time_at_completed}:{job_state=8?abortado:completou em<BR>{time_at_completed}}}}}}}&nbsp;{job_printer_state_message?<BR>
+<EM>"{job_printer_state_message}"</EM>:}</TD>
+<TD>
+{job_preserved>0?{job_state>5?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="Reimprimir trabalho"></FORM>:}:}
+{job_state=4?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Liberar trabalho"></FORM>:}
+{job_state=3?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Reter trabalho"></FORM>:}
+{job_state<7?
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}">
+<INPUT TYPE="SUBMIT" VALUE="Cancelar trabalho"></FORM>
+<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Mover trabalho"></FORM>:}
+&nbsp;</TD>
+</TR>
+}
+</TBODY>
+</TABLE>
+}

templates/pt_BR/list-available-printers.tmpl

@@ -0,0 +1,11 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Impressoras disponíveis</H2>
+
+{#device_uri=0?<P>Nenhuma impressora encontrada.</P>
+:<UL>{[device_uri]
+<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Adicionar esta impressora"></FORM>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+</DIV>

templates/pt_BR/modify-class.tmpl

@@ -0,0 +1,34 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modificar classe {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Descrição:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Localização:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membros:</TH>
+<TD>
+<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
+{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Modificar classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/modify-printer.tmpl

@@ -0,0 +1,42 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modificar {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+
+<TABLE>
+<TR>
+<TH CLASS="label">Descrição:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Descrição legível para humanos, tal como "HP LaserJet com Duplexador")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Localização:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>(Localização legível para humanos, tal como "Laboratório 1")</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Conexão:</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Compartilhamento:</TH>
+<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}>
+Compartilhar esta impressora</TD>
+</TR>
+<TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Continar"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+</DIV>

templates/pt_BR/norestart.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Alterar configurações</H2>
+
+<P>O servidor não foi reiniciado porque nenhuma alteração foi feita na configuração...</P>
+
+</DIV>

templates/pt_BR/option-boolean.tmpl

@@ -0,0 +1,6 @@
+<TR>
+<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
+<TD>
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>

templates/pt_BR/option-conflict.tmpl

@@ -0,0 +1,7 @@
+<P><B>Erro:</B> As seguintes opções estão conflitando:</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI>
+}</UL>
+
+<P>Por favor, altere uma ou mais opções para resolver os conflitos.</P>

templates/pt_BR/option-header.tmpl

@@ -0,0 +1,5 @@
+<DIV CLASS="tab" ID="{group_id}">
+
+<H3 ALIGN="CENTER">{group}</H3>
+
+<TABLE WIDTH="100%">

templates/pt_BR/option-pickmany.tmpl

@@ -0,0 +1,6 @@
+<TR>
+<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
+<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+</SELECT></TD>
+</TR>

templates/pt_BR/option-pickone.tmpl

@@ -0,0 +1,18 @@
+<TR>
+<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
+<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
+</SELECT>
+{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
+<TR><TH CLASS="sublabel">{paramtext}:</TH>
+<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}">
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Pontos</OPTION>
+<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Milímetros</OPTION>
+<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Centímetros</OPTION>
+<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Polegadas</OPTION>
+<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Pés</OPTION>
+<OPTION VALUE="m"{paramvalue=m? SELECTED:}>Metros</OPTION>
+</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR>
+}</TABLE>
+</TD>:}
+</TR>

templates/pt_BR/option-trailer.tmpl

@@ -0,0 +1,5 @@
+</TABLE>
+
+<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Definir opções padrão"></P>
+
+</DIV>

templates/pt_BR/pager.tmpl

@@ -0,0 +1,6 @@
+<TABLE CLASS="inset" SUMMARY="Barra de paginação">
+<TR>
+	<TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="&#x25c0; Mostrar anterior"></FORM>:&nbsp;}</TD>
+	<TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar próximo &#x25b6;"></FORM>:&nbsp;}</TD>
+</TR>
+</TABLE>

templates/pt_BR/printer-accept.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Aceitar trabalhos na {is_class?classe:impressora} {printer_name}</H2>
+
+<P>A {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+agora está aceitando trabalhos.</P>
+
+</DIV>

templates/pt_BR/printer-added.tmpl

@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Adicionar impressora</H2>
+
+<P>A impressora <A HREF="/printers/{printer_name}">{printer_name}</A> foi adicionada
+com sucesso.
+
+</DIV>

templates/pt_BR/printer-configured.tmpl

@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Configurar opções padrão para {printer_name}</H2>
+
+<P>As opções padrão da {OP=set-class-options?classe <A HREF="/classes/{printer_name}">:impressora <A HREF="/printers/{printer_name}">}{printer_name}</A>
+foram configuradas com sucesso.
+
+</DIV>

templates/pt_BR/printer-confirm.tmpl

@@ -0,0 +1,10 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Excluir impressora {printer_name}</H2>
+
+<P><B>Aviso:</B> Tem certeza que deseja excluir a impressora
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Apagar impressora"></FORM></P>
+
+</DIV>

templates/pt_BR/printer-default.tmpl

@@ -0,0 +1,12 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Definir a {is_class?classe:impressora} {printer_name} como padrão</H2>
+
+<P>A {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+foi definida como a impressora padrão no servidor.</P>
+
+<BLOCKQUOTE><B>Nota:</B> O padrão de qualquer usuário que tenha sido configurado via
+do comando <TT>lpoptions</TT> vai sobrepor esta configuração padrão.</BLOCKQUOTE>
+
+</DIV>

templates/pt_BR/printer-deleted.tmpl

@@ -0,0 +1,7 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Excluir Impressora {printer_name}</H2>
+
+<P>A impressora {printer_name} foi excluída com sucesso.
+
+</DIV>

templates/pt_BR/printer-jobs-header.tmpl

@@ -0,0 +1,3 @@
+<DIV CLASS="indent">
+<H3 CLASS="title">Trabalhos</H3>
+</DIV>

templates/pt_BR/printer-modified.tmpl

@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Modificar impressora {printer_name}</H2>
+
+<P>A impressora <A HREF="/printers/{printer_name}">{printer_name}</A> foi
+modificada com sucesso.
+
+</DIV>

templates/pt_BR/printer-purge.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Eliminar trabalhos na {is_class?classe:impressora} {printer_name}</H2>
+
+<P>Todos os trabalhos da {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+foram eliminados.</P>
+
+</DIV>

templates/pt_BR/printer-reject.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Rejeitar trabalhos na {is_class?classe:impressora} {printer_name}</H2>
+
+<P>A {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+não está mais aceitando trabalhos.</P>
+
+</DIV>

templates/pt_BR/printer-start.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Resumir a {is_class?classe:impressora} {printer_name}</H2>
+
+<P>A {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+foi resumida com sucesso.</P>
+
+</DIV>

templates/pt_BR/printer-stop.tmpl

@@ -0,0 +1,9 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Pausar a {is_class?classe:impressora} {printer_name}</H2>
+
+<P>A {is_class?classe:impressora} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+foi pausada.</P>
+
+</DIV>

templates/pt_BR/printer.tmpl

@@ -0,0 +1,47 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>
+({printer_state=3?Inativa:{printer_state=4?processando:pausada}},
+{printer_is_accepting_jobs=0?rejeitando trabalhos:aceitando trabalhos},
+{server_is_sharing_printers=0?não compartilhada:{printer_is_shared=0?não compartilhada:compartilhada}} {default_name={printer_name}?, padrão do servidor:})</H2>
+
+<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();">
+<OPTION VALUE="">Manutenção</OPTION>
+<OPTION VALUE="print-test-page">Imprimir página de teste</OPTION>
+{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Limpar cabeças de impressão</OPTION>:}
+{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">Imprimir página de auto-teste</OPTION>:}
+{printer_state=5?<OPTION VALUE="start-printer">Pausar impressora</OPTION>:<OPTION VALUE="stop-printer">Pausar impressora</OPTION>}
+{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceitar trabalhos</OPTION>:<OPTION VALUE="reject-jobs">Rejeitar trabalhos</OPTION>}
+<OPTION VALUE="move-jobs">Mover todos trabalhos</OPTION>
+<OPTION VALUE="purge-jobs">Cancelar todos trabalhos</OPTION>
+</SELECT>
+<NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Ir"></NOSCRIPT>
+</FORM>
+
+<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">
+<SELECT NAME="OP" ONCHANGE="document.administration.submit();">
+<OPTION VALUE="">Administração</OPTION>
+<OPTION VALUE="modify-printer">Modificar impressora</OPTION>
+<OPTION VALUE="delete-printer">Excluir impressora</OPTION>
+<OPTION VALUE="set-printer-options">Definir opções padrão</OPTION>
+<OPTION VALUE="set-as-default">Definir com padrão do servidor</OPTION>
+<OPTION VALUE="set-allowed-users">Definir usuários permitidos</OPTION>
+</SELECT>
+<NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Ir"></NOSCRIPT>
+</FORM>
+
+<TABLE SUMMARY="{printer_name}">
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Descrição:</TH><TD>{printer_info}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Localização:</TH><TD>{printer_location}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Driver:</TH><TD>{printer_make_and_model} ({color_supported=1?color:grayscale}{sides_supported?, 2-sided printing:})<BR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Conexão:</TH><TD>{device_uri}</TD></TR>
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Padrões:</TH><TD>job-sheets={job_sheets_default}
+media={media_default?{media_default}:desconhecido}
+{sides_default?sides={sides_default}:}</TD></TR>
+</TABLE>
+
+</DIV>

templates/pt_BR/printers-header.tmpl

@@ -0,0 +1 @@
+<P ALIGN="CENTER">{total=0?Nenhuma impressora:Mostrando {#printer_name} de {total} impressora{total=1?:s}}.</P>

templates/pt_BR/printers.tmpl

@@ -0,0 +1,11 @@
+{#printer_name=0?:
+<TABLE CLASS="list" SUMMARY="Lista de impressoras">
+<THEAD>
+<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&amp;WHICH_JOBS={?WHICH_JOBS}&amp;FIRST={FIRST}&amp;ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>&#x25b2;</SMALL> Nome da fila <SMALL>&#x25b2;</SMALL>:<SMALL>&#x25bc;</SMALL> Nome da fila <SMALL>&#x25bc;</SMALL>}</A></TH><TH>Descrição</TH><TH>Localização</TH><TH>Marca e modelo</TH><TH>Estado</TH></TR>
+</THEAD>
+<TBODY>
+{[printer_name]
+<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{printer_make_and_model}</TD><TD>{printer_state=3?Ociosa:{printer_state=4?Processando:Pausada}}{printer_state_message? - "{printer_state_message}":}</TD></TR>
+}
+</TBODY>
+</TABLE></DIV>}

templates/pt_BR/restart.tmpl

@@ -0,0 +1,8 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Alterar configurações</H2>
+
+<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE"
+ALT="Busy Indicator"> Por favor, aguarde enquanto o servidor é reiniciado...</P>
+
+</DIV>

templates/pt_BR/samba-export.tmpl

@@ -0,0 +1,54 @@
+<SCRIPT TYPE="text/javascript"><!--
+function select_printers() {
+  var list = document.export_samba.EXPORT_NAME;
+  var sel = document.export_samba.EXPORT_ALL.checked;
+
+  for (i = 0; i < list.length; i ++) {
+    list.options[i].selected = sel;
+  }
+}
+--></SCRIPT>
+
+<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Exportar impressoras para o Samba</H2>
+
+{error?<P>Não foi possível exportar impressoras para o Samba\:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Consulte o arquivo <A HREF="/admin/log/error_log"
+TARGET="_blank">error_log</A> para mais informações.</P>:
+<P>Essa página permite que você exporte impressoras para o Samba
+para que clientes Windows possam acessá-las através do ícone de
+<VAR>Meus locais de rede</VAR> nas suas áreas de trabalho.
+Você deve primeiro instalar os drivers de impressora PostScript
+do Windows como descrito na página de manual do
+<A HREF="/help/man-cupsaddsmb.html" TARGET="_blank">cupsaddsmb(8)</A>.</P>}
+
+<TABLE>
+<TR>
+<TH CLASS="label">Impressoras:</TH>
+<TD>
+<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
+{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
+</SELECT><BR>
+<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:}
+onChange="select_printers()"> Exportar todas as impressoras
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Nome do usuário do Samba:</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (obrigatório)</TD>
+</TR>
+<TR>
+<TH CLASS="label">Senha do Samba:</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (obrigatório)</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="SUBMIT" VALUE="Exportar impressoras para o Samba"></TD>
+</TR>
+</TABLE>
+
+</FORM>

templates/pt_BR/samba-exported.tmpl

@@ -0,0 +1 @@
+<P>Impressoras exportadas para o samba com sucesso.</P>

templates/pt_BR/search.tmpl

@@ -0,0 +1,10 @@
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Pesquisar em
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?classes:{SECTION=jobs?Trabalhos:Impressoras}}}:</B>
+<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40"  PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT
+TYPE="SUBMIT" VALUE="Pesquisar"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Limpar"></P>
+
+</FORM>

templates/pt_BR/set-printer-options-header.tmpl

@@ -0,0 +1,26 @@
+<DIV CLASS="indent">
+
+<H2 CLASS="title">Definir opções padrão para {printer_name}</H2>
+
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Consultar impressora por opções padrão">:}
+
+<SCRIPT TYPE="text/javascript"><!--
+function update_paramtable(option)
+{
+  var cb = document.getElementById("select-" + option)
+  var paramstable = document.getElementById(option + "-params");
+  if (cb.value == "Custom")
+    paramstable.style.display = "table";
+  else
+    paramstable.style.display = "none";
+}
+--></SCRIPT>
+
+<H3 CLASS="title">{[group_id]
+<A HREF="#{group_id}">{group}</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}</H3>
+
+<DIV CLASS="tabs">