From b721973fc2c04d3d610851033c52e3c94401e2de Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 20 Jan 2020 14:35:21 +0900 Subject: [PATCH] Imported Upstream version 2.2.7 --- CHANGES.md | 67 +- INSTALL.md | 2 +- README.md | 4 +- backend/ipp.c | 43 +- backend/org.cups.usb-quirks | 18 +- berkeley/lpr.c | 32 +- cgi-bin/var.c | 8 +- configure | 20 +- configure.ac | 4 +- cups/Makefile | 10 +- cups/auth.c | 609 +++++++++--- cups/cups.h | 9 +- cups/hash.c | 91 +- cups/http-private.h | 23 +- cups/http-support.c | 8 +- cups/http.c | 223 +++-- cups/http.h | 7 +- cups/ipp-support.c | 20 +- cups/ipp.c | 14 +- cups/ipp.h | 10 +- cups/md5.c | 170 ++-- cups/md5passwd.c | 52 +- cups/ppd-cache.c | 67 +- cups/ppd-conflicts.c | 5 +- cups/ppd-localize.c | 4 +- cups/ppd-util.c | 127 +-- cups/tempfile.c | 32 +- cups/testppd.c | 8 + cups/thread.c | 28 +- cups/tls-darwin.c | 83 +- cups/tls-gnutls.c | 104 +- cups/tls-sspi.c | 45 +- cups/tls.c | 2 +- cups/tlscheck.c | 9 +- cups/usersys.c | 50 +- cups/versioning.h | 4 +- doc/help/cupspm.epub | Bin 219681 -> 219707 bytes doc/help/cupspm.html | 5 +- doc/help/man-client.conf.html | 6 +- doc/help/man-cups-files.conf.html | 11 +- doc/help/man-cupsd.conf.html | 6 +- doc/help/man-lpadmin.html | 1 + filter/raster.c | 268 +++++- locale/cups.footer | 246 ++--- locale/cups.pot | 1265 +++++++++++++------------ locale/cups.strings | 234 ++--- locale/cups_ca.po | 73 +- locale/cups_cs.po | 73 +- locale/cups_de.po | 73 +- locale/cups_es.po | 77 +- locale/cups_fr.po | 73 +- locale/cups_it.po | 73 +- locale/cups_ja.po | 73 +- locale/cups_pt_BR.po | 73 +- locale/cups_ru.po | 73 +- locale/cups_zh_CN.po | 73 +- man/lpadmin.man | 7 +- packaging/cups.spec | 4 +- ppdc/ppdc-catalog.cxx | 4 +- ppdc/sample.drv | 3 + scheduler/auth.c | 20 +- scheduler/client.c | 29 +- scheduler/conf.c | 36 +- scheduler/cups-driverd.cxx | 8 +- scheduler/dirsvc.c | 21 +- scheduler/ipp.c | 4 + scheduler/log.c | 4 +- scheduler/main.c | 2 +- scheduler/org.cups.cupsd.service.in | 1 + scheduler/process.c | 15 +- systemv/cupsaccept.c | 8 +- systemv/lp.c | 31 +- systemv/lpadmin.c | 106 ++- systemv/lpinfo.c | 21 +- test/ipp-everywhere.test | 1737 +++++++++++++++++----------------- test/run-stp-tests.sh | 12 +- test/testfile.ps | 21 +- vcnet/config.h | 12 +- vcnet/cupstestppd.vcxproj | 11 +- vcnet/ippfind.vcxproj | 11 +- vcnet/ippserver.vcxproj | 11 +- vcnet/ipptool.vcxproj | 11 +- vcnet/libcups2.vcxproj | 19 +- vcnet/libcups2.vcxproj.filters | 1 + vcnet/libcupsimage2.vcxproj | 11 +- vcnet/regex.vcxproj | 11 +- vcnet/testfile.vcxproj | 7 +- vcnet/testhttp.vcxproj | 7 +- xcode/CUPS.xcodeproj/project.pbxproj | 210 +++- xcode/config.h | 8 +- 90 files changed, 4620 insertions(+), 2592 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9e83177..f568f35 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,72 @@ -CHANGES - 2.2.6 - 2017-11-01 +CHANGES - 2.2.7 - 2018-03-22 ============================ +Changes in CUPS v2.2.7 +---------------------- + +- NOTICE: Raw print queues are now deprecated (Issue #5269) +- Fixed an Avahi crash bug in the scheduler (Issue #5268) +- The IPP Everywhere PPD generator did not include the `cupsJobPassword` + keyword, when supported (Issue #5265) +- Systemd did not restart cupsd when configuration changes were made that + required a restart (Issue #5263) +- The Lexmark Optra E310 printer needs the "no-reattach" USB quirk rule + (Issue #5259) +- The scheduler could crash while adding an IPP Everywhere printer (Issue #5258) +- Label printers supported by the rastertolabel driver don't support SNMP, so + don't delay printing to test it (Issue #5256) +- Fixed a compile issue when PAM is not available (Issue #5253) +- Documentation fixes (Issue #5252) +- Star Micronics printers need the "unidir" USB quirk rule (Issue #5251) +- The scheduler now supports using temporary print queues for older IPP/1.1 + print queues like those shared by CUPS 1.3 and earlier (Issue #5241) +- Fixed printing to some IPP Everywhere printers (Issue #5238) +- Kerberized printing to another CUPS server did not work correctly + (Issue #5233) +- The `cupsRasterWritePixels` function did not correctly swap bytes for some + formats (Issue #5225) +- Added a USB quirk rule for Canon MP280 series printers (Issue #5221) +- The `ppdInstallableConflict` tested too many constraints (Issue #5213) +- More fixes for printing to old CUPS servers (Issue #5211) +- The `cupsCopyDest` function now correctly copies the `is_default` value + (Issue #5208) +- The scheduler did not work with older versions of uClibc (Issue #5188) +- The scheduler now substitutes default values for invalid job attributes when + running in "relaxed conformance" mode (Issue #5186) +- Fixed PAM module detection and added support for the common PAM definitions + (Issue #5185) +- Fixed a journald support bug in the scheduler (Issue #5181) +- The cups-driverd program incorrectly stopped scanning PPDs as soon as a loop + was seen (Issue #5170) +- Fixed group validation on OpenBSD (Issue #5166) +- Fixed the `ippserver` sample code when threading is disabled or unavailable + (Issue #5154) +- The `cupsEnumDests` function did not include options from the lpoptions files + (Issue #5144) +- The `SSLOptions` directive now supports `MinTLS` and `MaxTLS` options to + control the minimum and maximum TLS versions that will be allowed, + respectively (Issue #5119) +- The scheduler did not write out dirty configuration and state files if there + were open client connections (Issue #5118) +- The `lpadmin` command now provides a better error message when an unsupported + System V interface script is used (Issue #5111) +- The `lp` and `lpr` commands now provide better error messages when the default + printer cannot be found (Issue #5096) +- No longer support backslash, question mark, or quotes in printer names + (Issue #4966) +- The CUPS library now supports the latest HTTP Digest authentication + specification including support for SHA-256 (Issue #4862) +- The `lpstat` command now reports when new jobs are being held (Issue #4761) +- The `lpoptions` command incorrectly saved default options (Issue #4717) +- The `ppdLocalizeIPPReason` function incorrectly returned a localized version + of "none" (rdar://36566269) +- TLS connections now properly timeout (rdar://34938533) +- The IPP backend did not properly detect failed PDF prints (rdar://34055474) +- Temporary files are now placed in the correct directory for sandboxed + applications on macOS (rdar://problem/37789645) + + Changes in CUPS v2.2.6 ---------------------- diff --git a/INSTALL.md b/INSTALL.md index 2c1c641..0b7a847 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -INSTALL - CUPS v2.2.6 - 2017-11-01 +INSTALL - CUPS v2.2.7 - 2018-03-22 ================================== This file describes how to compile and install CUPS from source code. For more diff --git a/README.md b/README.md index 17ac7e7..cf204df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -README - CUPS v2.2.6 - 2017-11-01 +README - CUPS v2.2.7 - 2018-03-22 ================================= Looking for compile instructions? Read the file `INSTALL.md` instead... @@ -148,7 +148,7 @@ This will prevent the filters from misinterpreting your print file. LEGAL STUFF ----------- -CUPS is copyright © 2007-2017 by Apple Inc. CUPS and the CUPS logo are +CUPS is copyright © 2007-2018 by Apple Inc. CUPS and the CUPS logo are trademarks of Apple Inc. The MD5 Digest code is Copyright 1999 Aladdin Enterprises. diff --git a/backend/ipp.c b/backend/ipp.c index 588ad99..44ce8d2 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -47,6 +47,8 @@ extern void xpc_connection_set_target_uid(xpc_connection_t connection, #define _CUPS_JSR_ACCOUNT_LIMIT_REACHED 0x08 #define _CUPS_JSR_JOB_PASSWORD_WAIT 0x10 #define _CUPS_JSR_JOB_RELEASE_WAIT 0x20 +#define _CUPS_JSR_DOCUMENT_FORMAT_ERROR 0x40 +#define _CUPS_JSR_DOCUMENT_UNPRINTABLE 0x80 /* @@ -69,6 +71,7 @@ typedef struct _cups_monitor_s /**** Monitoring data ****/ http_encryption_t encryption; /* Use encryption? */ ipp_jstate_t job_state; /* Current job state */ ipp_pstate_t printer_state; /* Current printer state */ + int retryable; /* Is this a job that should be retried? */ } _cups_monitor_t; @@ -357,8 +360,7 @@ main(int argc, /* I - Number of command-line args */ * that way. */ - if (!getuid() && (value = getenv("AUTH_UID")) != NULL && - !getenv("AUTH_PASSWORD")) + if (!getuid() && (value = getenv("AUTH_UID")) != NULL) { uid_t uid = (uid_t)atoi(value); /* User ID */ @@ -392,7 +394,7 @@ main(int argc, /* I - Number of command-line args */ # else /* No XPC, just try to run as the user ID */ if (uid > 0) - seteuid(uid); + setuid(uid); # endif /* HAVE_XPC */ } #endif /* HAVE_GSSAPI */ @@ -1448,6 +1450,7 @@ main(int argc, /* I - Number of command-line args */ monitor.encryption = cupsEncryption(); monitor.job_state = IPP_JOB_PENDING; monitor.printer_state = IPP_PRINTER_IDLE; + monitor.retryable = argc == 6 && document_format && strcmp(document_format, "image/pwg-raster") && strcmp(document_format, "image/urf"); if (create_job) { @@ -2568,22 +2571,24 @@ monitor_printer( for (i = 0; i < attr->num_values; i ++) { - if (!strcmp(attr->values[i].string.text, - "account-authorization-failed")) + if (!strcmp(attr->values[i].string.text, "account-authorization-failed")) new_reasons |= _CUPS_JSR_ACCOUNT_AUTHORIZATION_FAILED; else if (!strcmp(attr->values[i].string.text, "account-closed")) new_reasons |= _CUPS_JSR_ACCOUNT_CLOSED; else if (!strcmp(attr->values[i].string.text, "account-info-needed")) new_reasons |= _CUPS_JSR_ACCOUNT_INFO_NEEDED; - else if (!strcmp(attr->values[i].string.text, - "account-limit-reached")) + else if (!strcmp(attr->values[i].string.text, "account-limit-reached")) new_reasons |= _CUPS_JSR_ACCOUNT_LIMIT_REACHED; else if (!strcmp(attr->values[i].string.text, "job-password-wait")) new_reasons |= _CUPS_JSR_JOB_PASSWORD_WAIT; else if (!strcmp(attr->values[i].string.text, "job-release-wait")) new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT; - if (!job_canceled && - (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system"))) + else if (!strcmp(attr->values[i].string.text, "document-format-error")) + new_reasons |= _CUPS_JSR_DOCUMENT_FORMAT_ERROR; + else if (!strcmp(attr->values[i].string.text, "document-unprintable")) + new_reasons |= _CUPS_JSR_DOCUMENT_UNPRINTABLE; + + if (!job_canceled && (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system"))) job_canceled = 1; } @@ -2601,6 +2606,26 @@ monitor_printer( fputs("JOBSTATE: job-password-wait\n", stderr); else if (new_reasons & _CUPS_JSR_JOB_RELEASE_WAIT) fputs("JOBSTATE: job-release-wait\n", stderr); + else if (new_reasons & (_CUPS_JSR_DOCUMENT_FORMAT_ERROR | _CUPS_JSR_DOCUMENT_UNPRINTABLE)) + { + if (monitor->retryable) + { + /* + * Can't print this, so retry as raster... + */ + + job_canceled = 1; + fputs("JOBSTATE: cups-retry-as-raster\n", stderr); + } + else if (new_reasons & _CUPS_JSR_DOCUMENT_FORMAT_ERROR) + { + fputs("JOBSTATE: document-format-error\n", stderr); + } + else + { + fputs("JOBSTATE: document-unprintable\n", stderr); + } + } else fputs("JOBSTATE: job-printing\n", stderr); diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks index bb2172f..f0ba5c2 100644 --- a/backend/org.cups.usb-quirks +++ b/backend/org.cups.usb-quirks @@ -8,10 +8,17 @@ # delay-close Delay close/reset of selected interface # no-reattach Do no re-attach usblp kernel module after printing. # soft-reset Do a soft reset after printing for cleanup. -# unidir Only supported unidirectional I/O +# unidir Only supports unidirectional I/O # usb-init Needs vendor USB initialization string. # vendor-class Uses vendor-specific class or subclass. # whitelist The printer is functional with the USB backend. +# +# To get the USB vendor and product IDs for a given printer, run the "lsusb" +# command, which will show something like the following: +# +# Bus 002 Device 003: ID ab21:34dc Acme Example Printer +# +# The "ab21:34dc" is the vendor and product ID, separated by a colon. # HP DeskJet 895C 0x03f0 0x0004 unidir @@ -265,3 +272,12 @@ # HP LaserJet 1160 (Issue #5121) 0x03f0 0x1e17 delay-close + +# Canon, Inc. MP280 series (Issue #5221) +0x04a9 0x1746 unidir + +# Star Micronics printers (Issue #5251) +0x0519 unidir + +# Lexmark Optra E310 (Issue #5259) +0x043d 0x000c no-reattach diff --git a/berkeley/lpr.c b/berkeley/lpr.c index e83f52e..09e0bf1 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -32,8 +32,7 @@ main(int argc, /* I - Number of command-line arguments */ char *printer, /* Destination printer or class */ *instance, /* Instance */ *opt; /* Option pointer */ - const char *title, /* Job title */ - *val; /* Environment variable name */ + const char *title; /* Job title */ int num_copies; /* Number of copies per file */ int num_files; /* Number of files to print */ const char *files[1000]; /* Files to print */ @@ -345,33 +344,10 @@ main(int argc, /* I - Number of command-line arguments */ if (printer == NULL) { - val = NULL; - - if ((printer = getenv("LPDEST")) == NULL) - { - if ((printer = getenv("PRINTER")) != NULL) - { - if (!strcmp(printer, "lp")) - printer = NULL; - else - val = "PRINTER"; - } - } - else - val = "LPDEST"; - - if (printer && !cupsGetNamedDest(NULL, printer, NULL)) - _cupsLangPrintf(stderr, - _("%s: Error - %s environment variable names " - "non-existent destination \"%s\"."), argv[0], val, - printer); - else if (cupsLastError() == IPP_NOT_FOUND) - _cupsLangPrintf(stderr, - _("%s: Error - no default destination available."), - argv[0]); + if (!cupsGetNamedDest(NULL, NULL, NULL) && cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND) + _cupsLangPrintf(stderr, _("%s: Error - %s"), argv[0], cupsLastErrorString()); else - _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."), - argv[0]); + _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."), argv[0]); return (1); } diff --git a/cgi-bin/var.c b/cgi-bin/var.c index c50833c..649b65b 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -18,7 +18,6 @@ /*#define DEBUG*/ #include "cgi-private.h" #include -#include /* @@ -1204,7 +1203,6 @@ cgi_set_sid(void) { char buffer[512], /* SID data */ sid[33]; /* SID string */ - _cups_md5_state_t md5; /* MD5 state */ unsigned char sum[16]; /* MD5 sum */ const char *remote_addr, /* REMOTE_ADDR */ *server_name, /* SERVER_NAME */ @@ -1225,11 +1223,9 @@ cgi_set_sid(void) (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255, (unsigned)CUPS_RAND() & 255); - _cupsMD5Init(&md5); - _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer)); - _cupsMD5Finish(&md5, sum); + cupsHashData("md5", (unsigned char *)buffer, strlen(buffer), sum, sizeof(sum)); - cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", NULL, 0, 0); + cgiSetCookie(CUPS_SID, cupsHashString(sum, sizeof(sum), sid, sizeof(sid)), "/", NULL, 0, 0); return (cupsGetOption(CUPS_SID, num_cookies, cookies)); } diff --git a/configure b/configure index c8b573f..21eca26 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2.6. +# Generated by GNU Autoconf 2.69 for CUPS 2.2.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.2.6' -PACKAGE_STRING='CUPS 2.2.6' +PACKAGE_VERSION='2.2.7' +PACKAGE_STRING='CUPS 2.2.7' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -1482,7 +1482,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.2.6 to adapt to many kinds of systems. +\`configure' configures CUPS 2.2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1547,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.2.6:";; + short | recursive ) echo "Configuration of CUPS 2.2.7:";; esac cat <<\_ACEOF @@ -1728,7 +1728,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.2.6 +CUPS configure 2.2.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2192,7 +2192,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.2.6, which was +It was created by CUPS $as_me 2.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2667,7 +2667,7 @@ fi ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.2.6" +CUPS_VERSION="2.2.7" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -10901,7 +10901,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.2.6, which was +This file was extended by CUPS $as_me 2.2.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10964,7 +10964,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.2.6 +CUPS config.status 2.2.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ac78c48..ed26daa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl dnl Configuration script for CUPS. dnl -dnl Copyright 2007-2017 by Apple Inc. +dnl Copyright 2007-2018 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.2.6], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.2.7], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) sinclude(config-scripts/cups-opsys.m4) sinclude(config-scripts/cups-common.m4) diff --git a/cups/Makefile b/cups/Makefile index 9a220c8..f292ff0 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,8 +1,8 @@ # # Library Makefile for CUPS. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products, all rights reserved. +# Copyright © 2007-2018 by Apple Inc. +# Copyright © 1997-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 @@ -331,7 +331,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER) echo Linking $@... $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \ -install_name $(libdir)/$@ \ - -current_version 2.12.0 \ + -current_version 2.13.0 \ -compatibility_version 2.0.0 \ -exported_symbols_list t.exp \ $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ @@ -347,7 +347,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER) libcups.la: $(LIBOBJS) echo Linking $@... $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \ - -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \ + -rpath $(LIBDIR) -version-info 2:13 $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) @@ -369,7 +369,7 @@ libcups.a: $(LIBOBJS) libcups2.def: $(LIBOBJS) Makefile echo Generating $@... echo "LIBRARY libcups2" >libcups2.def - echo "VERSION 2.12" >>libcups2.def + echo "VERSION 2.13" >>libcups2.def echo "EXPORTS" >>libcups2.def (nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \ echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \ diff --git a/cups/auth.c b/cups/auth.c index c051c86..4c38c9b 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -47,6 +47,10 @@ extern const char *cssmErrorString(int error); * Local functions... */ +static const char *cups_auth_find(const char *www_authenticate, const char *scheme); +static const char *cups_auth_param(const char *scheme, const char *name, char *value, size_t valsize); +static const char *cups_auth_scheme(const char *www_authenticate, char *scheme, size_t schemesize); + #ifdef HAVE_GSSAPI # ifdef HAVE_GSS_ACQUIRE_CRED_EX_F # ifdef HAVE_GSS_GSSAPI_SPI_H @@ -112,8 +116,10 @@ cupsDoAuthentication( const char *resource) /* I - Resource path */ { const char *password, /* Password string */ - *www_auth; /* WWW-Authenticate header */ - char prompt[1024], /* Prompt for user */ + *www_auth, /* WWW-Authenticate header */ + *schemedata; /* Scheme-specific data */ + char scheme[256], /* Scheme name */ + prompt[1024], /* Prompt for user */ realm[HTTP_MAX_VALUE], /* realm="xyz" string */ nonce[HTTP_MAX_VALUE]; /* nonce="xyz" string */ int localauth; /* Local authentication result */ @@ -163,122 +169,237 @@ cupsDoAuthentication( } /* - * Nope, see if we should retry the current username:password... + * Nope, loop through the authentication schemes to find the first we support. */ - www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE]; + www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); - if ((http->digest_tries > 1 || !http->userpass[0]) && - (!_cups_strncasecmp(www_auth, "Basic", 5) || - !_cups_strncasecmp(www_auth, "Digest", 6))) + for (schemedata = cups_auth_scheme(www_auth, scheme, sizeof(scheme)); schemedata; schemedata = cups_auth_scheme(schemedata + strlen(scheme), scheme, sizeof(scheme))) { /* - * Nope - get a new password from the user... + * Check the scheme name... */ - char default_username[HTTP_MAX_VALUE]; - /* Default username */ +#ifdef HAVE_GSSAPI + if (!_cups_strcasecmp(scheme, "Negotiate")) + { + /* + * Kerberos authentication... + */ - cg = _cupsGlobals(); + if (_cupsSetNegotiateAuthString(http, method, resource)) + { + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); + } - if (!cg->lang_default) - cg->lang_default = cupsLangDefault(); + break; + } + else +#endif /* HAVE_GSSAPI */ + if (_cups_strcasecmp(scheme, "Basic") && _cups_strcasecmp(scheme, "Digest")) + continue; /* Not supported (yet) */ - if (httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "username", - default_username)) - cupsSetUser(default_username); + /* + * See if we should retry the current username:password... + */ - snprintf(prompt, sizeof(prompt), - _cupsLangString(cg->lang_default, _("Password for %s on %s? ")), - cupsUser(), - http->hostname[0] == '/' ? "localhost" : http->hostname); + if ((http->digest_tries > 1 || !http->userpass[0]) && (!_cups_strcasecmp(scheme, "Basic") || (!_cups_strcasecmp(scheme, "Digest")))) + { + /* + * Nope - get a new password from the user... + */ - http->digest_tries = _cups_strncasecmp(www_auth, "Digest", 6) != 0; - http->userpass[0] = '\0'; + char default_username[HTTP_MAX_VALUE]; + /* Default username */ - if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) - { - http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; - return (-1); - } + cg = _cupsGlobals(); - snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(), - password); - } - else if (http->status == HTTP_STATUS_UNAUTHORIZED) - http->digest_tries ++; + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); - if (http->status == HTTP_STATUS_UNAUTHORIZED && http->digest_tries >= 3) - { - DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)", - http->digest_tries)); + if (cups_auth_param(scheme, "username", default_username, sizeof(default_username))) + cupsSetUser(default_username); - http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; - return (-1); - } + snprintf(prompt, sizeof(prompt), _cupsLangString(cg->lang_default, _("Password for %s on %s? ")), cupsUser(), http->hostname[0] == '/' ? "localhost" : http->hostname); - /* - * Got a password; encode it for the server... - */ + http->digest_tries = _cups_strncasecmp(scheme, "Digest", 6) != 0; + http->userpass[0] = '\0'; -#ifdef HAVE_GSSAPI - if (!_cups_strncasecmp(www_auth, "Negotiate", 9)) - { - /* - * Kerberos authentication... - */ + if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL) + { + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); + } + + snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(), password); + } + else if (http->status == HTTP_STATUS_UNAUTHORIZED) + http->digest_tries ++; - if (_cupsSetNegotiateAuthString(http, method, resource)) + if (http->status == HTTP_STATUS_UNAUTHORIZED && http->digest_tries >= 3) { + DEBUG_printf(("1cupsDoAuthentication: Too many authentication tries (%d)", http->digest_tries)); + http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; return (-1); } - } - else -#endif /* HAVE_GSSAPI */ - if (!_cups_strncasecmp(www_auth, "Basic", 5)) - { + /* - * Basic authentication... + * Got a password; encode it for the server... */ - char encode[256]; /* Base64 buffer */ + if (!_cups_strcasecmp(scheme, "Basic")) + { + /* + * Basic authentication... + */ + + char encode[256]; /* Base64 buffer */ + httpEncode64_2(encode, sizeof(encode), http->userpass, (int)strlen(http->userpass)); + httpSetAuthString(http, "Basic", encode); + } + else if (!_cups_strcasecmp(scheme, "Digest")) + { + /* + * Digest authentication... + */ - httpEncode64_2(encode, sizeof(encode), http->userpass, - (int)strlen(http->userpass)); - httpSetAuthString(http, "Basic", encode); - } - else if (!_cups_strncasecmp(www_auth, "Digest", 6)) - { - /* - * Digest authentication... - */ + int i; /* Looping var */ + char algorithm[65], /* Hashing algorithm */ + opaque[HTTP_MAX_VALUE], + /* Opaque data from server */ + cnonce[65], /* cnonce value */ + kd[65], /* Final MD5/SHA-256 digest */ + ha1[65], /* Hash of username:realm:password */ + ha2[65], /* Hash of method:request-uri */ + hdata[65], /* Hash of auth data */ + temp[1024], /* Temporary string */ + digest[1024]; /* Digest auth data */ + unsigned char hash[32]; /* Hash buffer */ + const char *hashalg; /* Hashing algorithm */ + size_t hashsize; /* Size of hash */ + + if (strcmp(nonce, http->nonce)) + { + strlcpy(http->nonce, nonce, sizeof(http->nonce)); + http->nonce_count = 1; + } + else + http->nonce_count ++; - char encode[33], /* MD5 buffer */ - digest[1024]; /* Digest auth data */ + cups_auth_param(schemedata, "opaque", opaque, sizeof(opaque)); + cups_auth_param(schemedata, "nonce", nonce, sizeof(nonce)); + cups_auth_param(schemedata, "realm", realm, sizeof(realm)); + + for (i = 0; i < 64; i ++) + cnonce[i] = "0123456789ABCDEF"[CUPS_RAND() & 15]; + cnonce[64] = '\0'; + + if (cups_auth_param(schemedata, "algorithm", algorithm, sizeof(algorithm))) + { + /* + * Follow RFC 2617/7616... + */ - httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "realm", realm); - httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "nonce", nonce); + if (!_cups_strcasecmp(algorithm, "MD5")) + { + /* + * RFC 2617 Digest with MD5 + */ - httpMD5(cupsUser(), realm, strchr(http->userpass, ':') + 1, encode); - httpMD5Final(nonce, method, resource, encode); - snprintf(digest, sizeof(digest), - "username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", " - "response=\"%s\"", cupsUser(), realm, nonce, resource, encode); - httpSetAuthString(http, "Digest", digest); + hashalg = "md5"; + } + else if (!_cups_strcasecmp(algorithm, "SHA-256")) + { + /* + * RFC 7616 Digest with SHA-256 + */ + + hashalg = "sha2-256"; + } + else + { + /* + * Some other algorithm we don't support, skip this one... + */ + + continue; + } + + /* + * Calculate digest value... + */ + + /* H(A1) = H(username:realm:password) */ + snprintf(temp, sizeof(temp), "%s:%s:%s", cupsUser(), realm, strchr(http->userpass, ':') + 1); + hashsize = (size_t)cupsHashData(hashalg, (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, ha1, sizeof(ha1)); + + /* H(A2) = H(method:uri) */ + snprintf(temp, sizeof(temp), "%s:%s", method, resource); + hashsize = (size_t)cupsHashData(hashalg, (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, ha2, sizeof(ha2)); + + /* H(data) = H(nonce:nc:cnonce:qop:H(A2)) */ + snprintf(temp, sizeof(temp), "%s:%08x:%s:auth:%s", nonce, http->nonce_count, cnonce, ha2); + hashsize = (size_t)cupsHashData(hashalg, (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, hdata, sizeof(hdata)); + + /* KD = H(H(A1):H(data)) */ + snprintf(temp, sizeof(temp), "%s:%s", ha1, hdata); + hashsize = (size_t)cupsHashData(hashalg, (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, kd, sizeof(kd)); + + /* Pass the RFC 2617/7616 WWW-Authenticate header */ + if (opaque[0]) + snprintf(digest, sizeof(digest), "username=\"%s\", realm=\"%s\", nonce=\"%s\", algorithm=%s, qop=auth, opaque=\"%s\", cnonce=\"%s\", nc=%08x, uri=\"%s\", response=\"%s\"", cupsUser(), realm, nonce, algorithm, opaque, cnonce, http->nonce_count, resource, kd); + else + snprintf(digest, sizeof(digest), "username=\"%s\", realm=\"%s\", nonce=\"%s\", algorithm=%s, qop=auth, cnonce=\"%s\", nc=%08x, uri=\"%s\", response=\"%s\"", cupsUser(), realm, nonce, algorithm, cnonce, http->nonce_count, resource, kd); + } + else + { + /* + * Use old RFC 2069 Digest method... + */ + + /* H(A1) = H(username:realm:password) */ + snprintf(temp, sizeof(temp), "%s:%s:%s", cupsUser(), realm, strchr(http->userpass, ':') + 1); + hashsize = (size_t)cupsHashData("md5", (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, ha1, sizeof(ha1)); + + /* H(A2) = H(method:uri) */ + snprintf(temp, sizeof(temp), "%s:%s", method, resource); + hashsize = (size_t)cupsHashData("md5", (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, ha2, sizeof(ha2)); + + /* KD = H(H(A1):nonce:H(A2)) */ + snprintf(temp, sizeof(temp), "%s:%s:%s", ha1, nonce, ha2); + hashsize = (size_t)cupsHashData("md5", (unsigned char *)temp, strlen(temp), hash, sizeof(hash)); + cupsHashString(hash, hashsize, kd, sizeof(kd)); + + /* Pass the RFC 2069 WWW-Authenticate header */ + snprintf(digest, sizeof(digest), "username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", response=\"%s\"", cupsUser(), realm, nonce, resource, kd); + } + + httpSetAuthString(http, "Digest", digest); + } + } + + if (http->authstring) + { + DEBUG_printf(("1cupsDoAuthentication: authstring=\"%s\"", http->authstring)); + + return (0); } else { - DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", - www_auth)); + DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"", www_auth)); http->status = HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED; + return (-1); } - - DEBUG_printf(("1cupsDoAuthentication: authstring=\"%s\"", http->authstring)); - - return (0); } @@ -336,7 +457,7 @@ _cupsSetNegotiateAuthString( GSS_C_NO_BUFFER, &http->gssmech, &output_token, NULL, NULL); -#ifdef HAVE_GSS_ACQUIRE_CRED_EX_F +# ifdef HAVE_GSS_ACQUIRE_CRED_EX_F if (major_status == GSS_S_NO_CRED) { /* @@ -412,7 +533,7 @@ _cupsSetNegotiateAuthString( } } } -#endif /* HAVE_GSS_ACQUIRED_CRED_EX_F */ +# endif /* HAVE_GSS_ACQUIRED_CRED_EX_F */ if (GSS_ERROR(major_status)) { @@ -422,11 +543,11 @@ _cupsSetNegotiateAuthString( return (-1); } -#ifdef DEBUG +# ifdef DEBUG else if (major_status == GSS_S_CONTINUE_NEEDED) cups_gss_printf(major_status, minor_status, "_cupsSetNegotiateAuthString: Continuation needed!"); -#endif /* DEBUG */ +# endif /* DEBUG */ if (output_token.length > 0 && output_token.length <= 65536) { @@ -464,8 +585,259 @@ _cupsSetNegotiateAuthString( return (0); } +#endif /* HAVE_GSSAPI */ + + +/* + * 'cups_auth_find()' - Find the named WWW-Authenticate scheme. + * + * The "www_authenticate" parameter points to the current position in the header. + * + * Returns @code NULL@ if the auth scheme is not present. + */ + +static const char * /* O - Start of matching scheme or @code NULL@ if not found */ +cups_auth_find(const char *www_authenticate, /* I - Pointer into WWW-Authenticate header */ + const char *scheme) /* I - Authentication scheme */ +{ + size_t schemelen = strlen(scheme); /* Length of scheme */ + + + DEBUG_printf(("8cups_auth_find(www_authenticate=\"%s\", scheme=\"%s\"(%d))", www_authenticate, scheme, (int)schemelen)); + + while (*www_authenticate) + { + /* + * Skip leading whitespace and commas... + */ + + DEBUG_printf(("9cups_auth_find: Before whitespace: \"%s\"", www_authenticate)); + while (isspace(*www_authenticate & 255) || *www_authenticate == ',') + www_authenticate ++; + DEBUG_printf(("9cups_auth_find: After whitespace: \"%s\"", www_authenticate)); + + /* + * See if this is "Scheme" followed by whitespace or the end of the string. + */ + + if (!strncmp(www_authenticate, scheme, schemelen) && (isspace(www_authenticate[schemelen] & 255) || !www_authenticate[schemelen])) + { + /* + * Yes, this is the start of the scheme-specific information... + */ + + DEBUG_printf(("9cups_auth_find: Returning \"%s\".", www_authenticate)); + + return (www_authenticate); + } + + /* + * Skip the scheme name or param="value" string... + */ + + while (!isspace(*www_authenticate & 255) && *www_authenticate) + { + if (*www_authenticate == '\"') + { + /* + * Skip quoted value... + */ + + www_authenticate ++; + while (*www_authenticate && *www_authenticate != '\"') + www_authenticate ++; + + DEBUG_printf(("9cups_auth_find: After quoted: \"%s\"", www_authenticate)); + } + + www_authenticate ++; + } + + DEBUG_printf(("9cups_auth_find: After skip: \"%s\"", www_authenticate)); + } + + DEBUG_puts("9cups_auth_find: Returning NULL."); + + return (NULL); +} + + +/* + * 'cups_auth_param()' - Copy the value for the named authentication parameter, + * if present. + */ + +static const char * /* O - Parameter value or @code NULL@ if not present */ +cups_auth_param(const char *scheme, /* I - Pointer to auth data */ + const char *name, /* I - Name of parameter */ + char *value, /* I - Value buffer */ + size_t valsize) /* I - Size of value buffer */ +{ + char *valptr = value, /* Pointer into value buffer */ + *valend = value + valsize - 1; /* Pointer to end of buffer */ + size_t namelen = strlen(name); /* Name length */ + int param; /* Is this a parameter? */ + + + DEBUG_printf(("8cups_auth_param(scheme=\"%s\", name=\"%s\", value=%p, valsize=%d)", scheme, name, (void *)value, (int)valsize)); + + while (!isspace(*scheme & 255) && *scheme) + scheme ++; + + while (*scheme) + { + while (isspace(*scheme & 255) || *scheme == ',') + scheme ++; + + if (!strncmp(scheme, name, namelen) && scheme[namelen] == '=') + { + /* + * Found the parameter, copy the value... + */ + + scheme += namelen + 1; + if (*scheme == '\"') + { + scheme ++; + + while (*scheme && *scheme != '\"') + { + if (valptr < valend) + *valptr++ = *scheme; + + scheme ++; + } + } + else + { + while (*scheme && strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~+/=", *scheme)) + { + if (valptr < valend) + *valptr++ = *scheme; + + scheme ++; + } + } + + *valptr = '\0'; + + DEBUG_printf(("9cups_auth_param: Returning \"%s\".", value)); + + return (value); + } + + /* + * Skip the param=value string... + */ + + param = 0; + + while (!isspace(*scheme & 255) && *scheme) + { + if (*scheme == '=') + param = 1; + else if (*scheme == '\"') + { + /* + * Skip quoted value... + */ + + scheme ++; + while (*scheme && *scheme != '\"') + scheme ++; + } + + scheme ++; + } + + /* + * If this wasn't a parameter, we are at the end of this scheme's + * parameters... + */ + + if (!param) + break; + } + + *value = '\0'; + + DEBUG_puts("9cups_auth_param: Returning NULL."); + + return (NULL); +} +/* + * 'cups_auth_scheme()' - Get the (next) WWW-Authenticate scheme. + * + * The "www_authenticate" parameter points to the current position in the header. + * + * Returns @code NULL@ if there are no (more) auth schemes present. + */ + +static const char * /* O - Start of scheme or @code NULL@ if not found */ +cups_auth_scheme(const char *www_authenticate, /* I - Pointer into WWW-Authenticate header */ + char *scheme, /* I - Scheme name buffer */ + size_t schemesize) /* I - Size of buffer */ +{ + const char *start; /* Start of scheme data */ + char *sptr = scheme, /* Pointer into scheme buffer */ + *send = scheme + schemesize - 1;/* End of scheme buffer */ + int param; /* Is this a parameter? */ + + + DEBUG_printf(("8cups_auth_scheme(www_authenticate=\"%s\", scheme=%p, schemesize=%d)", www_authenticate, (void *)scheme, (int)schemesize)); + + while (*www_authenticate) + { + /* + * Skip leading whitespace and commas... + */ + + while (isspace(*www_authenticate & 255) || *www_authenticate == ',') + www_authenticate ++; + + /* + * Parse the scheme name or param="value" string... + */ + + for (sptr = scheme, start = www_authenticate, param = 0; *www_authenticate && !isspace(*www_authenticate & 255); www_authenticate ++) + { + if (*www_authenticate == '=') + param = 1; + else if (!param && sptr < send) + *sptr++ = *www_authenticate; + else if (*www_authenticate == '\"') + { + /* + * Skip quoted value... + */ + + www_authenticate ++; + while (*www_authenticate && *www_authenticate != '\"') + www_authenticate ++; + } + } + + if (sptr > scheme && !param) + { + *sptr = '\0'; + + DEBUG_printf(("9cups_auth_scheme: Returning \"%s\".", start)); + + return (start); + } + } + + *scheme = '\0'; + + DEBUG_puts("9cups_auth_scheme: Returning NULL."); + + return (NULL); +} + + +#ifdef HAVE_GSSAPI # ifdef HAVE_GSS_ACQUIRE_CRED_EX_F /* * 'cups_gss_acquire()' - Kerberos credentials callback. @@ -650,6 +1022,8 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ FILE *fp; /* Certificate file */ char trc[16], /* Try Root Certificate parameter */ filename[1024]; /* Certificate filename */ + const char *www_auth, /* WWW-Authenticate header */ + *schemedata; /* Data for the named auth scheme */ _cups_globals_t *cg = _cupsGlobals(); /* Global data */ # if defined(HAVE_AUTHORIZATION_H) OSStatus status; /* Status */ @@ -668,13 +1042,14 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * See if we are accessing localhost... */ - if (!httpAddrLocalhost(http->hostaddr) && - _cups_strcasecmp(http->hostname, "localhost") != 0) + if (!httpAddrLocalhost(http->hostaddr) && _cups_strcasecmp(http->hostname, "localhost") != 0) { DEBUG_puts("8cups_local_auth: Not a local connection!"); return (1); } + www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE); + # if defined(HAVE_AUTHORIZATION_H) /* * Delete any previous authorization reference... @@ -686,12 +1061,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ http->auth_ref = NULL; } - if (!getenv("GATEWAY_INTERFACE") && - httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key))) + if (!getenv("GATEWAY_INTERFACE") && (schemedata = cups_auth_find(www_auth, "AuthRef")) != NULL && cups_auth_param(schemedata, "key", auth_key, sizeof(auth_key))) { - status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, - kAuthorizationFlagDefaults, &http->auth_ref); + status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &http->auth_ref); if (status != errAuthorizationSuccess) { DEBUG_printf(("8cups_local_auth: AuthorizationCreate() returned %d (%s)", @@ -745,6 +1117,15 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } # endif /* HAVE_AUTHORIZATION_H */ +# ifdef HAVE_GSSAPI + if (cups_auth_find(www_auth, "Negotiate")) + return (1); +# endif /* HAVE_GSSAPI */ +# ifdef HAVE_AUTHORIZATION_H + if (cups_auth_find(www_auth, "AuthRef")) + return (1); +# endif /* HAVE_AUTHORIZATION_H */ + # if defined(SO_PEERCRED) && defined(AF_LOCAL) /* * See if we can authenticate using the peer credentials provided over a @@ -752,16 +1133,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * information... */ - if ( -# ifdef HAVE_GSSAPI - _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9) && -# endif /* HAVE_GSSAPI */ -# ifdef HAVE_AUTHORIZATION_H - !httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key)) && -# endif /* HAVE_AUTHORIZATION_H */ - http->hostaddr->addr.sa_family == AF_LOCAL && - !getenv("GATEWAY_INTERFACE")) /* Not via CGI programs... */ + if (http->hostaddr->addr.sa_family == AF_LOCAL && + !getenv("GATEWAY_INTERFACE") && /* Not via CGI programs... */ + cups_auth_find(www_auth, "PeerCred")) { /* * Verify that the current cupsUser() matches the current UID... @@ -784,6 +1158,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ } # endif /* SO_PEERCRED && AF_LOCAL */ + if ((schemedata = cups_auth_find(www_auth, "Local")) == NULL) + return (1); + /* * Try opening a certificate file for this PID. If that fails, * try the root certificate... @@ -797,33 +1174,9 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ * No certificate for this PID; see if we can get the root certificate... */ - DEBUG_printf(("9cups_local_auth: Unable to open file %s: %s", - filename, strerror(errno))); + DEBUG_printf(("9cups_local_auth: Unable to open file %s: %s", filename, strerror(errno))); -# ifdef HAVE_GSSAPI - if (!_cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9)) - { - /* - * Kerberos required, don't try the root certificate... - */ - - return (1); - } -# endif /* HAVE_GSSAPI */ - -# ifdef HAVE_AUTHORIZATION_H - if (httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "authkey", - auth_key, sizeof(auth_key))) - { - /* - * Don't use the root certificate as a replacement for an authkey... - */ - - return (1); - } -# endif /* HAVE_AUTHORIZATION_H */ - if (!httpGetSubField2(http, HTTP_FIELD_WWW_AUTHENTICATE, "trc", trc, - sizeof(trc))) + if (!cups_auth_param(schemedata, "trc", trc, sizeof(trc))) { /* * Scheduler doesn't want us to use the root certificate... diff --git a/cups/cups.h b/cups/cups.h index 8f5c818..3f8d91e 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,7 +1,7 @@ /* * API definitions for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -47,10 +47,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0206 +# define CUPS_VERSION 2.0207 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 2 -# define CUPS_VERSION_PATCH 6 +# define CUPS_VERSION_PATCH 7 # define CUPS_BC_FD 3 /* Back-channel file descriptor for @@ -606,6 +606,9 @@ extern ssize_t cupsHashData(const char *algorithm, const void *data, size_t dat extern int cupsAddIntegerOption(const char *name, int value, int num_options, cups_option_t **options) _CUPS_API_2_2_4; extern int cupsGetIntegerOption(const char *name, int num_options, cups_option_t *options) _CUPS_API_2_2_4; +/* New in CUPS 2.2.7 */ +extern const char *cupsHashString(const unsigned char *hash, size_t hashsize, char *buffer, size_t bufsize) _CUPS_API_2_2_7; + # ifdef __cplusplus } # endif /* __cplusplus */ diff --git a/cups/hash.c b/cups/hash.c index ede5461..50dc5fb 100644 --- a/cups/hash.c +++ b/cups/hash.c @@ -1,7 +1,7 @@ /* * Hashing function for CUPS. * - * Copyright 2015-2016 by Apple Inc. + * Copyright © 2015-2018 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -21,6 +21,8 @@ # include #elif defined(HAVE_GNUTLS) # include +#else +# include "md5-private.h" #endif /* __APPLE__ */ @@ -53,7 +55,24 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ } #ifdef __APPLE__ - if (!strcmp(algorithm, "sha")) + if (!strcmp(algorithm, "md5")) + { + /* + * MD5 (deprecated but widely used...) + */ + + CC_MD5_CTX ctx; /* MD5 context */ + + if (hashsize < CC_MD5_DIGEST_LENGTH) + goto too_small; + + CC_MD5_Init(&ctx); + CC_MD5_Update(&ctx, data, (CC_LONG)datalen); + CC_MD5_Final(hash, &ctx); + + return (CC_MD5_DIGEST_LENGTH); + } + else if (!strcmp(algorithm, "sha")) { /* * SHA-1... @@ -171,7 +190,9 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ unsigned char temp[64]; /* Temporary hash buffer */ size_t tempsize = 0; /* Truncate to this size? */ - if (!strcmp(algorithm, "sha")) + if (!strcmp(algorithm, "md5")) + alg = GNUTLS_DIG_MD5; + else if (!strcmp(algorithm, "sha")) alg = GNUTLS_DIG_SHA1; else if (!strcmp(algorithm, "sha2-224")) alg = GNUTLS_DIG_SHA224; @@ -219,10 +240,20 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ #else /* - * No hash support without CommonCrypto or GNU TLS... + * No hash support beyond MD5 without CommonCrypto or GNU TLS... */ - if (hashsize < 64) + if (!strcmp(algorithm, "md5")) + { + _cups_md5_state_t state; /* MD5 state info */ + + _cupsMD5Init(&state); + _cupsMD5Append(&state, data, datalen); + _cupsMD5Finish(&state, hash); + + return (16); + } + else if (hashsize < 64) goto too_small; #endif /* __APPLE__ */ @@ -243,3 +274,53 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hash buffer too small."), 1); return (-1); } + + +/* + * 'cupsHashString()' - Format a hash value as a hexadecimal string. + * + * The passed buffer must be at least 2 * hashsize + 1 characters in length. + * + * @since CUPS 2.2.7@ + */ + +const char * /* O - Formatted string */ +cupsHashString( + const unsigned char *hash, /* I - Hash */ + size_t hashsize, /* I - Size of hash */ + char *buffer, /* I - String buffer */ + size_t bufsize) /* I - Size of string buffer */ +{ + char *bufptr = buffer; /* Pointer into buffer */ + static const char *hex = "0123456789abcdef"; + /* Hex characters (lowercase!) */ + + + /* + * Range check input... + */ + + if (!hash || hashsize < 1 || !buffer || bufsize < (2 * hashsize + 1)) + { + if (buffer) + *buffer = '\0'; + return (NULL); + } + + /* + * Loop until we've converted the whole hash... + */ + + while (hashsize > 0) + { + *bufptr++ = hex[*hash >> 4]; + *bufptr++ = hex[*hash & 15]; + + hash ++; + hashsize --; + } + + *bufptr = '\0'; + + return (buffer); +} diff --git a/cups/http-private.h b/cups/http-private.h index f71e564..4f118ba 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,7 +1,7 @@ /* * Private HTTP definitions for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -68,7 +68,6 @@ typedef int socklen_t; # endif /* __APPLE__ && !_SOCKLEN_T */ # include -# include "md5-private.h" # include "ipp-private.h" # ifdef HAVE_GNUTLS @@ -180,13 +179,17 @@ extern "C" { # define _HTTP_TLS_NONE 0 /* No TLS options */ # define _HTTP_TLS_ALLOW_RC4 1 /* Allow RC4 cipher suites */ -# define _HTTP_TLS_ALLOW_SSL3 2 /* Allow SSL 3.0 */ -# define _HTTP_TLS_ALLOW_DH 4 /* Allow DH/DHE key negotiation */ -# define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */ -# define _HTTP_TLS_DENY_CBC 32 /* Deny CBC cipher suites */ -# define _HTTP_TLS_ONLY_TLS10 64 /* Only use TLS 1.0 */ +# define _HTTP_TLS_ALLOW_DH 2 /* Allow DH/DHE key negotiation */ +# define _HTTP_TLS_DENY_CBC 4 /* Deny CBC cipher suites */ # define _HTTP_TLS_SET_DEFAULT 128 /* Setting the default TLS options */ +# define _HTTP_TLS_SSL3 0 /* Min/max version is SSL/3.0 */ +# define _HTTP_TLS_1_0 1 /* Min/max version is TLS/1.0 */ +# define _HTTP_TLS_1_1 2 /* Min/max version is TLS/1.1 */ +# define _HTTP_TLS_1_2 3 /* Min/max version is TLS/1.2 */ +# define _HTTP_TLS_1_3 4 /* Min/max version is TLS/1.3 */ +# define _HTTP_TLS_MAX 5 /* Highest known TLS version */ + /* * Types and functions for SSL support... @@ -297,10 +300,10 @@ struct _http_s /**** HTTP connection structure ****/ char buffer[HTTP_MAX_BUFFER]; /* Buffer for incoming data */ int _auth_type; /* Authentication in use (deprecated) */ - _cups_md5_state_t md5_state; /* MD5 state */ + unsigned char _md5_state[88]; /* MD5 state (deprecated) */ char nonce[HTTP_MAX_VALUE]; /* Nonce value */ - int nonce_count; /* Nonce count */ + unsigned nonce_count; /* Nonce count */ http_tls_t tls; /* TLS state information */ http_encryption_t encryption; /* Encryption requirements */ @@ -442,7 +445,7 @@ extern void _httpTLSInitialize(void); extern size_t _httpTLSPending(http_t *http); extern int _httpTLSRead(http_t *http, char *buf, int len); extern int _httpTLSSetCredentials(http_t *http); -extern void _httpTLSSetOptions(int options); +extern void _httpTLSSetOptions(int options, int min_version, int max_version); extern int _httpTLSStart(http_t *http); extern void _httpTLSStop(http_t *http); extern int _httpTLSWrite(http_t *http, const char *buf, int len); diff --git a/cups/http-support.c b/cups/http-support.c index 76dbb7d..cbee9ab 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -502,7 +502,6 @@ httpAssembleUUID(const char *server, /* I - Server name */ size_t bufsize) /* I - Size of buffer */ { char data[1024]; /* Source string for MD5 */ - _cups_md5_state_t md5state; /* MD5 state */ unsigned char md5sum[16]; /* MD5 digest/sum */ @@ -517,9 +516,7 @@ httpAssembleUUID(const char *server, /* I - Server name */ port, name ? name : server, number, (unsigned)CUPS_RAND() & 0xffff, (unsigned)CUPS_RAND() & 0xffff); - _cupsMD5Init(&md5state); - _cupsMD5Append(&md5state, (unsigned char *)data, (int)strlen(data)); - _cupsMD5Finish(&md5state, md5sum); + cupsHashData("md5", (unsigned char *)data, strlen(data), md5sum, sizeof(md5sum)); /* * Generate the UUID from the MD5... @@ -1360,6 +1357,9 @@ _httpStatus(cups_lang_t *lang, /* I - Language */ case HTTP_STATUS_MOVED_PERMANENTLY : s = _("Moved Permanently"); break; + case HTTP_STATUS_FOUND : + s = _("Found"); + break; case HTTP_STATUS_SEE_OTHER : s = _("See Other"); break; diff --git a/cups/http.c b/cups/http.c index 61b88c9..34f0822 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,7 +1,7 @@ /* * HTTP routines for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * This file contains Kerberos support code, copyright 2006 by @@ -39,6 +39,7 @@ * Local functions... */ +static void http_add_field(http_t *http, http_field_t field, const char *value, int append); #ifdef HAVE_LIBZ static void http_content_coding_finish(http_t *http); static void http_content_coding_start(http_t *http, @@ -2659,105 +2660,7 @@ httpSetField(http_t *http, /* I - HTTP connection */ value == NULL) return; - switch (field) - { - case HTTP_FIELD_ACCEPT_ENCODING : - if (http->accept_encoding) - _cupsStrFree(http->accept_encoding); - - http->accept_encoding = _cupsStrAlloc(value); - break; - - case HTTP_FIELD_ALLOW : - if (http->allow) - _cupsStrFree(http->allow); - - http->allow = _cupsStrAlloc(value); - break; - - case HTTP_FIELD_SERVER : - if (http->server) - _cupsStrFree(http->server); - - http->server = _cupsStrAlloc(value); - break; - - case HTTP_FIELD_WWW_AUTHENTICATE : - /* CUPS STR #4503 - don't override WWW-Authenticate for unknown auth schemes */ - if (http->fields[HTTP_FIELD_WWW_AUTHENTICATE][0] && - _cups_strncasecmp(value, "Basic ", 6) && - _cups_strncasecmp(value, "Digest ", 7) && - _cups_strncasecmp(value, "Negotiate ", 10)) - { - DEBUG_printf(("1httpSetField: Ignoring unknown auth scheme in \"%s\".", value)); - return; - } - - /* Fall through to copy */ - - default : - strlcpy(http->fields[field], value, HTTP_MAX_VALUE); - break; - } - - if (field == HTTP_FIELD_AUTHORIZATION) - { - /* - * Special case for Authorization: as its contents can be - * longer than HTTP_MAX_VALUE - */ - - if (http->field_authorization) - free(http->field_authorization); - - http->field_authorization = strdup(value); - } - else if (field == HTTP_FIELD_HOST) - { - /* - * Special-case for Host: as we don't want a trailing "." on the hostname and - * need to bracket IPv6 numeric addresses. - */ - - char *ptr = strchr(value, ':'); - - if (value[0] != '[' && ptr && strchr(ptr + 1, ':')) - { - /* - * Bracket IPv6 numeric addresses... - * - * This is slightly inefficient (basically copying twice), but is an edge - * case and not worth optimizing... - */ - - snprintf(http->fields[HTTP_FIELD_HOST], - sizeof(http->fields[HTTP_FIELD_HOST]), "[%s]", value); - } - else - { - /* - * Check for a trailing dot on the hostname... - */ - - ptr = http->fields[HTTP_FIELD_HOST]; - - if (*ptr) - { - ptr += strlen(ptr) - 1; - - if (*ptr == '.') - *ptr = '\0'; - } - } - } -#ifdef HAVE_LIBZ - else if (field == HTTP_FIELD_CONTENT_ENCODING && - http->data_encoding != HTTP_ENCODING_FIELDS) - { - DEBUG_puts("1httpSetField: Calling http_content_coding_start."); - http_content_coding_start(http, value); - } -#endif /* HAVE_LIBZ */ + http_add_field(http, field, value, 0); } @@ -3035,7 +2938,7 @@ _httpUpdate(http_t *http, /* I - HTTP connection */ httpSetCookie(http, value); } else if ((field = httpFieldValue(line)) != HTTP_FIELD_UNKNOWN) - httpSetField(http, field, value); + http_add_field(http, field, value, 1); #ifdef DEBUG else DEBUG_printf(("1_httpUpdate: unknown field %s seen!", line)); @@ -3689,6 +3592,118 @@ httpWriteResponse(http_t *http, /* I - HTTP connection */ } +/* + * 'http_add_field()' - Add a value for a HTTP field, appending if needed. + */ + +static void +http_add_field(http_t *http, /* I - HTTP connection */ + http_field_t field, /* I - HTTP field */ + const char *value, /* I - Value string */ + int append) /* I - Append value? */ +{ + char newvalue[1024]; /* New value string */ + const char *oldvalue; /* Old field value */ + + + + /* + * Optionally append the new value to the existing one... + */ + + if (append && field != HTTP_FIELD_ACCEPT_ENCODING && field != HTTP_FIELD_ACCEPT_LANGUAGE && field != HTTP_FIELD_ACCEPT_RANGES && field != HTTP_FIELD_ALLOW && field != HTTP_FIELD_LINK && field != HTTP_FIELD_TRANSFER_ENCODING && field != HTTP_FIELD_UPGRADE && field != HTTP_FIELD_WWW_AUTHENTICATE) + append = 0; + + if (field == HTTP_FIELD_HOST) + { + /* + * Special-case for Host: as we don't want a trailing "." on the hostname and + * need to bracket IPv6 numeric addresses. + */ + + char *ptr = strchr(value, ':'); + + if (value[0] != '[' && ptr && strchr(ptr + 1, ':')) + { + /* + * Bracket IPv6 numeric addresses... + */ + + snprintf(newvalue, sizeof(newvalue), "[%s]", value); + value = newvalue; + } + else if (*value && value[strlen(value) - 1] == '.') + { + /* + * Strip the trailing dot on the hostname... + */ + + strlcpy(newvalue, value, sizeof(newvalue)); + newvalue[strlen(newvalue) - 1] = '\0'; + value = newvalue; + } + } + else if (append && *value && (oldvalue = httpGetField(http, field)) != NULL && *oldvalue) + { + snprintf(newvalue, sizeof(newvalue), "%s, %s", oldvalue, value); + value = newvalue; + } + + /* + * Save the new value... + */ + + switch (field) + { + case HTTP_FIELD_ACCEPT_ENCODING : + if (http->accept_encoding) + _cupsStrFree(http->accept_encoding); + + http->accept_encoding = _cupsStrAlloc(value); + break; + + case HTTP_FIELD_ALLOW : + if (http->allow) + _cupsStrFree(http->allow); + + http->allow = _cupsStrAlloc(value); + break; + + case HTTP_FIELD_SERVER : + if (http->server) + _cupsStrFree(http->server); + + http->server = _cupsStrAlloc(value); + break; + + default : + strlcpy(http->fields[field], value, HTTP_MAX_VALUE); + break; + } + + if (field == HTTP_FIELD_AUTHORIZATION) + { + /* + * Special case for Authorization: as its contents can be + * longer than HTTP_MAX_VALUE + */ + + if (http->field_authorization) + free(http->field_authorization); + + http->field_authorization = strdup(value); + } +#ifdef HAVE_LIBZ + else if (field == HTTP_FIELD_CONTENT_ENCODING && + http->data_encoding != HTTP_ENCODING_FIELDS) + { + DEBUG_puts("1http_add_field: Calling http_content_coding_start."); + http_content_coding_start(http, value); + } +#endif /* HAVE_LIBZ */ +} + + #ifdef HAVE_LIBZ /* * 'http_content_coding_finish()' - Finish doing any content encoding. @@ -4056,7 +4071,7 @@ http_read(http_t *http, /* I - HTTP connection */ DEBUG_printf(("http_read(http=%p, buffer=%p, length=" CUPS_LLFMT ")", (void *)http, (void *)buffer, CUPS_LLCAST length)); - if (!http->blocking) + if (!http->blocking || http->timeout_value > 0.0) { while (!httpWait(http, http->wait_value)) { @@ -4651,7 +4666,7 @@ http_write(http_t *http, /* I - HTTP connection */ { DEBUG_printf(("3http_write: About to write %d bytes.", (int)length)); - if (http->timeout_cb) + if (http->timeout_value > 0.0) { #ifdef HAVE_POLL struct pollfd pfd; /* Polled file descriptor */ @@ -4695,7 +4710,7 @@ http_write(http_t *http, /* I - HTTP connection */ http->error = errno; return (-1); } - else if (nfds == 0 && !(*http->timeout_cb)(http, http->timeout_data)) + else if (nfds == 0 && (!http->timeout_cb || !(*http->timeout_cb)(http, http->timeout_data))) { #ifdef WIN32 http->error = WSAEWOULDBLOCK; diff --git a/cups/http.h b/cups/http.h index c61a79e..156efea 100644 --- a/cups/http.h +++ b/cups/http.h @@ -248,10 +248,11 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_STATUS_MULTIPLE_CHOICES = 300, /* Multiple files match request */ HTTP_STATUS_MOVED_PERMANENTLY, /* Document has moved permanently */ - HTTP_STATUS_MOVED_TEMPORARILY, /* Document has moved temporarily */ - HTTP_STATUS_SEE_OTHER, /* See this other link... */ + HTTP_STATUS_FOUND, /* Document was found at a different URI */ + HTTP_STATUS_SEE_OTHER, /* See this other link */ HTTP_STATUS_NOT_MODIFIED, /* File not modified */ HTTP_STATUS_USE_PROXY, /* Must use a proxy to access this URI */ + HTTP_STATUS_TEMPORARY_REDIRECT = 307, /* Temporary redirection */ HTTP_STATUS_BAD_REQUEST = 400, /* Bad request */ HTTP_STATUS_UNAUTHORIZED, /* Unauthorized to access host */ @@ -285,6 +286,8 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_STATUS_CUPS_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ HTTP_STATUS_CUPS_WEBIF_DISABLED /* Web interface is disabled @private@ */ +# define HTTP_STATUS_MOVED_TEMPORARILY HTTP_STATUS_FOUND /* Renamed in RFC 7231 */ + # ifndef _CUPS_NO_DEPRECATED /* Old names for this enumeration */ # define HTTP_ERROR HTTP_STATUS_ERROR diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 675e5f3..d1ad65c 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,8 +1,8 @@ /* * Internet Printing Protocol support functions for CUPS. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright © 2007-2018 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 @@ -960,9 +960,12 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "feed-orientation-supported", "finishings", "finishings-col", + "finishings-col-database", "finishings-col-default", + "finishings-col-ready", "finishings-col-supported", "finishings-default", + "finishings-ready", "finishings-supported", "font-name-requested", "font-name-requested-default", @@ -1001,6 +1004,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "media-bottom-margin-supported", "media-col", "media-col-default", + "media-col-ready", "media-col-supported", "media-color-supported", "media-default", @@ -1015,6 +1019,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "media-left-margin-supported", "media-order-count-supported", "media-pre-printed-supported", + "media-ready", "media-recycled-supported", "media-right-margin-supported", "media-size-supported", @@ -1277,9 +1282,12 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "feed-orientation-supported", "finishings", "finishings-col", + "finishings-col-database", "finishings-col-default", + "finishings-col-ready", "finishings-col-supported", "finishings-default", + "finishings-ready", "finishings-supported", "font-name-requested", "font-name-requested-default", @@ -1383,6 +1391,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "media-bottom-margin-supported", "media-col", "media-col-default", + "media-col-ready", "media-col-supported", "media-color-supported", "media-default", @@ -1397,6 +1406,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "media-left-margin-supported", "media-order-count-supported", "media-pre-printed-supported", + "media-ready", "media-recycled-supported", "media-right-margin-supported", "media-size-supported", @@ -1582,10 +1592,12 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "job-page-limit", /* CUPS extension */ "job-password-encryption-supported", "job-password-supported", + "job-presets-supported", /* IPP Presets */ "job-quota-period", /* CUPS extension */ "job-resolvers-supported", "job-settable-attributes-supported", "job-spooling-supported", + "job-triggers-supported", /* IPP Presets */ "jpeg-k-octets-supported", /* CUPS extension */ "jpeg-x-dimension-supported", /* CUPS extension */ "jpeg-y-dimension-supported", /* CUPS extension */ @@ -1599,8 +1611,6 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "marker-message", /* CUPS extension */ "marker-names", /* CUPS extension */ "marker-types", /* CUPS extension */ - "media-col-ready", - "media-ready", "member-names", /* CUPS extension */ "member-uris", /* CUPS extension */ "multiple-destination-uris-supported",/* IPP FaxOut */ @@ -1623,6 +1633,8 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */ "printer-charge-info", "printer-charge-info-uri", "printer-commands", /* CUPS extension */ + "printer-config-change-date-time", + "printer-config-change-time", "printer-current-time", "printer-detailed-status-messages", "printer-device-id", diff --git a/cups/ipp.c b/cups/ipp.c index 772b2f0..0adc3ef 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -4306,18 +4306,22 @@ ippSetString(ipp_t *ipp, /* I - IPP message */ { char *temp; /* Temporary string */ _ipp_value_t *value; /* Current value */ + ipp_tag_t value_tag; /* Value tag */ /* * Range check input... */ + if (attr && *attr) + value_tag = (*attr)->value_tag & IPP_TAG_CUPS_MASK; + else + value_tag = IPP_TAG_ZERO; + if (!ipp || !attr || !*attr || - ((*attr)->value_tag != IPP_TAG_TEXTLANG && - (*attr)->value_tag != IPP_TAG_NAMELANG && - ((*attr)->value_tag < IPP_TAG_TEXT || - (*attr)->value_tag > IPP_TAG_MIMETYPE)) || - element < 0 || element > (*attr)->num_values || !strvalue) + (value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG && + value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE || + !strvalue) return (0); /* diff --git a/cups/ipp.h b/cups/ipp.h index 2a4f546..2ee5f1d 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -79,11 +79,11 @@ extern "C" { typedef enum ipp_dstate_e /**** Document states @exclude all@ ****/ { - IPP_DOCUMENT_PENDING = 3, /* Document is pending */ - IPP_DOCUMENT_PROCESSING = 5, /* Document is processing */ - IPP_DOCUMENT_CANCELED = 7, /* Document is canceled */ - IPP_DOCUMENT_ABORTED, /* Document is aborted */ - IPP_DOCUMENT_COMPLETED /* Document is completed */ + IPP_DSTATE_PENDING = 3, /* Document is pending */ + IPP_DSTATE_PROCESSING = 5, /* Document is processing */ + IPP_DSTATE_CANCELED = 7, /* Document is canceled */ + IPP_DSTATE_ABORTED, /* Document is aborted */ + IPP_DSTATE_COMPLETED /* Document is completed */ # ifndef _CUPS_NO_DEPRECATED # define IPP_DOCUMENT_PENDING IPP_DSTATE_PENDING diff --git a/cups/md5.c b/cups/md5.c index c0f5dd7..d5057bf 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -1,7 +1,7 @@ /* * Private MD5 implementation for CUPS. * - * Copyright 2007-2014 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 2005 by Easy Software Products * Copyright (C) 1999 Aladdin Enterprises. All rights reserved. * @@ -43,70 +43,71 @@ #include "md5-private.h" #include "string-private.h" -#define T1 0xd76aa478 -#define T2 0xe8c7b756 -#define T3 0x242070db -#define T4 0xc1bdceee -#define T5 0xf57c0faf -#define T6 0x4787c62a -#define T7 0xa8304613 -#define T8 0xfd469501 -#define T9 0x698098d8 -#define T10 0x8b44f7af -#define T11 0xffff5bb1 -#define T12 0x895cd7be -#define T13 0x6b901122 -#define T14 0xfd987193 -#define T15 0xa679438e -#define T16 0x49b40821 -#define T17 0xf61e2562 -#define T18 0xc040b340 -#define T19 0x265e5a51 -#define T20 0xe9b6c7aa -#define T21 0xd62f105d -#define T22 0x02441453 -#define T23 0xd8a1e681 -#define T24 0xe7d3fbc8 -#define T25 0x21e1cde6 -#define T26 0xc33707d6 -#define T27 0xf4d50d87 -#define T28 0x455a14ed -#define T29 0xa9e3e905 -#define T30 0xfcefa3f8 -#define T31 0x676f02d9 -#define T32 0x8d2a4c8a -#define T33 0xfffa3942 -#define T34 0x8771f681 -#define T35 0x6d9d6122 -#define T36 0xfde5380c -#define T37 0xa4beea44 -#define T38 0x4bdecfa9 -#define T39 0xf6bb4b60 -#define T40 0xbebfbc70 -#define T41 0x289b7ec6 -#define T42 0xeaa127fa -#define T43 0xd4ef3085 -#define T44 0x04881d05 -#define T45 0xd9d4d039 -#define T46 0xe6db99e5 -#define T47 0x1fa27cf8 -#define T48 0xc4ac5665 -#define T49 0xf4292244 -#define T50 0x432aff97 -#define T51 0xab9423a7 -#define T52 0xfc93a039 -#define T53 0x655b59c3 -#define T54 0x8f0ccc92 -#define T55 0xffeff47d -#define T56 0x85845dd1 -#define T57 0x6fa87e4f -#define T58 0xfe2ce6e0 -#define T59 0xa3014314 -#define T60 0x4e0811a1 -#define T61 0xf7537e82 -#define T62 0xbd3af235 -#define T63 0x2ad7d2bb -#define T64 0xeb86d391 +#if !defined(__APPLE__) && !defined(HAVE_GNUTLS) +# define T1 0xd76aa478 +# define T2 0xe8c7b756 +# define T3 0x242070db +# define T4 0xc1bdceee +# define T5 0xf57c0faf +# define T6 0x4787c62a +# define T7 0xa8304613 +# define T8 0xfd469501 +# define T9 0x698098d8 +# define T10 0x8b44f7af +# define T11 0xffff5bb1 +# define T12 0x895cd7be +# define T13 0x6b901122 +# define T14 0xfd987193 +# define T15 0xa679438e +# define T16 0x49b40821 +# define T17 0xf61e2562 +# define T18 0xc040b340 +# define T19 0x265e5a51 +# define T20 0xe9b6c7aa +# define T21 0xd62f105d +# define T22 0x02441453 +# define T23 0xd8a1e681 +# define T24 0xe7d3fbc8 +# define T25 0x21e1cde6 +# define T26 0xc33707d6 +# define T27 0xf4d50d87 +# define T28 0x455a14ed +# define T29 0xa9e3e905 +# define T30 0xfcefa3f8 +# define T31 0x676f02d9 +# define T32 0x8d2a4c8a +# define T33 0xfffa3942 +# define T34 0x8771f681 +# define T35 0x6d9d6122 +# define T36 0xfde5380c +# define T37 0xa4beea44 +# define T38 0x4bdecfa9 +# define T39 0xf6bb4b60 +# define T40 0xbebfbc70 +# define T41 0x289b7ec6 +# define T42 0xeaa127fa +# define T43 0xd4ef3085 +# define T44 0x04881d05 +# define T45 0xd9d4d039 +# define T46 0xe6db99e5 +# define T47 0x1fa27cf8 +# define T48 0xc4ac5665 +# define T49 0xf4292244 +# define T50 0x432aff97 +# define T51 0xab9423a7 +# define T52 0xfc93a039 +# define T53 0x655b59c3 +# define T54 0x8f0ccc92 +# define T55 0xffeff47d +# define T56 0x85845dd1 +# define T57 0x6fa87e4f +# define T58 0xfe2ce6e0 +# define T59 0xa3014314 +# define T60 0x4e0811a1 +# define T61 0xf7537e82 +# define T62 0xbd3af235 +# define T63 0x2ad7d2bb +# define T64 0xeb86d391 static void _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) @@ -116,10 +117,10 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) c = pms->abcd[2], d = pms->abcd[3]; unsigned int t; -#ifndef ARCH_IS_BIG_ENDIAN -# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */ -#endif -#if ARCH_IS_BIG_ENDIAN +# ifndef ARCH_IS_BIG_ENDIAN +# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */ +# endif +# if ARCH_IS_BIG_ENDIAN /* * On big-endian machines, we must arrange the bytes in the right @@ -133,7 +134,7 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) X[i] = (unsigned)xp[0] + ((unsigned)xp[1] << 8) + ((unsigned)xp[2] << 16) + ((unsigned)xp[3] << 24); -#else /* !ARCH_IS_BIG_ENDIAN */ +# else /* !ARCH_IS_BIG_ENDIAN */ /* * On little-endian machines, we can process properly aligned data @@ -150,15 +151,15 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) memcpy(xbuf, data, 64); X = xbuf; } -#endif +# endif -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) +# define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) /* Round 1. */ /* Let [abcd k s i] denote the operation a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ -#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) -#define SET(a, b, c, d, k, s, Ti)\ +# define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +# define SET(a, b, c, d, k, s, Ti)\ t = a + F(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ @@ -178,13 +179,13 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) SET(d, a, b, c, 13, 12, T14); SET(c, d, a, b, 14, 17, T15); SET(b, c, d, a, 15, 22, T16); -#undef SET +# undef SET /* Round 2. */ /* Let [abcd k s i] denote the operation a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ -#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) -#define SET(a, b, c, d, k, s, Ti)\ +# define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +# define SET(a, b, c, d, k, s, Ti)\ t = a + G(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ @@ -204,13 +205,13 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) SET(d, a, b, c, 2, 9, T30); SET(c, d, a, b, 7, 14, T31); SET(b, c, d, a, 12, 20, T32); -#undef SET +# undef SET /* Round 3. */ /* Let [abcd k s t] denote the operation a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define SET(a, b, c, d, k, s, Ti)\ +# define H(x, y, z) ((x) ^ (y) ^ (z)) +# define SET(a, b, c, d, k, s, Ti)\ t = a + H(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ @@ -230,13 +231,13 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) SET(d, a, b, c, 12, 11, T46); SET(c, d, a, b, 15, 16, T47); SET(b, c, d, a, 2, 23, T48); -#undef SET +# undef SET /* Round 4. */ /* Let [abcd k s t] denote the operation a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ -#define I(x, y, z) ((y) ^ ((x) | ~(z))) -#define SET(a, b, c, d, k, s, Ti)\ +# define I(x, y, z) ((y) ^ ((x) | ~(z))) +# define SET(a, b, c, d, k, s, Ti)\ t = a + I(b,c,d) + X[k] + Ti;\ a = ROTATE_LEFT(t, s) + b /* Do the following 16 operations. */ @@ -256,7 +257,7 @@ _cups_md5_process(_cups_md5_state_t *pms, const unsigned char *data /*[64]*/) SET(d, a, b, c, 11, 10, T62); SET(c, d, a, b, 2, 15, T63); SET(b, c, d, a, 9, 21, T64); -#undef SET +# undef SET /* Then perform the following additions. (That is increment each of the four registers by the value it had before this block @@ -337,3 +338,4 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) for (i = 0; i < 16; ++i) digest[i] = (unsigned char)(pms->abcd[i >> 2] >> ((i & 3) << 3)); } +#endif /* !__APPLE__ && !HAVE_GNUTLS */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index a9817aa..49add7d 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,7 +1,7 @@ /* - * MD5 password support for CUPS. + * MD5 password support for CUPS (deprecated). * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -17,12 +17,15 @@ * Include necessary headers... */ +#include #include "http-private.h" #include "string-private.h" /* * 'httpMD5()' - Compute the MD5 sum of the username:group:password. + * + * @deprecated@ */ char * /* O - MD5 sum */ @@ -31,7 +34,6 @@ httpMD5(const char *username, /* I - User name */ const char *passwd, /* I - Password string */ char md5[33]) /* O - MD5 string */ { - _cups_md5_state_t state; /* MD5 state info */ unsigned char sum[16]; /* Sum data */ char line[256]; /* Line to sum */ @@ -41,15 +43,13 @@ httpMD5(const char *username, /* I - User name */ */ snprintf(line, sizeof(line), "%s:%s:%s", username, realm, passwd); - _cupsMD5Init(&state); - _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); - _cupsMD5Finish(&state, sum); + cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); /* * Return the sum... */ - return (httpMD5String(sum, md5)); + return ((char *)cupsHashString(sum, sizeof(sum), md5, 33)); } @@ -57,6 +57,8 @@ httpMD5(const char *username, /* I - User name */ * 'httpMD5Final()' - Combine the MD5 sum of the username, group, and password * with the server-supplied nonce value, method, and * request-uri. + * + * @deprecated@ */ char * /* O - New sum */ @@ -65,7 +67,6 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ const char *resource, /* I - Resource path */ char md5[33]) /* IO - MD5 sum */ { - _cups_md5_state_t state; /* MD5 state info */ unsigned char sum[16]; /* Sum data */ char line[1024]; /* Line of data */ char a2[33]; /* Hash of method and resource */ @@ -76,10 +77,8 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ */ snprintf(line, sizeof(line), "%s:%s", method, resource); - _cupsMD5Init(&state); - _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); - _cupsMD5Finish(&state, sum); - httpMD5String(sum, a2); + cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); + cupsHashString(sum, sizeof(sum), a2, sizeof(a2)); /* * Then combine A1 (MD5 of username, realm, and password) with the nonce @@ -88,17 +87,16 @@ httpMD5Final(const char *nonce, /* I - Server nonce value */ */ snprintf(line, sizeof(line), "%s:%s:%s", md5, nonce, a2); + cupsHashData("md5", (unsigned char *)line, strlen(line), sum, sizeof(sum)); - _cupsMD5Init(&state); - _cupsMD5Append(&state, (unsigned char *)line, (int)strlen(line)); - _cupsMD5Finish(&state, sum); - - return (httpMD5String(sum, md5)); + return ((char *)cupsHashString(sum, sizeof(sum), md5, 33)); } /* * 'httpMD5String()' - Convert an MD5 sum to a character string. + * + * @deprecated@ */ char * /* O - MD5 sum in hex */ @@ -106,23 +104,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ char md5[33]) /* O - MD5 sum in hex */ { - int i; /* Looping var */ - char *md5ptr; /* Pointer into MD5 string */ - static const char hex[] = "0123456789abcdef"; - /* Hex digits */ - - - /* - * Convert the MD5 sum to hexadecimal... - */ - - for (i = 16, md5ptr = md5; i > 0; i --, sum ++) - { - *md5ptr++ = hex[*sum >> 4]; - *md5ptr++ = hex[*sum & 15]; - } - - *md5ptr = '\0'; - - return (md5); + return ((char *)cupsHashString(sum, 16, md5, 33)); } diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index 925ab80..d67a19b 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -1,7 +1,7 @@ /* * PPD cache implementation for CUPS. * - * Copyright 2010-2017 by Apple Inc. + * Copyright © 2010-2018 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -3118,6 +3118,41 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */ cupsFilePuts(fp, "*cupsLanguages: \"en\"\n"); /* + * Password/PIN printing... + */ + + if ((attr = ippFindAttribute(response, "job-password-supported", IPP_TAG_INTEGER)) != NULL) + { + char pattern[33]; /* Password pattern */ + int maxlen = ippGetInteger(attr, 0); + /* Maximum length */ + const char *repertoire = ippGetString(ippFindAttribute(response, "job-password-repertoire-configured", IPP_TAG_KEYWORD), 0, NULL); + /* Type of password */ + + if (maxlen > (int)(sizeof(pattern) - 1)) + maxlen = sizeof(pattern) - 1; + + if (!repertoire || !strcmp(repertoire, "iana_us-ascii_digits")) + memset(pattern, '1', maxlen); + else if (!strcmp(repertoire, "iana_us-ascii_letters")) + memset(pattern, 'A', maxlen); + else if (!strcmp(repertoire, "iana_us-ascii_complex")) + memset(pattern, 'C', maxlen); + else if (!strcmp(repertoire, "iana_us-ascii_any")) + memset(pattern, '.', maxlen); + else if (!strcmp(repertoire, "iana_utf-8_digits")) + memset(pattern, 'N', maxlen); + else if (!strcmp(repertoire, "iana_utf-8_letters")) + memset(pattern, 'U', maxlen); + else + memset(pattern, '*', maxlen); + + pattern[maxlen] = '\0'; + + cupsFilePrintf(fp, "*cupsPassword: \"%s\"\n", pattern); + } + + /* * Filters... */ @@ -3125,24 +3160,18 @@ _ppdCreateFromIPP(char *buffer, /* I - Filename buffer */ { is_apple = ippContainsString(attr, "image/urf"); is_pdf = ippContainsString(attr, "application/pdf"); - is_pwg = ippContainsString(attr, "image/pwg-raster"); - - for (i = 0, count = ippGetCount(attr); i < count; i ++) - { - const char *format = ippGetString(attr, i, NULL); - /* PDL */ - - /* - * Write cupsFilter2 lines for supported formats... - */ - - if (!_cups_strcasecmp(format, "application/pdf")) - cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 10 -\"\n"); - else if (!_cups_strcasecmp(format, "image/jpeg") || !_cups_strcasecmp(format, "image/png")) - cupsFilePrintf(fp, "*cupsFilter2: \"%s %s 0 -\"\n", format, format); - else if (!_cups_strcasecmp(format, "image/pwg-raster") || !_cups_strcasecmp(format, "image/urf")) - cupsFilePrintf(fp, "*cupsFilter2: \"%s %s 100 -\"\n", format, format); - } + is_pwg = ippContainsString(attr, "image/pwg-raster") && !is_apple; + + if (ippContainsString(attr, "image/jpeg")) + cupsFilePuts(fp, "*cupsFilter2: \"image/jpeg image/jpeg 0 -\"\n"); + if (ippContainsString(attr, "image/png")) + cupsFilePuts(fp, "*cupsFilter2: \"image/png image/png 0 -\"\n"); + if (is_pdf) + cupsFilePuts(fp, "*cupsFilter2: \"application/vnd.cups-pdf application/pdf 10 -\"\n"); + if (is_apple) + cupsFilePuts(fp, "*cupsFilter2: \"image/urf image/urf 100 -\"\n"); + if (is_pwg) + cupsFilePuts(fp, "*cupsFilter2: \"image/pwg-raster image/pwg-raster 100 -\"\n"); } if (!is_apple && !is_pdf && !is_pwg) diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 8f875a5..24330ec 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -1,7 +1,7 @@ /* * Option conflict management routines for CUPS. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -29,7 +29,6 @@ enum { - _PPD_NORMAL_CONSTRAINTS, _PPD_OPTION_CONSTRAINTS, _PPD_INSTALLABLE_CONSTRAINTS, _PPD_ALL_CONSTRAINTS @@ -998,7 +997,7 @@ ppd_test_constraints( if (!consts->installable && which == _PPD_INSTALLABLE_CONSTRAINTS) continue; /* Skip non-installable option constraint */ - if (which == _PPD_OPTION_CONSTRAINTS && option) + if ((which == _PPD_OPTION_CONSTRAINTS || which == _PPD_INSTALLABLE_CONSTRAINTS) && option) { /* * Skip constraints that do not involve the current option... diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index ed75bf8..9537ef5 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -1,7 +1,7 @@ /* * PPD localization routines for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -277,7 +277,7 @@ ppdLocalizeIPPReason( if (!locattr) { - if (lang && (!scheme || !strcmp(scheme, "text"))) + if (lang && (!scheme || !strcmp(scheme, "text")) && strcmp(reason, "none")) { /* * Try to localize a standard printer-state-reason keyword... diff --git a/cups/ppd-util.c b/cups/ppd-util.c index d0194c8..19c60e2 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -1,8 +1,8 @@ /* * PPD utilities for CUPS. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -216,6 +216,27 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL const char *tmpdir; /* TMPDIR environment variable */ struct timeval curtime; /* Current time */ +#ifdef __APPLE__ + /* + * On macOS and iOS, the TMPDIR environment variable is not always the + * best location to place temporary files due to sandboxing. Instead, + * the confstr function should be called to get the proper per-user, + * per-process TMPDIR value. + */ + + char tmppath[1024]; /* Temporary directory */ + + if ((tmpdir = getenv("TMPDIR")) != NULL && access(tmpdir, W_OK)) + tmpdir = NULL; + + if (!tmpdir) + { + if (confstr(_CS_DARWIN_USER_TEMP_DIR, tmppath, sizeof(tmppath))) + tmpdir = tmppath; + else + tmpdir = "/private/tmp"; /* This should never happen */ + } +#else /* * Previously we put root temporary files in the default CUPS temporary * directory under /var/spool/cups. However, since the scheduler cleans @@ -224,11 +245,8 @@ cupsGetPPD3(http_t *http, /* I - HTTP connection or @code CUPS_HTTP_DEFAUL */ if ((tmpdir = getenv("TMPDIR")) == NULL) -# ifdef __APPLE__ - tmpdir = "/private/tmp"; /* /tmp is a symlink to /private/tmp */ -# else - tmpdir = "/tmp"; -# endif /* __APPLE__ */ + tmpdir = "/tmp"; +#endif /* __APPLE__ */ /* * Make the temporary name using the specified directory... @@ -511,23 +529,16 @@ cups_get_printer_uri( int depth) /* I - Depth of query */ { int i; /* Looping var */ - int http_port; /* Port number */ - http_t *http2; /* Alternate HTTP connection */ ipp_t *request, /* IPP request */ *response; /* IPP response */ ipp_attribute_t *attr; /* Current attribute */ char uri[HTTP_MAX_URI], /* printer-uri attribute */ scheme[HTTP_MAX_URI], /* Scheme name */ - username[HTTP_MAX_URI], /* Username:password */ - classname[255], /* Temporary class name */ - http_hostname[HTTP_MAX_HOST]; - /* Hostname associated with connection */ + username[HTTP_MAX_URI]; /* Username:password */ static const char * const requested_attrs[] = { /* Requested attributes */ - "device-uri", "member-uris", - "printer-uri-supported", - "printer-type" + "printer-uri-supported" }; @@ -550,15 +561,6 @@ cups_get_printer_uri( DEBUG_printf(("5cups_get_printer_uri: printer-uri=\"%s\"", uri)); /* - * Get the hostname and port number we are connected to... - */ - - httpGetHostname(http, http_hostname, sizeof(http_hostname)); - http_port = httpAddrPort(http->hostaddr); - - DEBUG_printf(("5cups_get_printer_uri: http_hostname=\"%s\"", http_hostname)); - - /* * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following * attributes: * @@ -582,31 +584,7 @@ cups_get_printer_uri( if ((response = cupsDoRequest(http, request, resource)) != NULL) { - const char *device_uri = NULL; /* device-uri value */ - - if ((attr = ippFindAttribute(response, "device-uri", IPP_TAG_URI)) != NULL) - { - device_uri = attr->values[0].string.text; - DEBUG_printf(("5cups_get_printer_uri: device-uri=\"%s\"", device_uri)); - } - - if (device_uri && - (((!strncmp(device_uri, "ipp://", 6) || !strncmp(device_uri, "ipps://", 7)) && - (strstr(device_uri, "/printers/") != NULL || strstr(device_uri, "/classes/") != NULL)) || - ((strstr(device_uri, "._ipp.") != NULL || strstr(device_uri, "._ipps.") != NULL) && - !strcmp(device_uri + strlen(device_uri) - 5, "/cups")))) - { - /* - * Statically-configured shared printer. - */ - - httpSeparateURI(HTTP_URI_CODING_ALL, _httpResolveURI(device_uri, uri, sizeof(uri), _HTTP_RESOLVE_DEFAULT, NULL, NULL), scheme, sizeof(scheme), username, sizeof(username), host, hostsize, port, resource, resourcesize); - ippDelete(response); - - DEBUG_printf(("5cups_get_printer_uri: Resolved to host=\"%s\", port=%d, resource=\"%s\"", host, *port, resource)); - return (1); - } - else if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL) + if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL) { /* * Get the first actual printer name in the class... @@ -631,55 +609,6 @@ cups_get_printer_uri( return (1); } } - - /* - * No printers in this class - try recursively looking for a printer, - * but not more than 3 levels deep... - */ - - if (depth < 3) - { - for (i = 0; i < attr->num_values; i ++) - { - httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[i].string.text, - scheme, sizeof(scheme), username, sizeof(username), - host, hostsize, port, resource, resourcesize); - if (!strncmp(resource, "/classes/", 9)) - { - /* - * Found a class! Connect to the right server... - */ - - if (!_cups_strcasecmp(http_hostname, host) && *port == http_port) - http2 = http; - else if ((http2 = httpConnect2(host, *port, NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL)) == NULL) - { - DEBUG_puts("8cups_get_printer_uri: Unable to connect to server"); - - continue; - } - - /* - * Look up printers on that server... - */ - - strlcpy(classname, resource + 9, sizeof(classname)); - - cups_get_printer_uri(http2, classname, host, hostsize, port, - resource, resourcesize, depth + 1); - - /* - * Close the connection as needed... - */ - - if (http2 != http) - httpClose(http2); - - if (*host) - return (1); - } - } - } } else if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL) { diff --git a/cups/tempfile.c b/cups/tempfile.c index da705a9..1e24869 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,8 +1,8 @@ /* * Temp file utilities for CUPS. * - * Copyright 2007-2014 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -42,8 +42,10 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ int fd; /* File descriptor for temp file */ int tries; /* Number of tries */ const char *tmpdir; /* TMPDIR environment var */ +#if defined(__APPLE__) || defined(WIN32) + char tmppath[1024]; /* Temporary directory */ +#endif /* __APPLE__ || WIN32 */ #ifdef WIN32 - char tmppath[1024]; /* Windows temporary directory */ DWORD curtime; /* Current time */ #else struct timeval curtime; /* Current time */ @@ -60,6 +62,26 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ GetTempPath(sizeof(tmppath), tmppath); tmpdir = tmppath; } + +#elif defined(__APPLE__) + /* + * On macOS and iOS, the TMPDIR environment variable is not always the best + * location to place temporary files due to sandboxing. Instead, the confstr + * function should be called to get the proper per-user, per-process TMPDIR + * value. + */ + + if ((tmpdir = getenv("TMPDIR")) != NULL && access(tmpdir, W_OK)) + tmpdir = NULL; + + if (!tmpdir) + { + if (confstr(_CS_DARWIN_USER_TEMP_DIR, tmppath, sizeof(tmppath))) + tmpdir = tmppath; + else + tmpdir = "/private/tmp"; /* This should never happen */ + } + #else /* * Previously we put root temporary files in the default CUPS temporary @@ -69,11 +91,7 @@ cupsTempFd(char *filename, /* I - Pointer to buffer */ */ if ((tmpdir = getenv("TMPDIR")) == NULL) -# if defined(__APPLE__) && !TARGET_OS_IOS - tmpdir = "/private/tmp"; /* /tmp is a symlink to /private/tmp */ -# else tmpdir = "/tmp"; -# endif /* __APPLE__ && !TARGET_OS_IOS */ #endif /* WIN32 */ /* diff --git a/cups/testppd.c b/cups/testppd.c index e1b5156..c7187c2 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -876,6 +876,13 @@ main(int argc, /* I - Number of command-line arguments */ host[256], /* Hostname */ resource[256]; /* Resource path */ int port; /* Port number */ + static const char * const pattrs[] =/* Requested printer attributes */ + { + "job-template", + "printer-defaults", + "printer-description", + "media-col-database" + }; if (httpSeparateURI(HTTP_URI_CODING_ALL, argv[1], scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) { @@ -892,6 +899,7 @@ main(int argc, /* I - Number of command-line arguments */ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, argv[1]); + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]), NULL, pattrs); response = cupsDoRequest(http, request, resource); if (_ppdCreateFromIPP(buffer, sizeof(buffer), response)) diff --git a/cups/thread.c b/cups/thread.c index 65257aa..b59918b 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -1,7 +1,7 @@ /* * Threading primitives for CUPS. * - * Copyright 2009-2017 by Apple Inc. + * Copyright © 2009-2018 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -56,8 +56,16 @@ _cupsCondWait(_cups_cond_t *cond, /* I - Condition */ { struct timespec abstime; /* Timeout */ - abstime.tv_sec = (long)timeout; - abstime.tv_nsec = (long)(1000000000 * (timeout - (long)timeout)); + clock_gettime(CLOCK_REALTIME, &abstime); + + abstime.tv_sec += (long)timeout; + abstime.tv_nsec += (long)(1000000000 * (timeout - (long)timeout)); + + while (abstime.tv_nsec >= 1000000000) + { + abstime.tv_nsec -= 1000000000; + abstime.tv_sec ++; + }; pthread_cond_timedwait(cond, mutex, &abstime); } @@ -513,8 +521,7 @@ _cupsThreadCreate( _cups_thread_func_t func, /* I - Entry point */ void *arg) /* I - Entry point context */ { - fputs("DEBUG: CUPS was compiled without threading support, no thread " - "created.\n", stderr); + fputs("DEBUG: CUPS was compiled without threading support, no thread created.\n", stderr); (void)func; (void)arg; @@ -524,6 +531,17 @@ _cupsThreadCreate( /* + * '_cupsThreadDetach()' - Tell the OS that the thread is running independently. + */ + +void +_cupsThreadDetach(_cups_thread_t thread)/* I - Thread ID */ +{ + (void)thread; +} + + +/* * '_cupsThreadWait()' - Wait for a thread to exit. */ diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index 92430ac..80cd660 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -1,8 +1,8 @@ /* * TLS support code for CUPS on macOS. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright © 2007-2018 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 @@ -53,7 +53,9 @@ static char *tls_keypath = NULL; /* Server cert keychain path */ static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; /* Mutex for keychain/certs */ -static int tls_options = -1;/* Options for TLS connections */ +static int tls_options = -1,/* Options for TLS connections */ + tls_min_version = _HTTP_TLS_1_0, + tls_max_version = _HTTP_TLS_MAX; /* @@ -807,7 +809,6 @@ httpCredentialsString( CFStringRef cf_name; /* CF common name string */ char name[256]; /* Common name associated with cert */ time_t expiration; /* Expiration date of cert */ - _cups_md5_state_t md5_state; /* MD5 state */ unsigned char md5_digest[16]; /* MD5 result */ if ((cf_name = SecCertificateCopySubjectSummary(secCert)) != NULL) @@ -820,9 +821,7 @@ httpCredentialsString( expiration = (time_t)(SecCertificateNotValidAfter(secCert) + kCFAbsoluteTimeIntervalSince1970); - _cupsMD5Init(&md5_state); - _cupsMD5Append(&md5_state, first->data, (int)first->datalen); - _cupsMD5Finish(&md5_state, md5_digest); + cupsHashData("md5", first->data, first->datalen, md5_digest, sizeof(md5_digest)); snprintf(buffer, bufsize, "%s / %s / %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", name, httpGetDateString(expiration), md5_digest[0], md5_digest[1], md5_digest[2], md5_digest[3], md5_digest[4], md5_digest[5], md5_digest[6], md5_digest[7], md5_digest[8], md5_digest[9], md5_digest[10], md5_digest[11], md5_digest[12], md5_digest[13], md5_digest[14], md5_digest[15]); @@ -1139,10 +1138,16 @@ _httpTLSRead(http_t *http, /* I - HTTP connection */ */ void -_httpTLSSetOptions(int options) /* I - Options */ +_httpTLSSetOptions(int options, /* I - Options */ + int min_version, /* I - Minimum TLS version */ + int max_version) /* I - Maximum TLS version */ { if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) - tls_options = options; + { + tls_options = options; + tls_min_version = min_version; + tls_max_version = max_version; + } } @@ -1174,7 +1179,7 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ { DEBUG_puts("4_httpTLSStart: Setting defaults."); _cupsSetDefaults(); - DEBUG_printf(("4_httpTLSStart: tls_options=%x", tls_options)); + DEBUG_printf(("4_httpTLSStart: tls_options=%x, tls_min_version=%d, tls_max_version=%d", tls_options, tls_min_version, tls_max_version)); } #ifdef HAVE_SECKEYCHAINOPEN @@ -1217,22 +1222,23 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ if (!error) { - SSLProtocol minProtocol; - - if (tls_options & _HTTP_TLS_DENY_TLS10) - minProtocol = kTLSProtocol11; - else if (tls_options & _HTTP_TLS_ALLOW_SSL3) - minProtocol = kSSLProtocol3; - else - minProtocol = kTLSProtocol1; + static const SSLProtocol protocols[] = /* Min/max protocol versions */ + { + kSSLProtocol3, + kTLSProtocol1, + kTLSProtocol11, + kTLSProtocol12, + kTLSProtocol12, /* TODO: update to 1.3 when 1.3 is supported */ + kTLSProtocol12 /* TODO: update to 1.3 when 1.3 is supported */ + }; - error = SSLSetProtocolVersionMin(http->tls, minProtocol); - DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin(%d), error=%d", minProtocol, (int)error)); + error = SSLSetProtocolVersionMin(http->tls, protocols[tls_min_version]); + DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMin(%d), error=%d", protocols[tls_min_version], (int)error)); - if (!error && (tls_options & _HTTP_TLS_ONLY_TLS10)) + if (!error) { - error = SSLSetProtocolVersionMax(http->tls, kTLSProtocol1); - DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMax(kTLSProtocol1), error=%d", (int)error)); + error = SSLSetProtocolVersionMax(http->tls, protocols[tls_max_version]); + DEBUG_printf(("4_httpTLSStart: SSLSetProtocolVersionMax(%d), error=%d", protocols[tls_max_version], (int)error)); } } @@ -1532,7 +1538,28 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ if (!error) { - int done = 0; /* Are we done yet? */ + int done = 0; /* Are we done yet? */ + double old_timeout; /* Old timeout value */ + http_timeout_cb_t old_cb; /* Old timeout callback */ + void *old_data; /* Old timeout data */ + + /* + * Enforce a minimum timeout of 10 seconds for the TLS handshake... + */ + + old_timeout = http->timeout_value; + old_cb = http->timeout_cb; + old_data = http->timeout_data; + + if (!old_cb || old_timeout < 10.0) + { + DEBUG_puts("4_httpTLSStart: Setting timeout to 10 seconds."); + httpSetTimeout(http, 10.0, NULL, NULL); + } + + /* + * Do the TLS handshake... + */ while (!error && !done) { @@ -1653,6 +1680,12 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */ break; } } + + /* + * Restore the previous timeout settings... + */ + + httpSetTimeout(http, old_timeout, old_cb, old_data); } if (error) @@ -2085,7 +2118,7 @@ http_cdsa_read( http = (http_t *)connection; - if (!http->blocking) + if (!http->blocking || http->timeout_value > 0.0) { /* * Make sure we have data before we read... diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index 2dcb7fe..68bacc6 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -1,8 +1,8 @@ /* * TLS support code for CUPS using GNU TLS. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright © 2007-2018 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 @@ -35,7 +35,9 @@ static char *tls_keypath = NULL; /* Server cert keychain path */ static _cups_mutex_t tls_mutex = _CUPS_MUTEX_INITIALIZER; /* Mutex for keychain/certs */ -static int tls_options = -1;/* Options for TLS connections */ +static int tls_options = -1,/* Options for TLS connections */ + tls_min_version = _HTTP_TLS_1_0, + tls_max_version = _HTTP_TLS_MAX; /* @@ -397,7 +399,7 @@ httpCredentialsAreValidForName( for (i = 0; i < count; i ++) { rserial_size = sizeof(rserial); - if (!gnutls_x509_crl_get_crt_serial(tls_crl, (unsigned)i, rserial, &rserial_size, NULL) && cserial_size == rserial_size && !memcmp(cserial, rserial, rserial_size)) + if (!gnutls_x509_crl_get_crt_serial(tls_crl, (unsigned)i, rserial, &rserial_size, NULL) && cserial_size == rserial_size && !memcmp(cserial, rserial, (int)rserial_size)) { result = 0; break; @@ -646,7 +648,6 @@ httpCredentialsString( char name[256]; /* Common name associated with cert */ size_t namelen; /* Length of name */ time_t expiration; /* Expiration date of cert */ - _cups_md5_state_t md5_state; /* MD5 state */ unsigned char md5_digest[16]; /* MD5 result */ namelen = sizeof(name) - 1; @@ -657,9 +658,7 @@ httpCredentialsString( expiration = gnutls_x509_crt_get_expiration_time(cert); - _cupsMD5Init(&md5_state); - _cupsMD5Append(&md5_state, first->data, (int)first->datalen); - _cupsMD5Finish(&md5_state, md5_digest); + cupsHashData("md5", first->data, first->datalen, md5_digest, sizeof(md5_digest)); snprintf(buffer, bufsize, "%s / %s / %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", name, httpGetDateString(expiration), md5_digest[0], md5_digest[1], md5_digest[2], md5_digest[3], md5_digest[4], md5_digest[5], md5_digest[6], md5_digest[7], md5_digest[8], md5_digest[9], md5_digest[10], md5_digest[11], md5_digest[12], md5_digest[13], md5_digest[14], md5_digest[15]); @@ -1094,7 +1093,7 @@ http_gnutls_read( http = (http_t *)ptr; - if (!http->blocking) + if (!http->blocking || http->timeout_value > 0.0) { /* * Make sure we have data before we read... @@ -1224,10 +1223,16 @@ _httpTLSSetCredentials(http_t *http) /* I - Connection to server */ */ void -_httpTLSSetOptions(int options) /* I - Options */ +_httpTLSSetOptions(int options, /* I - Options */ + int min_version, /* I - Minimum TLS version */ + int max_version) /* I - Maximum TLS version */ { if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) - tls_options = options; + { + tls_options = options; + tls_min_version = min_version; + tls_max_version = max_version; + } } @@ -1245,6 +1250,19 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ /* TLS credentials */ char priority_string[2048]; /* Priority string */ + int version; /* Current version */ + double old_timeout; /* Old timeout value */ + http_timeout_cb_t old_cb; /* Old timeout callback */ + void *old_data; /* Old timeout data */ + static const char * const versions[] =/* SSL/TLS versions */ + { + "VERS-SSL3.0", + "VERS-TLS1.0", + "VERS-TLS1.1", + "VERS-TLS1.2", + "VERS-TLS1.3", + "VERS-TLS-ALL" + }; DEBUG_printf(("3_httpTLSStart(http=%p)", http)); @@ -1506,14 +1524,40 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ strlcpy(priority_string, "NORMAL", sizeof(priority_string)); - if (tls_options & _HTTP_TLS_DENY_TLS10) - strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-TLS1.0:-VERS-SSL3.0", sizeof(priority_string)); - else if (tls_options & _HTTP_TLS_ALLOW_SSL3) + if (tls_max_version < _HTTP_TLS_MAX) + { + /* + * Require specific TLS versions... + */ + + strlcat(priority_string, ":-VERS-TLS-ALL", sizeof(priority_string)); + for (version = tls_min_version; version <= tls_max_version; version ++) + { + strlcat(priority_string, ":+", sizeof(priority_string)); + strlcat(priority_string, versions[version], sizeof(priority_string)); + } + } + else if (tls_min_version == _HTTP_TLS_SSL3) + { + /* + * Allow all versions of TLS and SSL/3.0... + */ + strlcat(priority_string, ":+VERS-TLS-ALL:+VERS-SSL3.0", sizeof(priority_string)); - else if (tls_options & _HTTP_TLS_ONLY_TLS10) - strlcat(priority_string, ":-VERS-TLS-ALL:-VERS-SSL3.0:+VERS-TLS1.0", sizeof(priority_string)); + } else - strlcat(priority_string, ":+VERS-TLS-ALL:-VERS-SSL3.0", sizeof(priority_string)); + { + /* + * Require a minimum version... + */ + + strlcat(priority_string, ":+VERS-TLS-ALL", sizeof(priority_string)); + for (version = 0; version < tls_min_version; version ++) + { + strlcat(priority_string, ":-", sizeof(priority_string)); + strlcat(priority_string, versions[version], sizeof(priority_string)); + } + } if (tls_options & _HTTP_TLS_ALLOW_RC4) strlcat(priority_string, ":+ARCFOUR-128", sizeof(priority_string)); @@ -1543,6 +1587,24 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ #endif /* HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION */ gnutls_transport_set_push_function(http->tls, http_gnutls_write); + /* + * Enforce a minimum timeout of 10 seconds for the TLS handshake... + */ + + old_timeout = http->timeout_value; + old_cb = http->timeout_cb; + old_data = http->timeout_data; + + if (!old_cb || old_timeout < 10.0) + { + DEBUG_puts("4_httpTLSStart: Setting timeout to 10 seconds."); + httpSetTimeout(http, 10.0, NULL, NULL); + } + + /* + * Do the TLS handshake... + */ + while ((status = gnutls_handshake(http->tls)) != GNUTLS_E_SUCCESS) { DEBUG_printf(("5_httpStartTLS: gnutls_handshake returned %d (%s)", @@ -1560,10 +1622,18 @@ _httpTLSStart(http_t *http) /* I - Connection to server */ free(credentials); http->tls = NULL; + httpSetTimeout(http, old_timeout, old_cb, old_data); + return (-1); } } + /* + * Restore the previous timeout settings... + */ + + httpSetTimeout(http, old_timeout, old_cb, old_data); + http->tls_credentials = credentials; return (0); diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 6eaec4c..ea3fb00 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -2,7 +2,7 @@ * TLS support for CUPS on Windows using the Security Support Provider * Interface (SSPI). * - * Copyright 2010-2017 by Apple Inc. + * Copyright 2010-2018 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -52,7 +52,9 @@ * Local globals... */ -static int tls_options = -1;/* Options for TLS connections */ +static int tls_options = -1,/* Options for TLS connections */ + tls_min_version = _HTTP_TLS_1_0, + tls_max_version = _HTTP_TLS_MAX; /* @@ -351,7 +353,6 @@ httpCredentialsString( SYSTEMTIME systime; /* System time */ struct tm tm; /* UNIX date/time */ time_t expiration; /* Expiration date of cert */ - _cups_md5_state_t md5_state; /* MD5 state */ unsigned char md5_digest[16]; /* MD5 result */ FileTimeToSystemTime(&(cert->pCertInfo->NotAfter), &systime); @@ -378,9 +379,7 @@ httpCredentialsString( else strlcpy(cert_name, "unknown", sizeof(cert_name)); - _cupsMD5Init(&md5_state); - _cupsMD5Append(&md5_state, first->data, (int)first->datalen); - _cupsMD5Finish(&md5_state, md5_digest); + cupsHashData("md5", first->data, first->datalen, md5_digest, sizeof(md5_digest)); snprintf(buffer, bufsize, "%s / %s / %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", cert_name, httpGetDateString(expiration), md5_digest[0], md5_digest[1], md5_digest[2], md5_digest[3], md5_digest[4], md5_digest[5], md5_digest[6], md5_digest[7], md5_digest[8], md5_digest[9], md5_digest[10], md5_digest[11], md5_digest[12], md5_digest[13], md5_digest[14], md5_digest[15]); @@ -911,10 +910,16 @@ _httpTLSRead(http_t *http, /* I - HTTP connection */ */ void -_httpTLSSetOptions(int options) /* I - Options */ +_httpTLSSetOptions(int options, /* I - Options */ + int min_version, /* I - Minimum TLS version */ + int max_version) /* I - Maximum TLS version */ { if (!(options & _HTTP_TLS_SET_DEFAULT) || tls_options < 0) - tls_options = options; + { + tls_options = options; + tls_min_version = min_version; + tls_max_version = max_version; + } } @@ -1762,34 +1767,38 @@ http_sspi_find_credentials( #ifdef SP_PROT_TLS1_2_SERVER if (http->mode == _HTTP_MODE_SERVER) { - if (tls_options & _HTTP_TLS_DENY_TLS10) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER; - else if (tls_options & _HTTP_TLS_ALLOW_SSL3) + if (tls_min_version == _HTTP_TLS_SSL3) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER | SP_PROT_SSL3_SERVER; - else + else if (tls_min_version == _HTTP_TLS_1_0) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_0_SERVER; + else if (tls_min_version == _HTTP_TLS_1_1) + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_1_SERVER; + else + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_SERVER; } else { - if (tls_options & _HTTP_TLS_DENY_TLS10) - SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT; - else if (tls_options & _HTTP_TLS_ALLOW_SSL3) + if (tls_min_version == _HTTP_TLS_SSL3) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_SSL3_CLIENT; - else + else if (tls_min_version == _HTTP_TLS_1_0) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_0_CLIENT; + else if (tls_min_version == _HTTP_TLS_1_1) + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_1_CLIENT; + else + SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_2_CLIENT; } #else if (http->mode == _HTTP_MODE_SERVER) { - if (tls_options & _HTTP_TLS_ALLOW_SSL3) + if (tls_min_version == _HTTP_TLS_SSL3) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER | SP_PROT_SSL3_SERVER; else SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER; } else { - if (tls_options & _HTTP_TLS_ALLOW_SSL3) + if (tls_min_version == _HTTP_TLS_SSL3) SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT | SP_PROT_SSL3_CLIENT; else SchannelCred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; diff --git a/cups/tls.c b/cups/tls.c index 36d484c..f3dd092 100644 --- a/cups/tls.c +++ b/cups/tls.c @@ -36,7 +36,7 @@ /* - * Local functions... + * Include platform-specific TLS code... */ #ifdef HAVE_SSL diff --git a/cups/tlscheck.c b/cups/tlscheck.c index 997e7aa..fa8fdd5 100644 --- a/cups/tlscheck.c +++ b/cups/tlscheck.c @@ -54,6 +54,8 @@ main(int argc, /* I - Number of command-line arguments */ int af = AF_UNSPEC, /* Address family */ tls_options = _HTTP_TLS_NONE, /* TLS options */ + tls_min_version = _HTTP_TLS_1_0, + tls_max_version = _HTTP_TLS_MAX, verbose = 0; /* Verbosity */ ipp_t *request, /* IPP Get-Printer-Attributes request */ *response; /* IPP Get-Printer-Attributes response */ @@ -88,11 +90,12 @@ main(int argc, /* I - Number of command-line arguments */ } else if (!strcmp(argv[i], "--no-tls10")) { - tls_options |= _HTTP_TLS_DENY_TLS10; + tls_min_version = _HTTP_TLS_1_1; } else if (!strcmp(argv[i], "--tls10")) { - tls_options |= _HTTP_TLS_ONLY_TLS10; + tls_min_version = _HTTP_TLS_1_0; + tls_max_version = _HTTP_TLS_1_0; } else if (!strcmp(argv[i], "--rc4")) { @@ -148,7 +151,7 @@ main(int argc, /* I - Number of command-line arguments */ if (!port) port = 631; - _httpTLSSetOptions(tls_options); + _httpTLSSetOptions(tls_options, tls_min_version, tls_max_version); http = httpConnect2(server, port, NULL, af, HTTP_ENCRYPTION_ALWAYS, 1, 30000, NULL); if (!http) diff --git a/cups/usersys.c b/cups/usersys.c index 2a004b5..99601e4 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -54,7 +54,9 @@ typedef struct _cups_client_conf_s /**** client.conf config data ****/ { #ifdef HAVE_SSL - int ssl_options; /* SSLOptions values */ + int ssl_options, /* SSLOptions values */ + ssl_min_version,/* Minimum SSL/TLS version */ + ssl_max_version;/* Maximum SSL/TLS version */ #endif /* HAVE_SSL */ int trust_first, /* Trust on first use? */ any_root, /* Allow any (e.g., self-signed) root */ @@ -957,7 +959,7 @@ _cupsSetDefaults(void) cg->validate_certs = cc.validate_certs; #ifdef HAVE_SSL - _httpTLSSetOptions(cc.ssl_options | _HTTP_TLS_SET_DEFAULT); + _httpTLSSetOptions(cc.ssl_options | _HTTP_TLS_SET_DEFAULT, cc.ssl_min_version, cc.ssl_max_version); #endif /* HAVE_SSL */ } @@ -1164,11 +1166,15 @@ cups_init_client_conf( memset(cc, 0, sizeof(_cups_client_conf_t)); - cc->encryption = (http_encryption_t)-1; - cc->trust_first = -1; - cc->any_root = -1; - cc->expired_certs = -1; - cc->validate_certs = -1; +#ifdef HAVE_SSL + cc->ssl_min_version = _HTTP_TLS_1_0; + cc->ssl_max_version = _HTTP_TLS_MAX; +#endif /* HAVE_SSL */ + cc->encryption = (http_encryption_t)-1; + cc->trust_first = -1; + cc->any_root = -1; + cc->expired_certs = -1; + cc->validate_certs = -1; /* * Load settings from the org.cups.PrintingPrefs plist (which trump @@ -1336,7 +1342,9 @@ cups_set_ssl_options( * SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyTLS1.0] [None] */ - int options = _HTTP_TLS_NONE; /* SSL/TLS options */ + int options = _HTTP_TLS_NONE, /* SSL/TLS options */ + min_version = _HTTP_TLS_1_0, /* Minimum SSL/TLS version */ + max_version = _HTTP_TLS_MAX; /* Maximum SSL/TLS version */ char temp[256], /* Copy of value */ *start, /* Start of option */ *end; /* End of option */ @@ -1364,20 +1372,38 @@ cups_set_ssl_options( if (!_cups_strcasecmp(start, "AllowRC4")) options |= _HTTP_TLS_ALLOW_RC4; else if (!_cups_strcasecmp(start, "AllowSSL3")) - options |= _HTTP_TLS_ALLOW_SSL3; + min_version = _HTTP_TLS_SSL3; else if (!_cups_strcasecmp(start, "AllowDH")) options |= _HTTP_TLS_ALLOW_DH; else if (!_cups_strcasecmp(start, "DenyCBC")) options |= _HTTP_TLS_DENY_CBC; else if (!_cups_strcasecmp(start, "DenyTLS1.0")) - options |= _HTTP_TLS_DENY_TLS10; + min_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MaxTLS1.0")) + max_version = _HTTP_TLS_1_0; + else if (!_cups_strcasecmp(start, "MaxTLS1.1")) + max_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MaxTLS1.2")) + max_version = _HTTP_TLS_1_2; + else if (!_cups_strcasecmp(start, "MaxTLS1.3")) + max_version = _HTTP_TLS_1_3; + else if (!_cups_strcasecmp(start, "MinTLS1.0")) + min_version = _HTTP_TLS_1_0; + else if (!_cups_strcasecmp(start, "MinTLS1.1")) + min_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MinTLS1.2")) + min_version = _HTTP_TLS_1_2; + else if (!_cups_strcasecmp(start, "MinTLS1.3")) + min_version = _HTTP_TLS_1_3; else if (!_cups_strcasecmp(start, "None")) options = _HTTP_TLS_NONE; } - cc->ssl_options = options; + cc->ssl_options = options; + cc->ssl_max_version = max_version; + cc->ssl_min_version = min_version; - DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x", (void *)cc, value, options)); + DEBUG_printf(("4cups_set_ssl_options(cc=%p, value=\"%s\") options=%x, min_version=%d, max_version=%d", (void *)cc, value, options, min_version, max_version)); } #endif /* HAVE_SSL */ diff --git a/cups/versioning.h b/cups/versioning.h index 5a000c0..4065832 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -1,7 +1,7 @@ /* * API versioning definitions for CUPS. * - * Copyright 2007-2017 by Apple Inc. + * Copyright © 2007-2018 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -71,6 +71,7 @@ # define _CUPS_API_2_0 AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER # define _CUPS_API_2_2 AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER # define _CUPS_API_2_2_4 AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER +# define _CUPS_API_2_2_7 # else # define _CUPS_API_1_1_19 # define _CUPS_API_1_1_20 @@ -84,6 +85,7 @@ # define _CUPS_API_2_0 # define _CUPS_API_2_2 # define _CUPS_API_2_2_4 +# define _CUPS_API_2_2_7 # endif /* __APPLE__ && !_CUPS_SOURCE */ /* diff --git a/doc/help/cupspm.epub b/doc/help/cupspm.epub index 331d9be1d76624b394eef68d80159dfad0a1baf4..cbffada46d22aef0e6e7ec1f1f75a045f2ee4274 100644 GIT binary patch delta 6282 zcmY+IXEYq#8|`PzDA7xFqKi(5F3Jd^8xp;SAj;@O9laAoC(&!PXv63wqSt6M%IJa- ziRi-pzwdkRhx@E`*4}5Gy`J-BfBF?QlXNtbkm_lIzz+fcjG~UORw}6k_+Nd&@t?Y( z|J4sVKvt4}9w=owuF@I+fWD?cpm`oVTB;b8cRl-P+&N94klue1A)i>7OmG`UY8bzg zXLEx(gkq;P*?cw2#)^3dT!Q#kEEm08UcbKxs`Gn*z`;TG(pJQ0j?mRP>2eBV71IhQ zw?${gVxb*78dWx`(BkN5R-^tTmTPTALwTUXe~%+G^i~fU9{^5vs$vagqjgN;jt;-79ABK z62Us_STE)`R*if2;Z)Lv_p-xJ_$%nlngMV99uWw}Mh>Mqgwv$lLVMO3Q!1j9!(n!$ z4>s6ST!022o2YiaNNf^T_-DHFZ>KU*VDti6YQl~7ver(RHXZiJU8IGtj?T2kx@GBF zSCdy)0-G-5_)-2TkTaEsh6EO172|iG;>tyzg5|AjN24=*5Abz)iUr{qM#tt_eN6*79YZ4l zDfVT~M)E;QknCp-|A^M|bi9Sb<&~dMjCIxNV^|xv4pXV$AKvS=>Eu8=`{eEHL?zs+ zomsjm;MudE<==idDT>3Hb3_KdEJ%Y>yHkLDRmddW@6kkDVnPoGuQJ?I1PVROe%OEa zQSg+Eg>i+tG9{(z(KcbiysB_huM1EEyVRVEUdhboxn0R_MV@w+qEd1L$?)SFX7;5b zzlpOv*~@YD%CERA;>MzO26cONob7d9_77w$p#lkc68@ zzM}^r4NVHtrhBD{z0 z_3%M?*jFd~X67K7d6DQ}QJiG$P!|xUM6#_H&RF+Sq!t{)Ga#lX-pp|tL9 zG2<;vgS?VIL~u@-$_$lK5|+E(e|q-U^vUtW&6@jCM>!dpG`je_l&dh=?@2QVR3<10 z4y;+e5jAoP9 zCXU>rup<5!++)9)UckxU%w6UZnPU^oeLFH%;!ozVaBHm3)Y}M>zw;TVw?e#hne)`fafMTaP>G1@n+-?Tz(==iqJ|a zo?o+swH#E=^1{1)zR=v|`jV#1=Ej(Y#z;6bLwWMs$m`6WM)2cWSE4zi(2%kACkxH6 zJ?k|?sHTy{Cku3$6b_A2TMHDXUp(8)Q#OM`p+%&*Rs*-I4 zaKeJ9c>MtFn{(eL$gJ76;QaSnEw2frwRA^eq5RFdYl}=P)DT{CmE3Y#GRXeP*}&Wq zhnF#{ShSblEcSf2ED}bSIVq*?AW%z$;_Gzkr%8WF)z%Ux9ob9QKXs5#on!qY!2;;? zm`*!|Cc!-HEiavRp`A``XtT_#GywKxGAC!5%K>F-+3b@-m`aEE_es4$s@8HV=h`N4 z8x0AX|07r1**<*9a8DqtrT7hL60+d!(^~3$AbIhA`72wY$j7ERQb0qD9nh$5%kJ(a zk?-fl<`FkDkbL^Z7w4jrskIwq?-+^257wLGolGKmvg0Kk%2y#X)Pxgm5?$kO)cXhQ z%5M$Qg*?~I%x`g-Hi|>s6SBhc-NUkcBvxg`da27^x?tcolRbQC5b*a1BJ_gTTyT35 zx{FcQ=dP;yw~s)fN{$y<6ok9EE($Ndd$Eibkx}^4pTFA-QB6zj!F3a1IXCb}mOpk& zCHFN2{@C)Bx!50PiWfuT1Nl+1HoJCpboBD6IoVSK>bsu3peLe;Y_QSlQ?&@7`A_b# z4erL5CA{#~>OP~>pUIabWcu4Ql#yOx5rQsM_SQrr2;27Soqxa9-pwe=i-q_S?E3|D zJ1DVvq&-n*J%LW+KZ@|IQ}?R21`ZoT#&MonQe?p!eu?ecTOYSNlBt!vBx!ASxH*ZZksY3oO8Ivv~YrtFp7Tr!8i8Y8y6PBp*Y?jq0Xc9_19nt$dRZ3t?8 z+dy0|u_E#iOaF;M``zwOQcf;*!xN7DIX6d8J03;*!I@s_VQXTdIX9n-s-R!rtD9Bt z{3s~=fu*~Bl|&~w>GNAIpl#mLYb8nZybvQQ5B0_+$JQkPm!SxTPPU@GTKq)ggMf!< z@xyZQuvR)cWW3Z@NzLl?6fCcP|3X4h5jvIa;cBbXqoiJ8leH9!();5RVaLPBoz_`H zf}n>g-xgAJ$0GEl^!gjQfe#{!4ph0xcb^ZyNodG7kRqT0fIMc&T1Xi$@6eQHZ>HqEl?Z}Jl zqky{HM`G1>U#bJ9X^uM-vOs4PF_qeLQkR}%Td`{>3vSqNqEncCg?$Ws>xRT!P@r@Z2 zuiKUF0)Hu(k*K{$4A0EI2;5osjC8FgF}(7fF(WR93CT!6%)!(v+BChQ@ZfNWnG_#; zQBvf9-?Fjm&#)@w$=$1_N-~6z2y5VhPt*eCkX<%65JOWmVuI|_?}J?K@U@HQmHm*e zo*|Bq(_D&CvgXIAm!D!R$6fw9nL?o(+EtV~=HTRm!d-sxX~iGh6awiHNPv3ZK}t9C zc+uuGa5Kuc=@e7FpVfL(NM*vFsgD^f&7WvOhNn9=?zU@e>hUmNa%Lo}44c4#M*#%_ zgG>-?qZ;oac{6209gwiUCi9y>AKF;Ho+$jjCd}=0A}RRC|XNBTu0l;H$ER@#m$&nrZZJjPO?I zeS{7q#zKehUExGe4;bU`#D0Swm zu$^vF`ld&U9t|493~>H;;}V|FPHu~2>Eu}sP(!thBE)Y$&wtW9sDMW`OZl$6M=YZf zZ&nFuf?D@n9?WSRskcS1MDTP+VIoiuYoTh-zYAXHUvCA{2)(ADRD*sC8(XhF65_NF z8Mv+mr+31}2ui2uW$I&?6h3PT@2wl%Ufn5+Xi&xh;tr`WsLshnMn=^Kaww%HiVh#*@$^(TF`O zA|a#G$0|hEpP8RX{qBmO9Du)X)1VLOeoJERr0>qZ(`DbY!_t~VupNy~c z%^IFVvm+1SH1n?A9g!EFa z$C>wb>sX$dhe=X&39to9VvvLfOrQA8y?>ufO1(+Vsd@b>kd~m=aW}v{1e(O_{Bc`j z(1>O0HPPsSI_ww6Uy;QlNL)*^>Z(oIS%r4Oum|xP6cpD(kvOyGm@X3_At51dnn1Iw z1B)1@gX{A+hr#@W10*e`oLzBQ*x!&?&jq~jMlHIYh?)}sUBgtFv`acu`{&6tpL>@o zH*1|n)6|}gRyw|!&gSyxu)Qje4xC~e=vmIEsvC%eQ&B=N&-X7HBh!8Aw)cCD!E&d-0a|^84DtLRm{jVryI$1M7l$+8ZejI^kVELsx3Umo&;c#|loi`ufuNrkcu1^H%-wxiaJjTxEu!EB*E70Uf7UnYb;vaQ&^X z@Mu`%T4k%C+i(j%|j(RG4yQ6WUhzL?hoSnUsVuzVgk5XO5 z1F4HpC<~4Szu zRTsRB^++ZCIA7hKwa`$~VbcG`lOuLZmDhikkWFgur@rzP*AwQEyXNx_qAC*KGB}P# zC|n)JIOqxFYCwjvl)~myW4Q!gn)HNkvc-Mwwgv|&dYtwB`Z6rU&xSh<((=c@k4Z^s zPYn0Cs84oLB~Hu>v|$FjTp!d$3Zafr;oT?E6Q6TE$yjxb<+~9i=d9Mp7T-S}N8S)D zh+!|r}3pCcr*gPTpx(S{v}!Bn}~!fji9cImrsuplL!^9l|=u_)ogw4@(kE@CG?0by4)Zd8_} zW7k+#%Jj!U=g|UA0#Ng*hfV@jZUZ(fAgf})Dl`# zl^Rq;>dK-f6t>KlGF}wO64v5fR4qdntLaAKbF76|o1gfpa8EpqzE^3>5~kB;{q+Z>4ROUT$@1-;4(EIFH~*QSZq&7 zo5m}qr#3C|SNZ2J(3oLjI%Jk4>=3!?>QC!ht&D|4al@Wz7v~_m+H4en<2RP|TTnCG zF5R?jT(RF6!@aPH8`hmn7S7DZe9~gybMVoxgYR)R?nc`AdI~e}Ic`8ZO*^A{LSDz7 zbyUh@m`|C-njM0UDN-=Mz~I|A4X#|>;ZV8ip52MI%lv7Ta=IXIZDtFihcX8&D!&6g z2J#4qwm+tbfq5`i7HMvNo-7ACt0Zj1I^79CYH$@D{6v0kYldZs3jAq=&Tr*-XSj>g z^VQ?*RYA-UpU)-S`B;fq!QdybcWyF03K}}^KBBk(v8to*JIvUa<$5~l8&A)kW!(;+ zM=nD1=m*0CIT}5I&V3krkp1s{nM8<|!Mut=rHi%SyovpV0Y1x#D|g*^=ue?wlR|%g zhv!zb92EJ4{Vb%zb?#E}ruG@HaX|aUk^m$&4&va*#j#2PWF*Bf`+bOS&U3Wj8f}wk#-}k`( z2W|2GqqY$YjWG<3Kmm=z)V@l>tj7jHNS-X%+Oq?<)jVXcGG14{|Br z0$!O6!5e7UD$g3&K3=qz{&ANo)nDQkuPal@Ts5#|#3{*CP}3?^#J=H}aV22ET2r^n z)J7O|;lL{&25@IPIC%43LJ%c~947AZ&#Dy}9Y5`+kE5*5-stYOdS0^{3jeN>sld4`!yE5*h3p&~6}Y#Y;l(;FiosWtiw49Gwu2chGN;)+8?m=~3XFmA znwNix%1u9D+{rqqQ!+x)jpGiN6sVJ`T!ilD7!d?W$UjHVNM76M8+hvRq_YBZl1US;-Z2XSq>fA z^X5CUORE~PvyZ7y(oI)GI8{lKHZ)ma8ufVm;%n0&J~{yh^E7)4l|5Rs`a8gXWxxRt z{7dkue%qkMi2;B+D*%A(e^eiFs0q>|{uknBDHwx9|8qXZAhG{kjWI~^KX+mb68Zlb zf0m#L=n2a|eNq!6vIxk+0sM3R+4}#cG>kJV*aYfY|ZWjsF(~{2vBr-NXO@ delta 6275 zcmZ9RWl)?;w6zC!8(aekZoxHJaDux_aDux8UM#qUAVGpV3^u^v!9tKAK?B1e!QCb3 zch1RIx9Z-m>RPL7?_J$L)~}~Kn(zvn@bER?prDd~{#};(R&PGy3!(m}N-zGZ8~i{0 zq>e<7_iuqc;F(2WJqV-+4MH-_0U}v#SH|jt4=*dw*Gf}>QmVH<)2xhNk-FCHiweo~ z1a*J*!!r1eWOf#}E-_kzX>f^^3bUs-(J0rY3;@f~L~2C^Wc!D!$*)r-g410odwKw<#-{dkf;5%M+&WJY^ zgC8_Q*>XpFToy3bs2K&Ovi83quMPg>bi^0;II;gu<;469Aj(TX@Q)*(Rrn#f6XcK ze1Wl%Z~%-V986l4>awDCDXhO%<= zmSO_wQsTJm`>vBTAZU_R|E*zFR4%o95@F`i?z&Fhy!LiDVHC|HiHU{@$6?8|oze%9 zyhK|>jcu8&Xk9YbM8Jf8%OFE-*!RM(&*3=#NxjKnAEgEy3?~zGduy^8bOO~ zFC_w)F4EE}_<50HVoG>y)LRAyj8cVemJO-dgKcDokGzwWtatgBg|L|6z3lJsc{jVe zij~gq^+)bJzefrK(5g}bzb*HiN%~t(>PGGNC#Eq=2S{D+db@;&lYp*#)C(PvDiIGm zzKenk^85#Ys%nIsph2~C;Ina$^Gbdyf3stqLzi}2Ty@=6HuVqo=|Xy6mR{$s<$C#d ztZBaZ0^x8Ry4;VGUC3wAY;WQ`3#e?XFwR{xk}YN>^jV7ftG%; z#~?DD!C_WEDn-KhlU@7bC7l674|L`n?$nSt?g;wYk2z|pb%9#XZ}|WZ_uZ61bs9rc?n~;A~KFU+f&X)Fn?l`XUEqMVVGGXcq<; zs*7+Qrh38K@Zi?eNtZjq_sBCW#8dz(#to7je(#fK0fjM_zkZD#GRMuR)tZ^wkheKU zFIp7*Z8zBu1LSy`Ry0#S;f#XUYKA}uY4?tgG1-Bk;tUF=QtJ+$u?y@CckIU!E0P~n z#A(P&@LUY9@wi;ARaU+&8tSp0`89NEn?=12E=_l*ONC=`x~-rErIMhieOyIEYQ_{wi0S8-6ws&% zHd2l7Cz(ngI`aU|Q}Ov%v-m`Aws8sV zV_&?F4h6ijhq^L8Um?QayZ*oz+K*&>>_vWCuVl<2ts+_$;MZgthv}xwk{dJj8N?wU znq2L3nJJo@%r$jKeTEu1rF_*sii7)^+68QC6AK>fkHOs1cQYLMUBislzjaAQ0#G`| zM!MI{VI3PTMtofwP{yP_gA|XEDb|?X&|M6$nX4cxd5&baeA}F4h7<5@Hr`e+`P`%N z^JX1qukt&1-vw#Gil=LWAOzl)%hW?Qcg#MN;aUMgP_@x=2+K-`M5jOlL!yutd?BPu zRR5USz(UerV*i-T1G}`s#XCymvT+3%eC70DIjbt|0s=F7VFjJ#(5&cMr$VYWvj~%U z7@KD`B<#UP-J1e>f#fB9Jh~^VyD`O~mRFDcE#gUXdQMLd1kK2!!go^Q1Koc=tTgOvG24=Iee)e$dujaS@lGWph0F0zaq`*^vGaoE97Z}tf(u1t&lpZlpj!^qI|O--hy41U5~~zi|Xp~ z7N3D9>I5ogFVAdv`_>?I5lex%Y;!huTf9>zDSnTY&c?1(B%w17fP^sxns&ol0L z4zfoeZ#w)~Fn_`GFpmA(|6`fqM6ai>0#E7?1s$`e)HB4uvQU8|JNZ_tZ9; z6X}E>T+F?C!ec)zK`_X$XKO6ytV0~c>16i4<3&h+1WDTm)HTypOB{G4<*(OgE;6=g zH6p+ux3lSHw2nyYkPav6X&mm;EmQ(~UW1gANBsJFp)AVXcIa`ZYh}Z3CPll?wZrv2 z*bVTg1_V+j67p%0Z@=Un8)+)#+Ngpt-;-Q~eJ{v;H3=w=g;1C$v$1 z?%*NJJS>yHdnuU}+>WzdHBBNCgvd+z^fL3OCuAM#Pw2238FD zm?$W46O+;wcek%rJ-CXE_f?E@i$Hbj%rG&YKcS{>WUXyp88>|_uZe?qKTOwM7ALh>MlH>^&fkQezG80n4$H8yI;*$J3C^&`*1rK#X^JKf>8dY1)URWu}dY6A)3LHeYug}+STbwmcuo)Eo8U|qpK}ZgUdnG8K3`3?-WJMAR&W*D&|)xArO5auYR$0nRpKoW^Q zLPze$#HjzlDR8aP*X|MBFLU?cu(KfJ(i)Jb0E^GXI{Byt=51A@=Tz}}2TFEz`_-ND zVdBc=9OV(gn9SU0nr+&hbqWxtrH95Z3T&jWYuhuVZx@pDn|#gI*VXmcsfr{f4=Wa{ z_@ja+pxLgBinCe3Ev;QIR^o=?RUzUX>R*UBc-6{&TY4zDBbO0VN+QC`W`AB&OV5;D z6HuEfLZX5psa$GJ9g#g`ghTg&vZ%X0+tFQUjw`pSh0&O+5x8 z-FGz*d_qzY+M){&lpK;pnZS34`fj^n~D$y%=>O@(n=zS{%`6(URF69*D^=1_!68v z{9YQ_oD%0f|Jm^3Wnv#zrh=8WVu)p1o$O!@h9*r7xN&d=n+}?2O7IHU!H=4VZg26} zN5_?2bZXvCy>(>ZN}|19cWDt?4}pcF z;>Vl35AlYP16ng4t7kCw4jg6jAN9HHNKAEbK4i8gr!wed%m-;kAwnYb3v}ht<9Tni z`znqUtY?H7p-yDCCWe!bR5(=bnw`pn)*Jm=tzCQPZ z)1?_r4{&N08$UMdl(`1!RO;`;H>1{RE=^3R($)KJj;WtG6?g?&{ZU{NOVcMP1je}m zaLz1*He0CgdElJ^o;%Bh#LG>~F&D4;+YvFIY#3csA8_~lPbs3PtcF9kI6)(%*k!3M zbHo}HpgQ$3XRIqEk%kUsh@0R4v3b=~5YTQa__|0G@nS`smG}NSraEnHJ7=z^lo<`C z?FwVH5q3_cdaMdo?u_&xMIcP@mk;r35%_xTrPK80NCl5a<*J!D{mC0<+d@v@mzw=t zc3L3?0PXgiK$BLxqxSJDc?+XlnR!Ng+@Eo5aAzqF3YXjTePk5@>Xl;~YZc^0eaU|D zKXvq9Y^!P-eJX=>;~3MVbJ~}($Y&qi3MqPV;j)${>3AJ1K@J_VnH2c@*FGy+4n`5~ z(8bVw?};~q4vNzt=@sfKar+B)&BT+I99pwOz?b-^1-Q`sUtgVv^n;oor8ANiv6lp8_M)Y^D$Oa&n4dav1z>4nKEm6XNvI6OB@Z`7+%0fNL7Q`5>b$Dv2%Qb#CeSi&jOrwCY!W|2#__ye^V7pGZ0vTN=3bEg z2`}1}QE)>tfB5O!Jffy}ogj97F*{1iLaSULGQo{^W8<+{h?yzftDsqcME8NIrlJz1 z&|KR|Fy&=4ZwZWkrM5$O`~~Z!jPuUcMxs-++(RaurIX)UYVx^<58nnlFSkMi6^#C2Sk=yddJLK~GawwQ3R^G4vErd2+xs+2_ z4gm zBupOfh+t2P&P*pu z18y<3&X@A^jNXT@sruz-vKv1y2Gp_6%_wziMz{boJ5v()}Tcd z*pEM4Q09}STdGtAK=(@OC_OJcYO=gCnd95~SM-$!{ikPtRmj?)<03|>VLphXmd<#g z*+SpK*Tk?q=AWtv^QHQH&{lBW{AmTGVVOnwM>u7Gd-ZwGR&a{vC;|A5kvfK!co6cH zzt7$PPir-^dPV+@BXOu{{8D1cw=slQ{p%rOSo;*WTcZhpi{D2!K2f=DT?!s!v5}^m zwK%skeXqXrTnAUOy)3B~4V(5d`T3u&)-|vXYu!E5@c{K{+4s-yi#A8U_O zs}1YL_zVKDbQ0#QAqd_Xv`$;`dO7czE;0sZy7Ep$rNdz*GxruIlH?EYrd41ltK2JM z(-o@k*yDuWRYnlp2oW3D_4s9Wb53@4@)y;`f5cQrTO+`*F(~?eh@@nzzNY&bx4=6# z!*_P9bz21yQFu+<%q()JV$j9I`6b?JC)QwWf5_hzMC|`b(%HIBjCyz(P6khzzb~Z1?(Kdg*;LCl;zO262{sR^H_Ej z{0^li`gf2dAGh1wy;{Z7G}fQQ{yhC}IIGByV-}c+4ElEy`~z$?hUcEFr z{Ag3``K>uWZ!?nXnf8nxhmB++ezr-}1(gfxK1E>>wOaLO#X3-Aph6Ix+0fG7o9X7Y zU$H?fr-=Lqu_<)pEhZ+YQ1-(*>nGU@!cJ^HR_DBB^Olp}F56ji4RZc=b~aUI@o$w^ z>5S^T12Q`8D^^KcFa}aeGP|JuRiIoLez1s3%qmhB9Xo9fMLcB}um60!R8C+vnr!y$Q}9nEWc}z|1hBULtJSIw#{#1A#Ho zBrD@+->^IfSrCILj>nS2;-h;mHLjPaW|9#EBeSe$AGKq~*o}<4s{AV2W{{T78 B-cbMm diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html index ba52cad..4d4e5fe 100644 --- a/doc/help/cupspm.html +++ b/doc/help/cupspm.html @@ -6125,12 +6125,12 @@ are server-oriented...

HTTP_STATUS_ERROR An error response from httpXxxx() HTTP_STATUS_EXPECTATION_FAILED The expectation given in an Expect header field was not met HTTP_STATUS_FORBIDDEN Forbidden to access this URI + HTTP_STATUS_FOUND Document was found at a different URI HTTP_STATUS_GATEWAY_TIMEOUT Gateway connection timed out HTTP_STATUS_GONE Server has gone away HTTP_STATUS_LENGTH_REQUIRED A content length or encoding is required HTTP_STATUS_METHOD_NOT_ALLOWED Method is not allowed HTTP_STATUS_MOVED_PERMANENTLY Document has moved permanently - HTTP_STATUS_MOVED_TEMPORARILY Document has moved temporarily HTTP_STATUS_MULTIPLE_CHOICES Multiple files match request HTTP_STATUS_NONE  CUPS 1.7/macOS 10.9  No Expect value HTTP_STATUS_NOT_ACCEPTABLE Not Acceptable @@ -6149,10 +6149,11 @@ are server-oriented...

HTTP_STATUS_REQUEST_TIMEOUT Request timed out HTTP_STATUS_REQUEST_TOO_LARGE Request entity too large HTTP_STATUS_RESET_CONTENT Content was reset/recreated - HTTP_STATUS_SEE_OTHER See this other link... + HTTP_STATUS_SEE_OTHER See this other link HTTP_STATUS_SERVER_ERROR Internal server error HTTP_STATUS_SERVICE_UNAVAILABLE Service is unavailable HTTP_STATUS_SWITCHING_PROTOCOLS HTTP upgrade to TLS/SSL + HTTP_STATUS_TEMPORARY_REDIRECT Temporary redirection HTTP_STATUS_UNAUTHORIZED Unauthorized to access host HTTP_STATUS_UNSUPPORTED_MEDIATYPE The requested media type is unsupported HTTP_STATUS_UPGRADE_REQUIRED Upgrade to SSL/TLS required diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index b979137..cdf1a86 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -44,8 +44,10 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
SSLOptions None
Sets encryption options (only in /etc/cups/client.conf). By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. -The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation. -The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. +Security is reduced when Allow options are used. +Security is enhanced when Deny options are used. +The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation (not supported on systems using GNU TLS). +The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients. The AllowSSL3 option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The DenyCBC option disables all CBC cipher suites. The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 42dae48..6dd442e 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -95,10 +95,6 @@ The kind strings are:
permissions
Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions. -
FileDevice Yes -
FileDevice No -
Specifies whether the file pseudo-device can be used for new printer queues. -The URI "file:///dev/null" is always allowed.
Group group-name-or-number
Specifies the group name or ID that will be used when executing external programs. The default group is operating system specific but is usually "lp" or "nobody". @@ -162,6 +158,13 @@ The default is "lp".

Deprecated Directives

The following directives are deprecated and will be removed from a future version of CUPS:
+
FileDevice Yes +
FileDevice No +
Specifies whether the file pseudo-device can be used for new printer queues. +The URI "file:///dev/null" is always allowed. +File devices cannot be used with "raw" print queues - a PPD file is required. +The specified file is overwritten for every print job. +Writing to directories is not supported.
FontPath directory[:...:directoryN]
Specifies a colon separated list of directories where fonts can be found. On Linux the diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 9082348..fe4902d 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -283,8 +283,10 @@ The default is "Minimal".
SSLOptions None
Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. -The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation. -The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. +Security is reduced when Allow options are used. +Security is enhanced when Deny options are used. +The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation (not supported on systems using GNU TLS). +The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients. The AllowSSL3 option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The DenyCBC option disables all CBC cipher suites. The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index 110a584..58c078e 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -80,6 +80,7 @@ Use the -m option with the lpinfo(8) command to get a list of supported models. The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP device-uri. +Note: The "raw" model is deprecated and will not be supported in a future version of CUPS.
-o cupsIPPSupplies=true
-o cupsIPPSupplies=false
Specifies whether IPP supply level values should be reported. diff --git a/filter/raster.c b/filter/raster.c index bacf5ba..edb650d 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,7 +1,7 @@ /* * Raster file routines for CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * This file is part of the CUPS Imaging library. @@ -50,11 +50,96 @@ struct _cups_raster_s /**** Raster stream data ****/ *bufend; /* End of current (read) buffer */ size_t bufsize; /* Buffer size */ #ifdef DEBUG - size_t iocount; /* Number of bytes read/written */ + size_t iostart, /* Start of read/write buffer */ + iocount; /* Number of bytes read/written */ #endif /* DEBUG */ unsigned apple_page_count;/* Apple raster page count */ }; +typedef void (*_cups_copyfunc_t)(void *dst, const void *src, size_t bytes); + + +/* + * Local globals... + */ + +#ifdef DEBUG + static const char * const cups_color_spaces[] = + { /* Color spaces */ + "CUPS_CSPACE_W", + "CUPS_CSPACE_RGB", + "CUPS_CSPACE_RGBA", + "CUPS_CSPACE_K", + "CUPS_CSPACE_CMY", + "CUPS_CSPACE_YMC", + "CUPS_CSPACE_CMYK", + "CUPS_CSPACE_YMCK", + "CUPS_CSPACE_KCMY", + "CUPS_CSPACE_KCMYcm", + "CUPS_CSPACE_GMCK", + "CUPS_CSPACE_GMCS", + "CUPS_CSPACE_WHITE", + "CUPS_CSPACE_GOLD", + "CUPS_CSPACE_SILVER", + "CUPS_CSPACE_CIEXYZ", + "CUPS_CSPACE_CIELab", + "CUPS_CSPACE_RGBW", + "CUPS_CSPACE_SW", + "CUPS_CSPACE_SRGB", + "CUPS_CSPACE_ADOBERGB", + "21", + "22", + "23", + "24", + "25", + "26", + "27", + "28", + "29", + "30", + "31", + "CUPS_CSPACE_ICC1", + "CUPS_CSPACE_ICC2", + "CUPS_CSPACE_ICC3", + "CUPS_CSPACE_ICC4", + "CUPS_CSPACE_ICC5", + "CUPS_CSPACE_ICC6", + "CUPS_CSPACE_ICC7", + "CUPS_CSPACE_ICC8", + "CUPS_CSPACE_ICC9", + "CUPS_CSPACE_ICCA", + "CUPS_CSPACE_ICCB", + "CUPS_CSPACE_ICCC", + "CUPS_CSPACE_ICCD", + "CUPS_CSPACE_ICCE", + "CUPS_CSPACE_ICCF", + "47", + "CUPS_CSPACE_DEVICE1", + "CUPS_CSPACE_DEVICE2", + "CUPS_CSPACE_DEVICE3", + "CUPS_CSPACE_DEVICE4", + "CUPS_CSPACE_DEVICE5", + "CUPS_CSPACE_DEVICE6", + "CUPS_CSPACE_DEVICE7", + "CUPS_CSPACE_DEVICE8", + "CUPS_CSPACE_DEVICE9", + "CUPS_CSPACE_DEVICEA", + "CUPS_CSPACE_DEVICEB", + "CUPS_CSPACE_DEVICEC", + "CUPS_CSPACE_DEVICED", + "CUPS_CSPACE_DEVICEE", + "CUPS_CSPACE_DEVICEF" + }; + static const char * const cups_modes[] = + { /* Open modes */ + "CUPS_RASTER_READ", + "CUPS_RASTER_WRITE", + "CUPS_RASTER_WRITE_COMPRESSED", + "CUPS_RASTER_WRITE_PWG", + "CUPS_RASTER_WRITE_APPLE" + }; +#endif /* DEBUG */ + /* * Local functions... @@ -62,13 +147,12 @@ struct _cups_raster_s /**** Raster stream data ****/ static ssize_t cups_raster_io(cups_raster_t *r, unsigned char *buf, size_t bytes); static unsigned cups_raster_read_header(cups_raster_t *r); -static ssize_t cups_raster_read(cups_raster_t *r, unsigned char *buf, - size_t bytes); +static ssize_t cups_raster_read(cups_raster_t *r, unsigned char *buf, size_t bytes); static int cups_raster_update(cups_raster_t *r); -static ssize_t cups_raster_write(cups_raster_t *r, - const unsigned char *pixels); +static ssize_t cups_raster_write(cups_raster_t *r, const unsigned char *pixels); static ssize_t cups_read_fd(void *ctx, unsigned char *buf, size_t bytes); static void cups_swap(unsigned char *buf, size_t bytes); +static void cups_swap_copy(unsigned char *dst, const unsigned char *src, size_t bytes); static ssize_t cups_write_fd(void *ctx, unsigned char *buf, size_t bytes); @@ -356,6 +440,8 @@ cupsRasterOpen(int fd, /* I - File descriptor */ @code CUPS_RASTER_WRITE_COMPRESSED@, or @code CUPS_RASTER_WRITE_PWG@ */ { + DEBUG_printf(("cupsRasterOpen(fd=%d, mode=%s)", fd, cups_modes[mode])); + if (mode == CUPS_RASTER_READ) return (cupsRasterOpenIO(cups_read_fd, (void *)((intptr_t)fd), mode)); else @@ -387,12 +473,15 @@ cupsRasterOpenIO( cups_raster_t *r; /* New stream */ + DEBUG_printf(("cupsRasterOpenIO(iocb=%p, ctx=%p, mode=%s)", (void *)iocb, ctx, cups_modes[mode])); + _cupsRasterClearError(); if ((r = calloc(sizeof(cups_raster_t), 1)) == NULL) { _cupsRasterAddError("Unable to allocate memory for raster stream: %s\n", strerror(errno)); + DEBUG_puts("1cupsRasterOpenIO: Returning NULL."); return (NULL); } @@ -412,6 +501,7 @@ cupsRasterOpenIO( _cupsRasterAddError("Unable to read header from raster stream: %s\n", strerror(errno)); free(r); + DEBUG_puts("1cupsRasterOpenIO: Unable to read header, returning NULL."); return (NULL); } @@ -426,6 +516,7 @@ cupsRasterOpenIO( { _cupsRasterAddError("Unknown raster format %08x!\n", r->sync); free(r); + DEBUG_puts("1cupsRasterOpenIO: Unknown format, returning NULL."); return (NULL); } @@ -435,6 +526,8 @@ cupsRasterOpenIO( r->sync == CUPS_RASTER_REVSYNCapple) r->compressed = 1; + DEBUG_printf(("1cupsRasterOpenIO: sync=%08x", r->sync)); + if (r->sync == CUPS_RASTER_REVSYNC || r->sync == CUPS_RASTER_REVSYNCv1 || r->sync == CUPS_RASTER_REVSYNCv2 || @@ -452,12 +545,14 @@ cupsRasterOpenIO( _cupsRasterAddError("Unable to read header from raster stream: %s\n", strerror(errno)); free(r); + DEBUG_puts("1cupsRasterOpenIO: Unable to read header, returning NULL."); return (NULL); } - } - DEBUG_printf(("1cupsRasterOpenIO: r->swapped=%d, r->sync=%08x\n", r->swapped, r->sync)); +#ifdef DEBUG + r->iostart = r->iocount; +#endif /* DEBUG */ } else { @@ -496,10 +591,13 @@ cupsRasterOpenIO( _cupsRasterAddError("Unable to write raster stream header: %s\n", strerror(errno)); free(r); + DEBUG_puts("1cupsRasterOpenIO: Unable to write header, returning NULL."); return (NULL); } } + DEBUG_printf(("1cupsRasterOpenIO: compressed=%d, swapped=%d, returning %p", r->compressed, r->swapped, (void *)r)); + return (r); } @@ -522,6 +620,8 @@ cupsRasterReadHeader( cups_raster_t *r, /* I - Raster stream */ cups_page_header_t *h) /* I - Pointer to header data */ { + DEBUG_printf(("cupsRasterReadHeader(r=%p, h=%p)", (void *)r, (void *)h)); + /* * Get the raster header... */ @@ -529,6 +629,7 @@ cupsRasterReadHeader( if (!cups_raster_read_header(r)) { memset(h, 0, sizeof(cups_page_header_t)); + DEBUG_puts("1cupsRasterReadHeader: Unable to read page header, returning 0."); return (0); } @@ -538,6 +639,14 @@ cupsRasterReadHeader( memcpy(h, &(r->header), sizeof(cups_page_header_t)); + DEBUG_printf(("1cupsRasterReadHeader: cupsColorSpace=%s", cups_color_spaces[h->cupsColorSpace])); + DEBUG_printf(("1cupsRasterReadHeader: cupsBitsPerColor=%u", h->cupsBitsPerColor)); + DEBUG_printf(("1cupsRasterReadHeader: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); + DEBUG_printf(("1cupsRasterReadHeader: cupsBytesPerLine=%u", h->cupsBytesPerLine)); + DEBUG_printf(("1cupsRasterReadHeader: cupsWidth=%u", h->cupsWidth)); + DEBUG_printf(("1cupsRasterReadHeader: cupsHeight=%u", h->cupsHeight)); + + DEBUG_puts("1cupsRasterReadHeader: Returning 1."); return (1); } @@ -563,6 +672,7 @@ cupsRasterReadHeader2( if (!cups_raster_read_header(r)) { memset(h, 0, sizeof(cups_page_header2_t)); + DEBUG_puts("1cupsRasterReadHeader2: Unable to read header, returning 0."); return (0); } @@ -572,6 +682,14 @@ cupsRasterReadHeader2( memcpy(h, &(r->header), sizeof(cups_page_header2_t)); + DEBUG_printf(("1cupsRasterReadHeader2: cupsColorSpace=%s", cups_color_spaces[h->cupsColorSpace])); + DEBUG_printf(("1cupsRasterReadHeader2: cupsBitsPerColor=%u", h->cupsBitsPerColor)); + DEBUG_printf(("1cupsRasterReadHeader2: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); + DEBUG_printf(("1cupsRasterReadHeader2: cupsBytesPerLine=%u", h->cupsBytesPerLine)); + DEBUG_printf(("1cupsRasterReadHeader2: cupsWidth=%u", h->cupsWidth)); + DEBUG_printf(("1cupsRasterReadHeader2: cupsHeight=%u", h->cupsHeight)); + + DEBUG_puts("1cupsRasterReadHeader2: Returning 1."); return (1); } @@ -777,7 +895,10 @@ cupsRasterReadPixels(cups_raster_t *r, /* I - Raster stream */ r->header.cupsBitsPerPixel == 12 || r->header.cupsBitsPerPixel == 16) && r->swapped) - cups_swap(ptr, (size_t)bytes); + { + DEBUG_puts("1cupsRasterReadPixels: Swapping bytes."); + cups_swap(ptr, (size_t)cupsBytesPerLine); + } /* * Update pointers... @@ -847,8 +968,20 @@ cupsRasterWriteHeader( cups_raster_t *r, /* I - Raster stream */ cups_page_header_t *h) /* I - Raster page header */ { + DEBUG_printf(("cupsRasterWriteHeader(r=%p, h=%p)", (void *)r, (void *)h)); + if (r == NULL || r->mode == CUPS_RASTER_READ) + { + DEBUG_puts("1cupsRasterWriteHeader: Returning 0."); return (0); + } + + DEBUG_printf(("1cupsRasterWriteHeader: cupsColorSpace=%s", cups_color_spaces[h->cupsColorSpace])); + DEBUG_printf(("1cupsRasterWriteHeader: cupsBitsPerColor=%u", h->cupsBitsPerColor)); + DEBUG_printf(("1cupsRasterWriteHeader: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); + DEBUG_printf(("1cupsRasterWriteHeader: cupsBytesPerLine=%u", h->cupsBytesPerLine)); + DEBUG_printf(("1cupsRasterWriteHeader: cupsWidth=%u", h->cupsWidth)); + DEBUG_printf(("1cupsRasterWriteHeader: cupsHeight=%u", h->cupsHeight)); /* * Make a copy of the header, and compute the number of raster @@ -859,7 +992,20 @@ cupsRasterWriteHeader( memcpy(&(r->header), h, sizeof(cups_page_header_t)); if (!cups_raster_update(r)) + { + DEBUG_puts("1cupsRasterWriteHeader: Unable to update parameters, returning 0."); return (0); + } + + if (r->mode == CUPS_RASTER_WRITE_APPLE) + { + r->rowheight = h->HWResolution[0] / h->HWResolution[1]; + + if (h->HWResolution[0] != (r->rowheight * h->HWResolution[1])) + return (0); + } + else + r->rowheight = 1; /* * Write the raster header... @@ -1019,8 +1165,20 @@ cupsRasterWriteHeader2( cups_raster_t *r, /* I - Raster stream */ cups_page_header2_t *h) /* I - Raster page header */ { + DEBUG_printf(("cupsRasterWriteHeader(r=%p, h=%p)", (void *)r, (void *)h)); + if (r == NULL || r->mode == CUPS_RASTER_READ) + { + DEBUG_puts("1cupsRasterWriteHeader2: Returning 0."); return (0); + } + + DEBUG_printf(("1cupsRasterWriteHeader2: cupsColorSpace=%s", cups_color_spaces[h->cupsColorSpace])); + DEBUG_printf(("1cupsRasterWriteHeader2: cupsBitsPerColor=%u", h->cupsBitsPerColor)); + DEBUG_printf(("1cupsRasterWriteHeader2: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); + DEBUG_printf(("1cupsRasterWriteHeader2: cupsBytesPerLine=%u", h->cupsBytesPerLine)); + DEBUG_printf(("1cupsRasterWriteHeader2: cupsWidth=%u", h->cupsWidth)); + DEBUG_printf(("1cupsRasterWriteHeader2: cupsHeight=%u", h->cupsHeight)); /* * Make a copy of the header, and compute the number of raster @@ -1030,7 +1188,10 @@ cupsRasterWriteHeader2( memcpy(&(r->header), h, sizeof(cups_page_header2_t)); if (!cups_raster_update(r)) + { + DEBUG_puts("1cupsRasterWriteHeader: Unable to update parameters, returning 0."); return (0); + } if (r->mode == CUPS_RASTER_WRITE_APPLE) { @@ -1202,7 +1363,6 @@ cupsRasterWritePixels(cups_raster_t *r, /* I - Raster stream */ r->header.cupsBitsPerPixel == 16)) { unsigned char *bufptr; /* Pointer into write buffer */ - unsigned count; /* Remaining count */ /* * Allocate a write buffer as needed... @@ -1223,21 +1383,10 @@ cupsRasterWritePixels(cups_raster_t *r, /* I - Raster stream */ } /* - * Byte swap the pixels... + * Byte swap the pixels and write them... */ - for (bufptr = r->buffer, count = len; count > 1; count -= 2, bufptr += 2) - { - bufptr[1] = *p++; - bufptr[0] = *p++; - } - - if (count) /* This should never happen... */ - *bufptr = *p; - - /* - * Write the byte-swapped buffer... - */ + cups_swap_copy(r->buffer, p, len); bytes = cups_raster_io(r, r->buffer, len); } @@ -1368,7 +1517,7 @@ cups_raster_read_header( size_t len; /* Length for read/swap */ - DEBUG_printf(("3cups_raster_read_header(r=%p), r->mode=%d", (void *)r, r ? r->mode : 0)); + DEBUG_printf(("3cups_raster_read_header(r=%p), r->mode=%s", (void *)r, r ? cups_modes[r->mode] : "")); if (r == NULL || r->mode != CUPS_RASTER_READ) return (0); @@ -1523,10 +1672,7 @@ cups_raster_io(cups_raster_t *r, /* I - Raster stream */ DEBUG_printf(("6cups_raster_io: count=%d, total=%d", (int)count, (int)total)); if (count == 0) - { - DEBUG_puts("6cups_raster_io: Returning 0."); - return (0); - } + break; else if (count < 0) { DEBUG_puts("6cups_raster_io: Returning -1 on error."); @@ -1538,6 +1684,7 @@ cups_raster_io(cups_raster_t *r, /* I - Raster stream */ #endif /* DEBUG */ } + DEBUG_printf(("6cups_raster_io: iocount=" CUPS_LLFMT, CUPS_LLCAST r->iocount)); DEBUG_printf(("6cups_raster_io: Returning " CUPS_LLFMT ".", CUPS_LLCAST total)); return (total); @@ -1558,7 +1705,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ total; /* Total bytes read */ - DEBUG_printf(("5cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT ")", (void *)r, (void *)buf, CUPS_LLCAST bytes)); + DEBUG_printf(("4cups_raster_read(r=%p, buf=%p, bytes=" CUPS_LLFMT "), offset=" CUPS_LLFMT, (void *)r, (void *)buf, CUPS_LLCAST bytes, CUPS_LLCAST (r->iostart + r->bufptr - r->buffer))); if (!r->compressed) return (cups_raster_io(r, buf, bytes)); @@ -1602,7 +1749,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ { count = (ssize_t)bytes - total; - DEBUG_printf(("6cups_raster_read: count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p", CUPS_LLCAST count, CUPS_LLCAST remaining, (void *)buf, (void *)r->bufptr, (void *)r->bufend)); + DEBUG_printf(("5cups_raster_read: count=" CUPS_LLFMT ", remaining=" CUPS_LLFMT ", buf=%p, bufptr=%p, bufend=%p", CUPS_LLCAST count, CUPS_LLCAST remaining, (void *)buf, (void *)r->bufptr, (void *)r->bufend)); if (remaining == 0) { @@ -1612,6 +1759,10 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ * Read into the raster buffer and then copy... */ +#ifdef DEBUG + r->iostart += (size_t)(r->bufend - r->buffer); +#endif /* DEBUG */ + remaining = (*r->iocb)(r->ctx, r->buffer, r->bufsize); if (remaining <= 0) return (0); @@ -1635,6 +1786,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ return (0); #ifdef DEBUG + r->iostart += (size_t)count; r->iocount += (size_t)count; #endif /* DEBUG */ @@ -1687,7 +1839,7 @@ cups_raster_read(cups_raster_t *r, /* I - Raster stream */ } } - DEBUG_printf(("6cups_raster_read: Returning %ld", (long)total)); + DEBUG_printf(("5cups_raster_read: Returning %ld", (long)total)); return (total); } @@ -1850,11 +2002,24 @@ cups_raster_write( unsigned char *wptr; /* Pointer into write buffer */ unsigned bpp, /* Bytes per pixel */ count; /* Count */ + _cups_copyfunc_t cf; /* Copy function */ DEBUG_printf(("3cups_raster_write(r=%p, pixels=%p)", (void *)r, (void *)pixels)); /* + * Determine whether we need to swap bytes... + */ + + if (r->swapped && (r->header.cupsBitsPerColor == 16 || r->header.cupsBitsPerPixel == 12 || r->header.cupsBitsPerPixel == 16)) + { + DEBUG_puts("4cups_raster_write: Swapping bytes when writing."); + cf = (_cups_copyfunc_t)cups_swap_copy; + } + else + cf = (_cups_copyfunc_t)memcpy; + + /* * Allocate a write buffer as needed... */ @@ -1905,8 +2070,8 @@ cups_raster_write( */ *wptr++ = 0; - for (count = bpp; count > 0; count --) - *wptr++ = *start++; + (*cf)(wptr, start, bpp); + wptr += bpp; } else if (!memcmp(start, ptr, bpp)) { @@ -1919,8 +2084,9 @@ cups_raster_write( break; *wptr++ = (unsigned char)(count - 1); - for (count = bpp; count > 0; count --) - *wptr++ = *ptr++; + (*cf)(wptr, ptr, bpp); + wptr += bpp; + ptr += bpp; } else { @@ -1941,7 +2107,7 @@ cups_raster_write( *wptr++ = (unsigned char)(257 - count); count *= bpp; - memcpy(wptr, start, count); + (*cf)(wptr, start, count); wptr += count; } } @@ -1973,11 +2139,11 @@ cups_read_fd(void *ctx, /* I - File descriptor as pointer */ #endif /* WIN32 */ if (errno != EINTR && errno != EAGAIN) { - DEBUG_printf(("4cups_read_fd: %s", strerror(errno))); + DEBUG_printf(("8cups_read_fd: %s", strerror(errno))); return (-1); } - DEBUG_printf(("4cups_read_fd: Returning %d bytes.", (int)count)); + DEBUG_printf(("8cups_read_fd: Returning %d bytes.", (int)count)); return (count); } @@ -2010,6 +2176,30 @@ cups_swap(unsigned char *buf, /* I - Buffer to swap */ /* + * 'cups_swap_copy()' - Copy and swap bytes in raster data... + */ + +static void +cups_swap_copy( + unsigned char *dst, /* I - Destination */ + const unsigned char *src, /* I - Source */ + size_t bytes) /* I - Number of bytes to swap */ +{ + bytes /= 2; + + while (bytes > 0) + { + dst[0] = src[1]; + dst[1] = src[0]; + + dst += 2; + src += 2; + bytes --; + } +} + + +/* * 'cups_write_fd()' - Write bytes to a file. */ @@ -2030,7 +2220,7 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ #endif /* WIN32 */ if (errno != EINTR && errno != EAGAIN) { - DEBUG_printf(("4cups_write_fd: %s", strerror(errno))); + DEBUG_printf(("8cups_write_fd: %s", strerror(errno))); return (-1); } diff --git a/locale/cups.footer b/locale/cups.footer index c94fa63..784bf68 100644 --- a/locale/cups.footer +++ b/locale/cups.footer @@ -289,183 +289,183 @@ msgstr "Right Gate Fold" msgid "finishing-template.fold-z" msgstr "Z Fold" msgid "finishing-template.jdf-f10-1" -msgstr "JDF F10-1" +msgstr "JDF Fold F10-1" msgid "finishing-template.jdf-f10-2" -msgstr "JDF F10-2" +msgstr "JDF Fold F10-2" msgid "finishing-template.jdf-f10-3" -msgstr "JDF F10-3" +msgstr "JDF Fold F10-3" msgid "finishing-template.jdf-f12-1" -msgstr "JDF F12-1" +msgstr "JDF Fold F12-1" msgid "finishing-template.jdf-f12-10" -msgstr "JDF F12-10" +msgstr "JDF Fold F12-10" msgid "finishing-template.jdf-f12-11" -msgstr "JDF F12-11" +msgstr "JDF Fold F12-11" msgid "finishing-template.jdf-f12-12" -msgstr "JDF F12-12" +msgstr "JDF Fold F12-12" msgid "finishing-template.jdf-f12-13" -msgstr "JDF F12-13" +msgstr "JDF Fold F12-13" msgid "finishing-template.jdf-f12-14" -msgstr "JDF F12-14" +msgstr "JDF Fold F12-14" msgid "finishing-template.jdf-f12-2" -msgstr "JDF F12-2" +msgstr "JDF Fold F12-2" msgid "finishing-template.jdf-f12-3" -msgstr "JDF F12-3" +msgstr "JDF Fold F12-3" msgid "finishing-template.jdf-f12-4" -msgstr "JDF F12-4" +msgstr "JDF Fold F12-4" msgid "finishing-template.jdf-f12-5" -msgstr "JDF F12-5" +msgstr "JDF Fold F12-5" msgid "finishing-template.jdf-f12-6" -msgstr "JDF F12-6" +msgstr "JDF Fold F12-6" msgid "finishing-template.jdf-f12-7" -msgstr "JDF F12-7" +msgstr "JDF Fold F12-7" msgid "finishing-template.jdf-f12-8" -msgstr "JDF F12-8" +msgstr "JDF Fold F12-8" msgid "finishing-template.jdf-f12-9" -msgstr "JDF F12-9" +msgstr "JDF Fold F12-9" msgid "finishing-template.jdf-f14-1" -msgstr "JDF F14-1" +msgstr "JDF Fold F14-1" msgid "finishing-template.jdf-f16-1" -msgstr "JDF F16-1" +msgstr "JDF Fold F16-1" msgid "finishing-template.jdf-f16-10" -msgstr "JDF F16-10" +msgstr "JDF Fold F16-10" msgid "finishing-template.jdf-f16-11" -msgstr "JDF F16-11" +msgstr "JDF Fold F16-11" msgid "finishing-template.jdf-f16-12" -msgstr "JDF F16-12" +msgstr "JDF Fold F16-12" msgid "finishing-template.jdf-f16-13" -msgstr "JDF F16-13" +msgstr "JDF Fold F16-13" msgid "finishing-template.jdf-f16-14" -msgstr "JDF F16-14" +msgstr "JDF Fold F16-14" msgid "finishing-template.jdf-f16-2" -msgstr "JDF F16-2" +msgstr "JDF Fold F16-2" msgid "finishing-template.jdf-f16-3" -msgstr "JDF F16-3" +msgstr "JDF Fold F16-3" msgid "finishing-template.jdf-f16-4" -msgstr "JDF F16-4" +msgstr "JDF Fold F16-4" msgid "finishing-template.jdf-f16-5" -msgstr "JDF F16-5" +msgstr "JDF Fold F16-5" msgid "finishing-template.jdf-f16-6" -msgstr "JDF F16-6" +msgstr "JDF Fold F16-6" msgid "finishing-template.jdf-f16-7" -msgstr "JDF F16-7" +msgstr "JDF Fold F16-7" msgid "finishing-template.jdf-f16-8" -msgstr "JDF F16-8" +msgstr "JDF Fold F16-8" msgid "finishing-template.jdf-f16-9" -msgstr "JDF F16-9" +msgstr "JDF Fold F16-9" msgid "finishing-template.jdf-f18-1" -msgstr "JDF F18-1" +msgstr "JDF Fold F18-1" msgid "finishing-template.jdf-f18-2" -msgstr "JDF F18-2" +msgstr "JDF Fold F18-2" msgid "finishing-template.jdf-f18-3" -msgstr "JDF F18-3" +msgstr "JDF Fold F18-3" msgid "finishing-template.jdf-f18-4" -msgstr "JDF F18-4" +msgstr "JDF Fold F18-4" msgid "finishing-template.jdf-f18-5" -msgstr "JDF F18-5" +msgstr "JDF Fold F18-5" msgid "finishing-template.jdf-f18-6" -msgstr "JDF F18-6" +msgstr "JDF Fold F18-6" msgid "finishing-template.jdf-f18-7" -msgstr "JDF F18-7" +msgstr "JDF Fold F18-7" msgid "finishing-template.jdf-f18-8" -msgstr "JDF F18-8" +msgstr "JDF Fold F18-8" msgid "finishing-template.jdf-f18-9" -msgstr "JDF F18-9" +msgstr "JDF Fold F18-9" msgid "finishing-template.jdf-f2-1" -msgstr "JDF F2-1" +msgstr "JDF Fold F2-1" msgid "finishing-template.jdf-f20-1" -msgstr "JDF F20-1" +msgstr "JDF Fold F20-1" msgid "finishing-template.jdf-f20-2" -msgstr "JDF F20-2" +msgstr "JDF Fold F20-2" msgid "finishing-template.jdf-f24-1" -msgstr "JDF F24-1" +msgstr "JDF Fold F24-1" msgid "finishing-template.jdf-f24-10" -msgstr "JDF F24-10" +msgstr "JDF Fold F24-10" msgid "finishing-template.jdf-f24-11" -msgstr "JDF F24-11" +msgstr "JDF Fold F24-11" msgid "finishing-template.jdf-f24-2" -msgstr "JDF F24-2" +msgstr "JDF Fold F24-2" msgid "finishing-template.jdf-f24-3" -msgstr "JDF F24-3" +msgstr "JDF Fold F24-3" msgid "finishing-template.jdf-f24-4" -msgstr "JDF F24-4" +msgstr "JDF Fold F24-4" msgid "finishing-template.jdf-f24-5" -msgstr "JDF F24-5" +msgstr "JDF Fold F24-5" msgid "finishing-template.jdf-f24-6" -msgstr "JDF F24-6" +msgstr "JDF Fold F24-6" msgid "finishing-template.jdf-f24-7" -msgstr "JDF F24-7" +msgstr "JDF Fold F24-7" msgid "finishing-template.jdf-f24-8" -msgstr "JDF F24-8" +msgstr "JDF Fold F24-8" msgid "finishing-template.jdf-f24-9" -msgstr "JDF F24-9" +msgstr "JDF Fold F24-9" msgid "finishing-template.jdf-f28-1" -msgstr "JDF F28-1" +msgstr "JDF Fold F28-1" msgid "finishing-template.jdf-f32-1" -msgstr "JDF F32-1" +msgstr "JDF Fold F32-1" msgid "finishing-template.jdf-f32-2" -msgstr "JDF F32-2" +msgstr "JDF Fold F32-2" msgid "finishing-template.jdf-f32-3" -msgstr "JDF F32-3" +msgstr "JDF Fold F32-3" msgid "finishing-template.jdf-f32-4" -msgstr "JDF F32-4" +msgstr "JDF Fold F32-4" msgid "finishing-template.jdf-f32-5" -msgstr "JDF F32-5" +msgstr "JDF Fold F32-5" msgid "finishing-template.jdf-f32-6" -msgstr "JDF F32-6" +msgstr "JDF Fold F32-6" msgid "finishing-template.jdf-f32-7" -msgstr "JDF F32-7" +msgstr "JDF Fold F32-7" msgid "finishing-template.jdf-f32-8" -msgstr "JDF F32-8" +msgstr "JDF Fold F32-8" msgid "finishing-template.jdf-f32-9" -msgstr "JDF F32-9" +msgstr "JDF Fold F32-9" msgid "finishing-template.jdf-f36-1" -msgstr "JDF F36-1" +msgstr "JDF Fold F36-1" msgid "finishing-template.jdf-f36-2" -msgstr "JDF F36-2" +msgstr "JDF Fold F36-2" msgid "finishing-template.jdf-f4-1" -msgstr "JDF F4-1" +msgstr "JDF Fold F4-1" msgid "finishing-template.jdf-f4-2" -msgstr "JDF F4-2" +msgstr "JDF Fold F4-2" msgid "finishing-template.jdf-f40-1" -msgstr "JDF F40-1" +msgstr "JDF Fold F40-1" msgid "finishing-template.jdf-f48-1" -msgstr "JDF F48-1" +msgstr "JDF Fold F48-1" msgid "finishing-template.jdf-f48-2" -msgstr "JDF F48-2" +msgstr "JDF Fold F48-2" msgid "finishing-template.jdf-f6-1" -msgstr "JDF F6-1" +msgstr "JDF Fold F6-1" msgid "finishing-template.jdf-f6-2" -msgstr "JDF F6-2" +msgstr "JDF Fold F6-2" msgid "finishing-template.jdf-f6-3" -msgstr "JDF F6-3" +msgstr "JDF Fold F6-3" msgid "finishing-template.jdf-f6-4" -msgstr "JDF F6-4" +msgstr "JDF Fold F6-4" msgid "finishing-template.jdf-f6-5" -msgstr "JDF F6-5" +msgstr "JDF Fold F6-5" msgid "finishing-template.jdf-f6-6" -msgstr "JDF F6-6" +msgstr "JDF Fold F6-6" msgid "finishing-template.jdf-f6-7" -msgstr "JDF F6-7" +msgstr "JDF Fold F6-7" msgid "finishing-template.jdf-f6-8" -msgstr "JDF F6-8" +msgstr "JDF Fold F6-8" msgid "finishing-template.jdf-f64-1" -msgstr "JDF F64-1" +msgstr "JDF Fold F64-1" msgid "finishing-template.jdf-f64-2" -msgstr "JDF F64-2" +msgstr "JDF Fold F64-2" msgid "finishing-template.jdf-f8-1" -msgstr "JDF F8-1" +msgstr "JDF Fold F8-1" msgid "finishing-template.jdf-f8-2" -msgstr "JDF F8-2" +msgstr "JDF Fold F8-2" msgid "finishing-template.jdf-f8-3" -msgstr "JDF F8-3" +msgstr "JDF Fold F8-3" msgid "finishing-template.jdf-f8-4" -msgstr "JDF F8-4" +msgstr "JDF Fold F8-4" msgid "finishing-template.jdf-f8-5" -msgstr "JDF F8-5" +msgstr "JDF Fold F8-5" msgid "finishing-template.jdf-f8-6" -msgstr "JDF F8-6" +msgstr "JDF Fold F8-6" msgid "finishing-template.jdf-f8-7" -msgstr "JDF F8-7" +msgstr "JDF Fold F8-7" msgid "finishing-template.jog-offset" msgstr "Jog Offset" msgid "finishing-template.laminate" @@ -1465,41 +1465,41 @@ msgstr "Media Name" msgid "media-source" msgstr "Media Source" msgid "media-source.alternate" -msgstr "Alternate" +msgstr "Alternate Tray" msgid "media-source.alternate-roll" msgstr "Alternate Roll" msgid "media-source.auto" -msgstr "Automatic" +msgstr "Automatic Tray" msgid "media-source.bottom" -msgstr "Bottom" +msgstr "Bottom Tray" msgid "media-source.by-pass-tray" msgstr "By-pass Tray" msgid "media-source.center" -msgstr "Center" +msgstr "Center Tray" msgid "media-source.disc" -msgstr "Disc" +msgstr "Disc Feed" msgid "media-source.envelope" -msgstr "Envelope" +msgstr "Envelope Feed" msgid "media-source.hagaki" -msgstr "Hagaki" +msgstr "Hagaki Feed" msgid "media-source.large-capacity" -msgstr "Large Capacity" +msgstr "Large Capacity Tray" msgid "media-source.left" -msgstr "Left" +msgstr "Left Tray" msgid "media-source.main" -msgstr "Main" +msgstr "Main Tray" msgid "media-source.main-roll" msgstr "Main Roll" msgid "media-source.manual" -msgstr "Manual" +msgstr "Manual Feed" msgid "media-source.middle" -msgstr "Middle" +msgstr "Middle Tray" msgid "media-source.photo" -msgstr "Photo" +msgstr "Photo Tray" msgid "media-source.rear" -msgstr "Rear" +msgstr "Rear Tray" msgid "media-source.right" -msgstr "Right" +msgstr "Right Tray" msgid "media-source.roll-1" msgstr "Roll 1" msgid "media-source.roll-10" @@ -1571,7 +1571,7 @@ msgstr "Media Tooth (Texture)" msgid "media-tooth.antique" msgstr "Antique" msgid "media-tooth.calendared" -msgstr "Calendared" +msgstr "Extra Smooth" msgid "media-tooth.coarse" msgstr "Coarse" msgid "media-tooth.fine" @@ -1585,7 +1585,7 @@ msgstr "Smooth" msgid "media-tooth.stipple" msgstr "Stipple" msgid "media-tooth.uncalendared" -msgstr "Uncalendared" +msgstr "Rough" msgid "media-tooth.vellum" msgstr "Vellum" msgid "media-top-margin" @@ -1604,6 +1604,32 @@ msgid "media-type.cardstock" msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" msgid "media-type.continuous" msgstr "Continuous" msgid "media-type.continuous-long" @@ -1700,6 +1726,14 @@ msgid "media-type.image-setter-paper" msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" msgid "media-type.labels" msgstr "Labels" msgid "media-type.labels-colored" diff --git a/locale/cups.pot b/locale/cups.pot index af80109..f14d536 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -26,9 +26,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: CUPS 2.2.6\n" +"Project-Id-Version: CUPS 2.2.7\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1555,172 +1555,172 @@ msgstr "" msgid " PASS" msgstr "" -#: cups/ipp.c:5223 +#: cups/ipp.c:5227 #, c-format msgid "\"%s\": Bad URI value \"%s\" - %s (RFC 8011 section 5.1.6)." msgstr "" -#: cups/ipp.c:5234 +#: cups/ipp.c:5238 #, c-format msgid "\"%s\": Bad URI value \"%s\" - bad length %d (RFC 8011 section 5.1.6)." msgstr "" -#: cups/ipp.c:4854 +#: cups/ipp.c:4858 #, c-format msgid "\"%s\": Bad attribute name - bad length %d (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:4846 +#: cups/ipp.c:4850 #, c-format msgid "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:4872 +#: cups/ipp.c:4876 #, c-format msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)." msgstr "" -#: cups/ipp.c:5286 +#: cups/ipp.c:5290 #, c-format msgid "\"%s\": Bad charset value \"%s\" - bad characters (RFC 8011 section 5.1.8)." msgstr "" -#: cups/ipp.c:5295 +#: cups/ipp.c:5299 #, c-format msgid "\"%s\": Bad charset value \"%s\" - bad length %d (RFC 8011 section 5.1.8)." msgstr "" -#: cups/ipp.c:4972 +#: cups/ipp.c:4976 #, c-format msgid "\"%s\": Bad dateTime UTC hours %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4980 +#: cups/ipp.c:4984 #, c-format msgid "\"%s\": Bad dateTime UTC minutes %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4964 +#: cups/ipp.c:4968 #, c-format msgid "\"%s\": Bad dateTime UTC sign '%c' (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4924 +#: cups/ipp.c:4928 #, c-format msgid "\"%s\": Bad dateTime day %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4956 +#: cups/ipp.c:4960 #, c-format msgid "\"%s\": Bad dateTime deciseconds %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4932 +#: cups/ipp.c:4936 #, c-format msgid "\"%s\": Bad dateTime hours %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4940 +#: cups/ipp.c:4944 #, c-format msgid "\"%s\": Bad dateTime minutes %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4916 +#: cups/ipp.c:4920 #, c-format msgid "\"%s\": Bad dateTime month %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4948 +#: cups/ipp.c:4952 #, c-format msgid "\"%s\": Bad dateTime seconds %u (RFC 8011 section 5.1.15)." msgstr "" -#: cups/ipp.c:4886 +#: cups/ipp.c:4890 #, c-format msgid "\"%s\": Bad enum value %d - out of range (RFC 8011 section 5.1.5)." msgstr "" -#: cups/ipp.c:5201 +#: cups/ipp.c:5205 #, c-format msgid "\"%s\": Bad keyword value \"%s\" - bad length %d (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:5192 +#: cups/ipp.c:5196 #, c-format msgid "\"%s\": Bad keyword value \"%s\" - invalid character (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:5395 +#: cups/ipp.c:5399 #, c-format msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad characters (RFC 8011 section 5.1.10)." msgstr "" -#: cups/ipp.c:5405 +#: cups/ipp.c:5409 #, c-format msgid "\"%s\": Bad mimeMediaType value \"%s\" - bad length %d (RFC 8011 section 5.1.10)." msgstr "" -#: cups/ipp.c:5163 +#: cups/ipp.c:5167 #, c-format msgid "\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)." msgstr "" -#: cups/ipp.c:5172 +#: cups/ipp.c:5176 #, c-format msgid "\"%s\": Bad name value \"%s\" - bad length %d (RFC 8011 section 5.1.3)." msgstr "" -#: cups/ipp.c:5341 +#: cups/ipp.c:5345 #, c-format msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad characters (RFC 8011 section 5.1.9)." msgstr "" -#: cups/ipp.c:5351 +#: cups/ipp.c:5355 #, c-format msgid "\"%s\": Bad naturalLanguage value \"%s\" - bad length %d (RFC 8011 section 5.1.9)." msgstr "" -#: cups/ipp.c:4900 +#: cups/ipp.c:4904 #, c-format msgid "\"%s\": Bad octetString value - bad length %d (RFC 8011 section 5.1.20)." msgstr "" -#: cups/ipp.c:5043 +#: cups/ipp.c:5047 #, c-format msgid "\"%s\": Bad rangeOfInteger value %d-%d - lower greater than upper (RFC 8011 section 5.1.14)." msgstr "" -#: cups/ipp.c:5024 +#: cups/ipp.c:5028 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - bad units value (RFC 8011 section 5.1.16)." msgstr "" -#: cups/ipp.c:4993 +#: cups/ipp.c:4997 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - cross feed resolution must be positive (RFC 8011 section 5.1.16)." msgstr "" -#: cups/ipp.c:5008 +#: cups/ipp.c:5012 #, c-format msgid "\"%s\": Bad resolution value %dx%d%s - feed resolution must be positive (RFC 8011 section 5.1.16)." msgstr "" -#: cups/ipp.c:5105 +#: cups/ipp.c:5109 #, c-format msgid "\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)." msgstr "" -#: cups/ipp.c:5114 +#: cups/ipp.c:5118 #, c-format msgid "\"%s\": Bad text value \"%s\" - bad length %d (RFC 8011 section 5.1.2)." msgstr "" -#: cups/ipp.c:5257 +#: cups/ipp.c:5261 #, c-format msgid "\"%s\": Bad uriScheme value \"%s\" - bad characters (RFC 8011 section 5.1.7)." msgstr "" -#: cups/ipp.c:5266 +#: cups/ipp.c:5270 #, c-format msgid "\"%s\": Bad uriScheme value \"%s\" - bad length %d (RFC 8011 section 5.1.7)." msgstr "" @@ -1770,7 +1770,7 @@ msgstr "" msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:10332 +#: scheduler/ipp.c:10336 #, c-format msgid "%s cannot be changed." msgstr "" @@ -1827,10 +1827,10 @@ msgid "%s: %-33.33s [job %d localhost]" msgstr "" #. TRANSLATORS: Message is "subject: error" -#: cups/langprintf.c:75 scheduler/cupsfilter.c:724 systemv/lpadmin.c:772 -#: systemv/lpadmin.c:823 systemv/lpadmin.c:873 systemv/lpadmin.c:929 -#: systemv/lpadmin.c:1027 systemv/lpadmin.c:1079 systemv/lpadmin.c:1135 -#: systemv/lpadmin.c:1550 +#: cups/langprintf.c:75 scheduler/cupsfilter.c:724 systemv/lpadmin.c:799 +#: systemv/lpadmin.c:850 systemv/lpadmin.c:900 systemv/lpadmin.c:956 +#: systemv/lpadmin.c:1054 systemv/lpadmin.c:1106 systemv/lpadmin.c:1162 +#: systemv/lpadmin.c:1600 #, c-format msgid "%s: %s" msgstr "" @@ -1840,7 +1840,7 @@ msgstr "" msgid "%s: %s failed: %s" msgstr "" -#: systemv/lpadmin.c:1185 +#: systemv/lpadmin.c:1223 #, c-format msgid "%s: Bad printer URI \"%s\"." msgstr "" @@ -1855,13 +1855,18 @@ msgstr "" msgid "%s: Don't know what to do." msgstr "" -#: berkeley/lpq.c:234 berkeley/lpr.c:365 systemv/lp.c:606 +#: berkeley/lpr.c:348 systemv/lp.c:590 +#, c-format +msgid "%s: Error - %s" +msgstr "" + +#: berkeley/lpq.c:234 #, c-format msgid "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" -#: berkeley/lpq.c:139 berkeley/lpq.c:212 berkeley/lpr.c:229 berkeley/lpr.c:340 -#: systemv/lp.c:161 systemv/lp.c:581 systemv/lp.c:701 systemv/lp.c:750 +#: berkeley/lpq.c:139 berkeley/lpq.c:212 berkeley/lpr.c:228 berkeley/lpr.c:339 +#: systemv/lp.c:161 systemv/lp.c:581 systemv/lp.c:678 systemv/lp.c:727 #: systemv/lpstat.c:190 systemv/lpstat.c:235 systemv/lpstat.c:368 #: systemv/lpstat.c:395 systemv/lpstat.c:417 systemv/lpstat.c:477 #: systemv/lpstat.c:543 systemv/lpstat.c:604 systemv/lpstat.c:729 @@ -1886,7 +1891,7 @@ msgstr "" msgid "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "" -#: berkeley/lpr.c:254 systemv/lp.c:280 +#: berkeley/lpr.c:253 systemv/lp.c:280 #, c-format msgid "%s: Error - copies must be 1 or more." msgstr "" @@ -1901,7 +1906,7 @@ msgstr "" msgid "%s: Error - expected content type after \"-T\" option." msgstr "" -#: berkeley/lpr.c:245 +#: berkeley/lpr.c:244 #, c-format msgid "%s: Error - expected copies after \"-#\" option." msgstr "" @@ -1911,7 +1916,7 @@ msgstr "" msgid "%s: Error - expected copies after \"-n\" option." msgstr "" -#: berkeley/lpr.c:207 +#: berkeley/lpr.c:206 #, c-format msgid "%s: Error - expected destination after \"-P\" option." msgstr "" @@ -1931,7 +1936,7 @@ msgstr "" msgid "%s: Error - expected hold name after \"-H\" option." msgstr "" -#: berkeley/lpr.c:104 +#: berkeley/lpr.c:103 #, c-format msgid "%s: Error - expected hostname after \"-H\" option." msgstr "" @@ -1947,12 +1952,12 @@ msgstr "" msgid "%s: Error - expected mode list after \"-y\" option." msgstr "" -#: berkeley/lpr.c:275 +#: berkeley/lpr.c:274 #, c-format msgid "%s: Error - expected name after \"-%c\" option." msgstr "" -#: berkeley/lpr.c:156 systemv/lp.c:301 +#: berkeley/lpr.c:155 systemv/lp.c:301 #, c-format msgid "%s: Error - expected option=value after \"-o\" option." msgstr "" @@ -1977,9 +1982,9 @@ msgstr "" msgid "%s: Error - expected title after \"-t\" option." msgstr "" -#: berkeley/lpq.c:102 berkeley/lpr.c:84 berkeley/lprm.c:104 +#: berkeley/lpq.c:102 berkeley/lpr.c:83 berkeley/lprm.c:104 #: systemv/cancel.c:94 systemv/cupsaccept.c:104 systemv/lp.c:114 -#: systemv/lpadmin.c:423 systemv/lpstat.c:129 +#: systemv/lpadmin.c:441 systemv/lpstat.c:129 #, c-format msgid "%s: Error - expected username after \"-U\" option." msgstr "" @@ -1989,7 +1994,7 @@ msgstr "" msgid "%s: Error - expected username after \"-u\" option." msgstr "" -#: berkeley/lpr.c:129 +#: berkeley/lpr.c:128 #, c-format msgid "%s: Error - expected value after \"-%c\" option." msgstr "" @@ -1999,7 +2004,7 @@ msgstr "" msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option." msgstr "" -#: berkeley/lpq.c:239 berkeley/lpr.c:370 systemv/lp.c:611 +#: berkeley/lpq.c:239 #, c-format msgid "%s: Error - no default destination available." msgstr "" @@ -2009,22 +2014,22 @@ msgstr "" msgid "%s: Error - priority must be between 1 and 100." msgstr "" -#: berkeley/lpr.c:373 systemv/lp.c:614 +#: berkeley/lpr.c:350 systemv/lp.c:592 #, c-format msgid "%s: Error - scheduler not responding." msgstr "" -#: berkeley/lpr.c:316 systemv/lp.c:550 +#: berkeley/lpr.c:315 systemv/lp.c:550 #, c-format msgid "%s: Error - too many files - \"%s\"." msgstr "" -#: berkeley/lpr.c:298 systemv/lp.c:533 +#: berkeley/lpr.c:297 systemv/lp.c:533 #, c-format msgid "%s: Error - unable to access \"%s\" - %s" msgstr "" -#: berkeley/lpr.c:416 systemv/lp.c:645 +#: berkeley/lpr.c:392 systemv/lp.c:622 #, c-format msgid "%s: Error - unable to queue from stdin - %s." msgstr "" @@ -2039,7 +2044,7 @@ msgstr "" msgid "%s: Error - unknown destination \"%s/%s\"." msgstr "" -#: berkeley/lpr.c:284 berkeley/lprm.c:139 systemv/cancel.c:162 +#: berkeley/lpr.c:283 berkeley/lprm.c:139 systemv/cancel.c:162 #: systemv/cupsaccept.c:155 systemv/lp.c:508 systemv/lpstat.c:487 #, c-format msgid "%s: Error - unknown option \"%c\"." @@ -2095,15 +2100,15 @@ msgstr "" msgid "%s: Operation failed: %s" msgstr "" -#: berkeley/lpq.c:87 berkeley/lpr.c:69 berkeley/lprm.c:65 systemv/cancel.c:79 +#: berkeley/lpq.c:87 berkeley/lpr.c:68 berkeley/lprm.c:65 systemv/cancel.c:79 #: systemv/cupsaccept.c:89 systemv/cupsaddsmb.c:78 systemv/lp.c:99 -#: systemv/lpadmin.c:232 systemv/lpinfo.c:192 systemv/lpmove.c:70 +#: systemv/lpadmin.c:250 systemv/lpinfo.c:192 systemv/lpmove.c:70 #: systemv/lpstat.c:91 test/ipptool.c:285 test/ipptool.c:329 #, c-format msgid "%s: Sorry, no encryption support." msgstr "" -#: systemv/lpadmin.c:1192 +#: systemv/lpadmin.c:1230 #, c-format msgid "%s: Unable to connect to \"%s:%d\": %s" msgstr "" @@ -2119,7 +2124,7 @@ msgstr "" msgid "%s: Unable to contact server." msgstr "" -#: systemv/lpadmin.c:1205 +#: systemv/lpadmin.c:1255 #, c-format msgid "%s: Unable to create PPD file: %s" msgstr "" @@ -2149,7 +2154,7 @@ msgstr "" msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "" -#: systemv/lpadmin.c:1176 +#: systemv/lpadmin.c:1214 #, c-format msgid "%s: Unable to resolve \"%s\"." msgstr "" @@ -2189,7 +2194,7 @@ msgstr "" msgid "%s: Unknown source MIME type %s/%s." msgstr "" -#: berkeley/lpr.c:142 +#: berkeley/lpr.c:141 #, c-format msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct." msgstr "" @@ -2550,7 +2555,7 @@ msgstr "" msgid "2-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3682 ppdc/sample.c:262 +#: cups/ppd-cache.c:3711 ppdc/sample.c:262 msgid "2-Sided Printing" msgstr "" @@ -3212,7 +3217,7 @@ msgstr "" msgid "Accept Jobs" msgstr "" -#: cups/http-support.c:1355 +#: cups/http-support.c:1352 msgid "Accepted" msgstr "" @@ -3241,19 +3246,19 @@ msgstr "" msgid "Administration" msgstr "" -#: cups/ppd-cache.c:3443 +#: cups/ppd-cache.c:3472 msgid "Advanced Photo Paper" msgstr "" -#: cups/ppd-cache.c:3357 +#: cups/ppd-cache.c:3386 msgid "Alternate" msgstr "" -#: cups/ppd-cache.c:3365 +#: cups/ppd-cache.c:3394 msgid "Alternate Roll" msgstr "" -#: cups/ppd-cache.c:3437 +#: cups/ppd-cache.c:3466 msgid "Aluminum" msgstr "" @@ -3269,19 +3274,19 @@ msgstr "" msgid "Applicator" msgstr "" -#: cups/ppd-cache.c:3471 +#: cups/ppd-cache.c:3500 msgid "Archival Envelope" msgstr "" -#: cups/ppd-cache.c:3483 +#: cups/ppd-cache.c:3512 msgid "Archival Fabric" msgstr "" -#: cups/ppd-cache.c:3560 +#: cups/ppd-cache.c:3589 msgid "Archival Paper" msgstr "" -#: cups/ppd-cache.c:3532 +#: cups/ppd-cache.c:3561 msgid "Archival Photo Paper" msgstr "" @@ -3290,12 +3295,12 @@ msgstr "" msgid "Attempt to set %s printer-state to bad value %d." msgstr "" -#: scheduler/ipp.c:5460 scheduler/ipp.c:5486 +#: scheduler/ipp.c:5464 scheduler/ipp.c:5490 #, c-format msgid "Attribute \"%s\" is in the wrong group." msgstr "" -#: scheduler/ipp.c:5462 scheduler/ipp.c:5488 +#: scheduler/ipp.c:5466 scheduler/ipp.c:5492 #, c-format msgid "Attribute \"%s\" is the wrong value type." msgstr "" @@ -3305,7 +3310,7 @@ msgstr "" msgid "Attribute groups are out of order (%x < %x)." msgstr "" -#: cups/ppd-cache.c:3355 cups/ppd-cache.c:3438 cups/ppd-cache.c:3742 +#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3467 cups/ppd-cache.c:3771 msgid "Automatic" msgstr "" @@ -3357,11 +3362,11 @@ msgstr "" msgid "B9" msgstr "" -#: cups/ppd-cache.c:3439 +#: cups/ppd-cache.c:3468 msgid "Back Print Film" msgstr "" -#: scheduler/ipp.c:11279 +#: scheduler/ipp.c:11283 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "" @@ -3411,7 +3416,7 @@ msgstr "" msgid "Bad UIConstraints" msgstr "" -#: cups/hash.c:51 cups/http-support.c:1464 +#: cups/hash.c:53 cups/http-support.c:1464 msgid "Bad arguments to function" msgstr "" @@ -3434,12 +3439,12 @@ msgstr "" msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:8487 scheduler/ipp.c:8505 scheduler/ipp.c:9733 +#: scheduler/ipp.c:8491 scheduler/ipp.c:8509 scheduler/ipp.c:9737 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9751 +#: scheduler/ipp.c:9755 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" @@ -3461,7 +3466,7 @@ msgstr "" msgid "Bad job-name value: Wrong type or count." msgstr "" -#: scheduler/ipp.c:10347 +#: scheduler/ipp.c:10351 msgid "Bad job-priority value." msgstr "" @@ -3474,24 +3479,24 @@ msgstr "" msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:10377 +#: scheduler/ipp.c:10381 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:3043 scheduler/ipp.c:3505 scheduler/ipp.c:6272 -#: scheduler/ipp.c:6419 scheduler/ipp.c:7916 scheduler/ipp.c:8185 -#: scheduler/ipp.c:9051 scheduler/ipp.c:9275 scheduler/ipp.c:9627 -#: scheduler/ipp.c:10240 +#: scheduler/ipp.c:3043 scheduler/ipp.c:3505 scheduler/ipp.c:6276 +#: scheduler/ipp.c:6423 scheduler/ipp.c:7920 scheduler/ipp.c:8189 +#: scheduler/ipp.c:9055 scheduler/ipp.c:9279 scheduler/ipp.c:9631 +#: scheduler/ipp.c:10244 #, c-format msgid "Bad job-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2093 scheduler/ipp.c:5811 +#: scheduler/ipp.c:2093 scheduler/ipp.c:5815 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2057 scheduler/ipp.c:5775 +#: scheduler/ipp.c:2057 scheduler/ipp.c:5779 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" @@ -3596,7 +3601,7 @@ msgstr "" msgid "Bind (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3472 +#: cups/ppd-cache.c:3501 msgid "Bond Envelope" msgstr "" @@ -3604,7 +3609,7 @@ msgstr "" msgid "Bond Paper" msgstr "" -#: cups/ppd-cache.c:3967 +#: cups/ppd-cache.c:3996 msgid "Booklet" msgstr "" @@ -3617,11 +3622,11 @@ msgstr "" msgid "Boolean expected for waiteof option \"%s\"." msgstr "" -#: cups/ppd-cache.c:3368 +#: cups/ppd-cache.c:3397 msgid "Bottom" msgstr "" -#: cups/ppd-cache.c:3743 +#: cups/ppd-cache.c:3772 msgid "Bottom Tray" msgstr "" @@ -3629,7 +3634,7 @@ msgstr "" msgid "Buffer overflow detected, aborting." msgstr "" -#: cups/ppd-cache.c:3442 +#: cups/ppd-cache.c:3471 msgid "CD" msgstr "" @@ -3649,7 +3654,7 @@ msgstr "" msgid "Cancel RSS Subscription" msgstr "" -#: backend/ipp.c:2261 +#: backend/ipp.c:2264 msgid "Canceling print job." msgstr "" @@ -3661,11 +3666,11 @@ msgstr "" msgid "Cannot share a remote Kerberized printer." msgstr "" -#: cups/ppd-cache.c:3440 +#: cups/ppd-cache.c:3469 msgid "Cardboard" msgstr "" -#: cups/ppd-cache.c:3441 +#: cups/ppd-cache.c:3470 msgid "Cardstock" msgstr "" @@ -3673,11 +3678,11 @@ msgstr "" msgid "Cassette" msgstr "" -#: cups/ppd-cache.c:3372 +#: cups/ppd-cache.c:3401 msgid "Center" msgstr "" -#: cups/ppd-cache.c:3744 +#: cups/ppd-cache.c:3773 msgid "Center Tray" msgstr "" @@ -3686,7 +3691,7 @@ msgstr "" msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2105 scheduler/ipp.c:5823 +#: scheduler/ipp.c:2105 scheduler/ipp.c:5827 #, c-format msgid "Character set \"%s\" not supported." msgstr "" @@ -3707,24 +3712,24 @@ msgstr "" msgid "Coat" msgstr "" -#: cups/ppd-cache.c:3473 +#: cups/ppd-cache.c:3502 msgid "Coated Envelope" msgstr "" -#: cups/ppd-cache.c:3561 +#: cups/ppd-cache.c:3590 msgid "Coated Paper" msgstr "" -#: cups/ppd-cache.c:3646 ppdc/sample.c:276 +#: cups/ppd-cache.c:3675 ppdc/sample.c:276 msgid "Color" msgstr "" -#: cups/ppd-cache.c:3622 cups/ppd-cache.c:3633 cups/ppd-cache.c:3644 -#: cups/ppd-cache.c:3654 ppdc/sample.c:274 +#: cups/ppd-cache.c:3651 cups/ppd-cache.c:3662 cups/ppd-cache.c:3673 +#: cups/ppd-cache.c:3683 ppdc/sample.c:274 msgid "Color Mode" msgstr "" -#: cups/ppd-cache.c:3508 +#: cups/ppd-cache.c:3537 msgid "Colored Labels" msgstr "" @@ -3739,27 +3744,27 @@ msgstr "" msgid "Community name uses indefinite length" msgstr "" -#: backend/ipp.c:872 backend/lpd.c:939 backend/socket.c:380 +#: backend/ipp.c:874 backend/lpd.c:939 backend/socket.c:380 msgid "Connected to printer." msgstr "" -#: backend/ipp.c:708 backend/lpd.c:763 backend/socket.c:300 +#: backend/ipp.c:710 backend/lpd.c:763 backend/socket.c:300 msgid "Connecting to printer." msgstr "" -#: cups/http-support.c:1343 +#: cups/http-support.c:1340 msgid "Continue" msgstr "" -#: cups/ppd-cache.c:3456 ppdc/sample.c:360 +#: cups/ppd-cache.c:3485 ppdc/sample.c:360 msgid "Continuous" msgstr "" -#: cups/ppd-cache.c:3457 +#: cups/ppd-cache.c:3486 msgid "Continuous Long" msgstr "" -#: cups/ppd-cache.c:3458 +#: cups/ppd-cache.c:3487 msgid "Continuous Short" msgstr "" @@ -3767,15 +3772,15 @@ msgstr "" msgid "Control file sent successfully." msgstr "" -#: backend/ipp.c:1396 backend/lpd.c:455 +#: backend/ipp.c:1398 backend/lpd.c:455 msgid "Copying print data." msgstr "" -#: cups/ppd-cache.c:3474 +#: cups/ppd-cache.c:3503 msgid "Cotton Envelope" msgstr "" -#: cups/ppd-cache.c:3562 +#: cups/ppd-cache.c:3591 msgid "Cotton Paper" msgstr "" @@ -3783,15 +3788,15 @@ msgstr "" msgid "Cover" msgstr "" -#: cups/http-support.c:1352 +#: cups/http-support.c:1349 msgid "Created" msgstr "" -#: cups/tls-darwin.c:728 cups/tls-gnutls.c:560 +#: cups/tls-darwin.c:730 cups/tls-gnutls.c:562 msgid "Credentials do not validate against site CA certificate." msgstr "" -#: cups/tls-darwin.c:739 cups/tls-gnutls.c:577 +#: cups/tls-darwin.c:741 cups/tls-gnutls.c:579 msgid "Credentials have expired." msgstr "" @@ -3819,7 +3824,7 @@ msgstr "" msgid "Cutter" msgstr "" -#: cups/ppd-cache.c:3467 +#: cups/ppd-cache.c:3496 msgid "DVD" msgstr "" @@ -3835,7 +3840,7 @@ msgstr "" msgid "Data file sent successfully." msgstr "" -#: cups/ppd-cache.c:3656 +#: cups/ppd-cache.c:3685 msgid "Deep Color" msgstr "" @@ -3900,11 +3905,11 @@ msgstr "" msgid "Disabled" msgstr "" -#: cups/ppd-cache.c:3361 +#: cups/ppd-cache.c:3390 msgid "Disc" msgstr "" -#: scheduler/ipp.c:6321 +#: scheduler/ipp.c:6325 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -3929,16 +3934,16 @@ msgstr "" msgid "Double Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3465 +#: cups/ppd-cache.c:3494 msgid "Double Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:4025 cups/ppd-cache.c:4027 cups/ppd-cache.c:4085 -#: cups/ppd-cache.c:4117 +#: cups/ppd-cache.c:4054 cups/ppd-cache.c:4056 cups/ppd-cache.c:4114 +#: cups/ppd-cache.c:4146 msgid "Draft" msgstr "" -#: cups/ppd-cache.c:3466 +#: cups/ppd-cache.c:3495 msgid "Dry Film" msgstr "" @@ -3964,7 +3969,7 @@ msgstr "" msgid "Edit Configuration File" msgstr "" -#: cups/ppd-cache.c:3468 +#: cups/ppd-cache.c:3497 msgid "Embossing Foil" msgstr "" @@ -3972,11 +3977,11 @@ msgstr "" msgid "Empty PPD file." msgstr "" -#: cups/http.c:4620 +#: cups/http.c:4635 msgid "Encryption is not supported." msgstr "" -#: cups/ppd-cache.c:3469 +#: cups/ppd-cache.c:3498 msgid "End Board" msgstr "" @@ -3997,7 +4002,7 @@ msgstr "" msgid "Enter your username and password or the root username and password to access this page. If you are using Kerberos authentication, make sure you have a valid Kerberos ticket." msgstr "" -#: cups/ppd-cache.c:3360 cups/ppd-cache.c:3470 +#: cups/ppd-cache.c:3389 cups/ppd-cache.c:3499 msgid "Envelope" msgstr "" @@ -4286,11 +4291,11 @@ msgstr "" msgid "Every Label" msgstr "" -#: cups/ppd-cache.c:3448 +#: cups/ppd-cache.c:3477 msgid "Everyday Glossy Photo Paper" msgstr "" -#: cups/ppd-cache.c:3449 +#: cups/ppd-cache.c:3478 msgid "Everyday Matte Paper" msgstr "" @@ -4310,7 +4315,7 @@ msgstr "" msgid "Expressions:" msgstr "" -#: cups/ppd-cache.c:3450 +#: cups/ppd-cache.c:3479 msgid "Extra Heavyweight Paper" msgstr "" @@ -4324,19 +4329,19 @@ msgstr "" msgid "FAIL" msgstr "" -#: cups/ppd-cache.c:3482 +#: cups/ppd-cache.c:3511 msgid "Fabric" msgstr "" -#: cups/ppd-cache.c:3745 +#: cups/ppd-cache.c:3774 msgid "Face Down" msgstr "" -#: cups/ppd-cache.c:3746 +#: cups/ppd-cache.c:3775 msgid "Face Up" msgstr "" -#: cups/ppd-cache.c:3624 +#: cups/ppd-cache.c:3653 msgid "Fast Grayscale" msgstr "" @@ -4374,11 +4379,11 @@ msgstr "" msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"." msgstr "" -#: cups/ppd-cache.c:3489 +#: cups/ppd-cache.c:3518 msgid "Film" msgstr "" -#: cups/ppd-cache.c:3475 +#: cups/ppd-cache.c:3504 msgid "Fine Envelope" msgstr "" @@ -4388,23 +4393,23 @@ msgstr "" msgid "Finished page %d." msgstr "" -#: cups/ppd-cache.c:3490 +#: cups/ppd-cache.c:3519 msgid "Flexo Base" msgstr "" -#: cups/ppd-cache.c:3491 +#: cups/ppd-cache.c:3520 msgid "Flexo Photo Polymer" msgstr "" -#: cups/ppd-cache.c:3492 +#: cups/ppd-cache.c:3521 msgid "Flute" msgstr "" -#: cups/ppd-cache.c:3493 +#: cups/ppd-cache.c:3522 msgid "Foil" msgstr "" -#: cups/ppd-cache.c:2992 cups/ppd-cache.c:3882 +#: cups/ppd-cache.c:2992 cups/ppd-cache.c:3911 msgid "Fold" msgstr "" @@ -4416,7 +4421,11 @@ msgstr "" msgid "Forbidden" msgstr "" -#: cups/ppd-cache.c:3494 +#: cups/http-support.c:1361 +msgid "Found" +msgstr "" + +#: cups/ppd-cache.c:3523 msgid "Full Cut Tabs" msgstr "" @@ -4436,39 +4445,39 @@ msgstr "" msgid "Get-Response-PDU uses indefinite length" msgstr "" -#: cups/ppd-cache.c:3495 +#: cups/ppd-cache.c:3524 msgid "Glass" msgstr "" -#: cups/ppd-cache.c:3496 +#: cups/ppd-cache.c:3525 msgid "Glass Colored" msgstr "" -#: cups/ppd-cache.c:3497 +#: cups/ppd-cache.c:3526 msgid "Glass Opaque" msgstr "" -#: cups/ppd-cache.c:3498 +#: cups/ppd-cache.c:3527 msgid "Glass Surfaced" msgstr "" -#: cups/ppd-cache.c:3499 +#: cups/ppd-cache.c:3528 msgid "Glass Textured" msgstr "" -#: cups/ppd-cache.c:3444 +#: cups/ppd-cache.c:3473 msgid "Glossy Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3484 +#: cups/ppd-cache.c:3513 msgid "Glossy Fabric" msgstr "" -#: cups/ppd-cache.c:3509 +#: cups/ppd-cache.c:3538 msgid "Glossy Labels" msgstr "" -#: cups/ppd-cache.c:3460 +#: cups/ppd-cache.c:3489 msgid "Glossy Optical Disc" msgstr "" @@ -4476,22 +4485,22 @@ msgstr "" msgid "Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3534 +#: cups/ppd-cache.c:3563 msgid "Glossy Photo Paper" msgstr "" #: scheduler/ipp.c:3021 scheduler/ipp.c:3431 scheduler/ipp.c:3969 -#: scheduler/ipp.c:6250 scheduler/ipp.c:6397 scheduler/ipp.c:7893 -#: scheduler/ipp.c:9029 scheduler/ipp.c:9253 scheduler/ipp.c:9605 -#: scheduler/ipp.c:10218 +#: scheduler/ipp.c:6254 scheduler/ipp.c:6401 scheduler/ipp.c:7897 +#: scheduler/ipp.c:9033 scheduler/ipp.c:9257 scheduler/ipp.c:9609 +#: scheduler/ipp.c:10222 msgid "Got a printer-uri attribute but no job-id." msgstr "" -#: cups/ppd-cache.c:3500 +#: cups/ppd-cache.c:3529 msgid "Gravure Cylinder" msgstr "" -#: cups/ppd-cache.c:3635 ppdc/sample.c:275 +#: cups/ppd-cache.c:3664 ppdc/sample.c:275 msgid "Grayscale" msgstr "" @@ -4499,7 +4508,7 @@ msgstr "" msgid "HP" msgstr "" -#: cups/ppd-cache.c:3363 +#: cups/ppd-cache.c:3392 msgid "Hagaki" msgstr "" @@ -4515,19 +4524,19 @@ msgstr "" msgid "Hanging Folder" msgstr "" -#: cups/hash.c:243 +#: cups/hash.c:274 msgid "Hash buffer too small." msgstr "" -#: cups/ppd-cache.c:3565 +#: cups/ppd-cache.c:3594 msgid "Heavyweight Coated Paper" msgstr "" -#: cups/ppd-cache.c:3476 +#: cups/ppd-cache.c:3505 msgid "Heavyweight Envelope" msgstr "" -#: cups/ppd-cache.c:3564 +#: cups/ppd-cache.c:3593 msgid "Heavyweight Paper" msgstr "" @@ -4535,23 +4544,23 @@ msgstr "" msgid "Help file not in index." msgstr "" -#: cups/ppd-cache.c:4030 cups/ppd-cache.c:4092 cups/ppd-cache.c:4120 +#: cups/ppd-cache.c:4059 cups/ppd-cache.c:4121 cups/ppd-cache.c:4149 msgid "High" msgstr "" -#: cups/ppd-cache.c:3485 +#: cups/ppd-cache.c:3514 msgid "High Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3510 +#: cups/ppd-cache.c:3539 msgid "High Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3461 +#: cups/ppd-cache.c:3490 msgid "High Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3535 +#: cups/ppd-cache.c:3564 msgid "High Gloss Photo Paper" msgstr "" @@ -4563,7 +4572,7 @@ msgstr "" msgid "IPP attribute has no name." msgstr "" -#: cups/ipp.c:7013 +#: cups/ipp.c:7017 msgid "IPP attribute is not a member of the message." msgstr "" @@ -4671,23 +4680,23 @@ msgstr "" msgid "Illegal whitespace character" msgstr "" -#: cups/ppd-cache.c:3501 +#: cups/ppd-cache.c:3530 msgid "Image Setter Paper" msgstr "" -#: cups/ppd-cache.c:3502 +#: cups/ppd-cache.c:3531 msgid "Imaging Cylinder" msgstr "" -#: cups/ppd-cache.c:3477 +#: cups/ppd-cache.c:3506 msgid "Inkjet Envelope" msgstr "" -#: cups/ppd-cache.c:3511 +#: cups/ppd-cache.c:3540 msgid "Inkjet Labels" msgstr "" -#: cups/ppd-cache.c:3566 +#: cups/ppd-cache.c:3595 msgid "Inkjet Paper" msgstr "" @@ -4723,7 +4732,7 @@ msgstr "" msgid "Internet Postage 3-Part" msgstr "" -#: backend/ipp.c:325 +#: backend/ipp.c:328 msgid "Internet Printing Protocol" msgstr "" @@ -4735,7 +4744,7 @@ msgstr "" msgid "Invalid media size." msgstr "" -#: scheduler/ipp.c:2748 scheduler/ipp.c:7064 +#: scheduler/ipp.c:2748 scheduler/ipp.c:7068 msgid "Invalid ppd-name value." msgstr "" @@ -4804,17 +4813,17 @@ msgstr "" msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:9325 +#: scheduler/ipp.c:9329 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" #: scheduler/ipp.c:3061 scheduler/ipp.c:3295 scheduler/ipp.c:3354 -#: scheduler/ipp.c:3533 scheduler/ipp.c:3979 scheduler/ipp.c:5909 -#: scheduler/ipp.c:6290 scheduler/ipp.c:6437 scheduler/ipp.c:6774 -#: scheduler/ipp.c:7734 scheduler/ipp.c:7756 scheduler/ipp.c:7934 -#: scheduler/ipp.c:8159 scheduler/ipp.c:8202 scheduler/ipp.c:9069 -#: scheduler/ipp.c:9293 scheduler/ipp.c:9645 scheduler/ipp.c:10258 +#: scheduler/ipp.c:3533 scheduler/ipp.c:3979 scheduler/ipp.c:5913 +#: scheduler/ipp.c:6294 scheduler/ipp.c:6441 scheduler/ipp.c:6778 +#: scheduler/ipp.c:7738 scheduler/ipp.c:7760 scheduler/ipp.c:7938 +#: scheduler/ipp.c:8163 scheduler/ipp.c:8206 scheduler/ipp.c:9073 +#: scheduler/ipp.c:9297 scheduler/ipp.c:9649 scheduler/ipp.c:10262 #, c-format msgid "Job #%d does not exist." msgstr "" @@ -4834,12 +4843,12 @@ msgstr "" msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:7960 scheduler/ipp.c:8244 scheduler/ipp.c:10273 +#: scheduler/ipp.c:7964 scheduler/ipp.c:8248 scheduler/ipp.c:10277 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:9307 +#: scheduler/ipp.c:9311 #, c-format msgid "Job #%d is not complete." msgstr "" @@ -4849,7 +4858,7 @@ msgstr "" msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:9083 +#: scheduler/ipp.c:9087 #, c-format msgid "Job #%d is not held." msgstr "" @@ -4870,7 +4879,7 @@ msgstr "" msgid "Job Stopped" msgstr "" -#: scheduler/ipp.c:10355 +#: scheduler/ipp.c:10359 msgid "Job is completed and cannot be changed." msgstr "" @@ -4878,11 +4887,11 @@ msgstr "" msgid "Job operation failed" msgstr "" -#: scheduler/ipp.c:10391 scheduler/ipp.c:10408 scheduler/ipp.c:10419 +#: scheduler/ipp.c:10395 scheduler/ipp.c:10412 scheduler/ipp.c:10423 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:9173 +#: scheduler/ipp.c:9177 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -4906,7 +4915,7 @@ msgstr "" msgid "Label Top" msgstr "" -#: cups/ppd-cache.c:3507 +#: cups/ppd-cache.c:3536 msgid "Labels" msgstr "" @@ -4914,11 +4923,11 @@ msgstr "" msgid "Laminate" msgstr "" -#: cups/ppd-cache.c:3517 +#: cups/ppd-cache.c:3546 msgid "Laminating Foil" msgstr "" -#: scheduler/ipp.c:2114 scheduler/ipp.c:5832 +#: scheduler/ipp.c:2114 scheduler/ipp.c:5836 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -4927,11 +4936,11 @@ msgstr "" msgid "Large Address" msgstr "" -#: cups/ppd-cache.c:3358 +#: cups/ppd-cache.c:3387 msgid "Large Capacity" msgstr "" -#: cups/ppd-cache.c:3747 +#: cups/ppd-cache.c:3776 msgid "Large Capacity Tray" msgstr "" @@ -4939,7 +4948,7 @@ msgstr "" msgid "LaserJet Series PCL 4/5" msgstr "" -#: cups/ppd-cache.c:3370 +#: cups/ppd-cache.c:3399 msgid "Left" msgstr "" @@ -4947,7 +4956,7 @@ msgstr "" msgid "Left Gate Fold" msgstr "" -#: cups/ppd-cache.c:3748 +#: cups/ppd-cache.c:3777 msgid "Left Tray" msgstr "" @@ -4963,7 +4972,7 @@ msgstr "" msgid "Letter Oversize Long Edge" msgstr "" -#: cups/ppd-cache.c:3518 cups/ppd-cache.c:3567 +#: cups/ppd-cache.c:3547 cups/ppd-cache.c:3596 msgid "Letterhead" msgstr "" @@ -4971,11 +4980,11 @@ msgstr "" msgid "Light" msgstr "" -#: cups/ppd-cache.c:3478 +#: cups/ppd-cache.c:3507 msgid "Lightweight Envelope" msgstr "" -#: cups/ppd-cache.c:3568 +#: cups/ppd-cache.c:3597 msgid "Lightweight Paper" msgstr "" @@ -4991,11 +5000,11 @@ msgstr "" msgid "Load paper." msgstr "" -#: scheduler/ipp.c:5541 +#: scheduler/ipp.c:5545 msgid "Local printer created." msgstr "" -#: cups/ppd-cache.c:3682 ppdc/sample.c:264 +#: cups/ppd-cache.c:3711 ppdc/sample.c:264 msgid "Long-Edge (Portrait)" msgstr "" @@ -5003,55 +5012,55 @@ msgstr "" msgid "Looking for printer." msgstr "" -#: cups/ppd-cache.c:3749 +#: cups/ppd-cache.c:3778 msgid "Mailbox 1" msgstr "" -#: cups/ppd-cache.c:3758 +#: cups/ppd-cache.c:3787 msgid "Mailbox 10" msgstr "" -#: cups/ppd-cache.c:3750 +#: cups/ppd-cache.c:3779 msgid "Mailbox 2" msgstr "" -#: cups/ppd-cache.c:3751 +#: cups/ppd-cache.c:3780 msgid "Mailbox 3" msgstr "" -#: cups/ppd-cache.c:3752 +#: cups/ppd-cache.c:3781 msgid "Mailbox 4" msgstr "" -#: cups/ppd-cache.c:3753 +#: cups/ppd-cache.c:3782 msgid "Mailbox 5" msgstr "" -#: cups/ppd-cache.c:3754 +#: cups/ppd-cache.c:3783 msgid "Mailbox 6" msgstr "" -#: cups/ppd-cache.c:3755 +#: cups/ppd-cache.c:3784 msgid "Mailbox 7" msgstr "" -#: cups/ppd-cache.c:3756 +#: cups/ppd-cache.c:3785 msgid "Mailbox 8" msgstr "" -#: cups/ppd-cache.c:3757 +#: cups/ppd-cache.c:3786 msgid "Mailbox 9" msgstr "" -#: cups/ppd-cache.c:3356 +#: cups/ppd-cache.c:3385 msgid "Main" msgstr "" -#: cups/ppd-cache.c:3364 +#: cups/ppd-cache.c:3393 msgid "Main Roll" msgstr "" -#: cups/ppd-cache.c:3359 +#: cups/ppd-cache.c:3388 msgid "Manual" msgstr "" @@ -5059,27 +5068,27 @@ msgstr "" msgid "Manual Feed" msgstr "" -#: cups/ppd-cache.c:3445 +#: cups/ppd-cache.c:3474 msgid "Matte Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3446 +#: cups/ppd-cache.c:3475 msgid "Matte Cover Paper" msgstr "" -#: cups/ppd-cache.c:3486 +#: cups/ppd-cache.c:3515 msgid "Matte Fabric" msgstr "" -#: cups/ppd-cache.c:3512 +#: cups/ppd-cache.c:3541 msgid "Matte Labels" msgstr "" -#: cups/ppd-cache.c:3462 +#: cups/ppd-cache.c:3491 msgid "Matte Optical Disc" msgstr "" -#: cups/ppd-cache.c:3536 +#: cups/ppd-cache.c:3565 msgid "Matte Photo Paper" msgstr "" @@ -5107,35 +5116,35 @@ msgstr "" msgid "Memory allocation error" msgstr "" -#: cups/ppd-cache.c:3519 +#: cups/ppd-cache.c:3548 msgid "Metal" msgstr "" -#: cups/ppd-cache.c:3520 +#: cups/ppd-cache.c:3549 msgid "Metal Glossy" msgstr "" -#: cups/ppd-cache.c:3521 +#: cups/ppd-cache.c:3550 msgid "Metal High Gloss" msgstr "" -#: cups/ppd-cache.c:3522 +#: cups/ppd-cache.c:3551 msgid "Metal Matte" msgstr "" -#: cups/ppd-cache.c:3523 +#: cups/ppd-cache.c:3552 msgid "Metal Satin" msgstr "" -#: cups/ppd-cache.c:3524 +#: cups/ppd-cache.c:3553 msgid "Metal Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3452 +#: cups/ppd-cache.c:3481 msgid "Mid-Weight Paper" msgstr "" -#: cups/ppd-cache.c:3367 cups/ppd-cache.c:3759 +#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3788 msgid "Middle" msgstr "" @@ -5151,7 +5160,7 @@ msgstr "" msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:6313 +#: scheduler/ipp.c:6317 msgid "Missing document-number attribute." msgstr "" @@ -5166,7 +5175,7 @@ msgstr "" msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:9699 +#: scheduler/ipp.c:9703 msgid "Missing last-document attribute in request." msgstr "" @@ -5178,7 +5187,7 @@ msgstr "" msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:6914 +#: scheduler/ipp.c:6918 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -5190,7 +5199,7 @@ msgstr "" msgid "Missing requesting-user-name attribute." msgstr "" -#: scheduler/ipp.c:5458 scheduler/ipp.c:5484 +#: scheduler/ipp.c:5462 scheduler/ipp.c:5488 #, c-format msgid "Missing required attribute \"%s\"." msgstr "" @@ -5224,7 +5233,7 @@ msgstr "" msgid "Missing y-dimension in media-size." msgstr "" -#: systemv/lpinfo.c:443 +#: systemv/lpinfo.c:443 systemv/lpinfo.c:467 #, c-format msgid "" "Model: name = %s\n" @@ -5245,7 +5254,7 @@ msgstr "" msgid "Modify Printer" msgstr "" -#: cups/ppd-cache.c:3525 +#: cups/ppd-cache.c:3554 msgid "Mounting Tape" msgstr "" @@ -5257,15 +5266,15 @@ msgstr "" msgid "Move Job" msgstr "" -#: cups/http-support.c:1361 +#: cups/http-support.c:1358 msgid "Moved Permanently" msgstr "" -#: cups/ppd-cache.c:3526 +#: cups/ppd-cache.c:3555 msgid "Multi Layer" msgstr "" -#: cups/ppd-cache.c:3527 +#: cups/ppd-cache.c:3556 msgid "Multi Part Form" msgstr "" @@ -5285,15 +5294,15 @@ msgstr "" msgid "Multi-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3374 +#: cups/ppd-cache.c:3403 msgid "Multipurpose" msgstr "" -#: cups/ppd-cache.c:3451 +#: cups/ppd-cache.c:3480 msgid "Multipurpose Paper" msgstr "" -#: cups/ppd-cache.c:3760 +#: cups/ppd-cache.c:3789 msgid "My Mailbox" msgstr "" @@ -5313,11 +5322,11 @@ msgstr "" msgid "Never" msgstr "" -#: cups/tls-darwin.c:670 cups/tls-gnutls.c:502 +#: cups/tls-darwin.c:672 cups/tls-gnutls.c:504 msgid "New credentials are not valid for name." msgstr "" -#: cups/tls-darwin.c:660 cups/tls-gnutls.c:492 +#: cups/tls-darwin.c:662 cups/tls-gnutls.c:494 msgid "New credentials are older than stored credentials." msgstr "" @@ -5325,7 +5334,7 @@ msgstr "" msgid "No" msgstr "" -#: cups/http-support.c:1358 +#: cups/http-support.c:1355 msgid "No Content" msgstr "" @@ -5333,7 +5342,7 @@ msgstr "" msgid "No IPP attributes." msgstr "" -#: cups/ppd-util.c:451 +#: cups/ppd-util.c:469 msgid "No PPD name" msgstr "" @@ -5345,11 +5354,11 @@ msgstr "" msgid "No Windows printer drivers are installed." msgstr "" -#: cups/request.c:519 cups/request.c:879 +#: cups/request.c:553 cups/request.c:913 msgid "No active connection" msgstr "" -#: cups/request.c:300 +#: cups/request.c:334 msgid "No active connection." msgstr "" @@ -5366,7 +5375,7 @@ msgstr "" msgid "No authentication information provided." msgstr "" -#: cups/tls-darwin.c:610 cups/tls-gnutls.c:439 +#: cups/tls-darwin.c:612 cups/tls-gnutls.c:441 msgid "No common name specified." msgstr "" @@ -5374,11 +5383,11 @@ msgstr "" msgid "No community name" msgstr "" -#: scheduler/ipp.c:6113 +#: scheduler/ipp.c:6117 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7494 +#: cgi-bin/ipp-var.c:422 scheduler/ipp.c:7498 msgid "No destinations added." msgstr "" @@ -5394,7 +5403,7 @@ msgstr "" msgid "No error-status" msgstr "" -#: scheduler/ipp.c:8449 scheduler/ipp.c:9713 +#: scheduler/ipp.c:8453 scheduler/ipp.c:9717 msgid "No file in print request." msgstr "" @@ -5415,27 +5424,27 @@ msgstr "" msgid "No printer name" msgstr "" -#: cups/ppd-util.c:709 +#: cups/ppd-util.c:638 msgid "No printer-uri found" msgstr "" -#: cups/ppd-util.c:693 +#: cups/ppd-util.c:622 msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:6520 +#: scheduler/ipp.c:6524 msgid "No printer-uri in request." msgstr "" -#: cups/http.c:2243 +#: cups/http.c:2244 msgid "No request URI." msgstr "" -#: cups/http.c:2260 +#: cups/http.c:2261 msgid "No request protocol version." msgstr "" -#: cups/request.c:308 +#: cups/request.c:342 msgid "No request sent." msgstr "" @@ -5443,15 +5452,15 @@ msgstr "" msgid "No request-id" msgstr "" -#: cups/tls-darwin.c:690 cups/tls-gnutls.c:522 +#: cups/tls-darwin.c:692 cups/tls-gnutls.c:524 msgid "No stored credentials, not valid for name." msgstr "" -#: scheduler/ipp.c:5717 +#: scheduler/ipp.c:5721 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:7833 +#: scheduler/ipp.c:7837 msgid "No subscriptions found." msgstr "" @@ -5471,11 +5480,11 @@ msgstr "" msgid "Non-continuous (Web sensing)" msgstr "" -#: cups/ppd-cache.c:3838 cups/ppd-cache.c:3885 cups/ppd-cache.c:3932 +#: cups/ppd-cache.c:3867 cups/ppd-cache.c:3914 cups/ppd-cache.c:3961 msgid "None" msgstr "" -#: cups/ppd-cache.c:4028 cups/ppd-cache.c:4088 cups/ppd-cache.c:4118 +#: cups/ppd-cache.c:4057 cups/ppd-cache.c:4117 cups/ppd-cache.c:4147 #: ppdc/sample.c:238 msgid "Normal" msgstr "" @@ -5500,7 +5509,7 @@ msgstr "" msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1556 scheduler/ipp.c:10974 +#: scheduler/ipp.c:1556 scheduler/ipp.c:10978 msgid "Not allowed to print." msgstr "" @@ -5512,15 +5521,15 @@ msgstr "" msgid "Note: this program only validates the DSC comments, not the PostScript itself." msgstr "" -#: cups/http-support.c:1349 cups/http-support.c:1485 cups/ppd.c:313 +#: cups/http-support.c:1346 cups/http-support.c:1485 cups/ppd.c:313 msgid "OK" msgstr "" -#: cups/ppd-cache.c:3682 ppdc/sample.c:263 +#: cups/ppd-cache.c:3711 ppdc/sample.c:263 msgid "Off (1-Sided)" msgstr "" -#: cups/ppd-cache.c:3447 +#: cups/ppd-cache.c:3476 msgid "Office Recycled Paper" msgstr "" @@ -5532,7 +5541,7 @@ msgstr "" msgid "Online Help" msgstr "" -#: scheduler/ipp.c:5437 +#: scheduler/ipp.c:5441 msgid "Only local users can create a local printer." msgstr "" @@ -5553,7 +5562,7 @@ msgstr "" msgid "Operation Policy" msgstr "" -#: cups/ppd-cache.c:3459 +#: cups/ppd-cache.c:3488 msgid "Optical Disc" msgstr "" @@ -5574,7 +5583,7 @@ msgstr "" msgid "Options:" msgstr "" -#: cups/ppd-cache.c:3528 +#: cups/ppd-cache.c:3557 msgid "Other" msgstr "" @@ -5642,7 +5651,7 @@ msgstr "" msgid "Packet does not start with SEQUENCE" msgstr "" -#: cups/ppd-cache.c:3529 +#: cups/ppd-cache.c:3558 msgid "Paper" msgstr "" @@ -5674,7 +5683,7 @@ msgstr "" msgid "ParamCustominTearInterval" msgstr "" -#: cups/auth.c:192 cups/auth.c:359 +#: cups/auth.c:224 cups/auth.c:480 #, c-format msgid "Password for %s on %s? " msgstr "" @@ -5696,15 +5705,15 @@ msgstr "" msgid "Peel-Off" msgstr "" -#: cups/ppd-cache.c:3513 +#: cups/ppd-cache.c:3542 msgid "Permanent Labels" msgstr "" -#: cups/ppd-cache.c:3362 ppdc/sample.c:160 +#: cups/ppd-cache.c:3391 ppdc/sample.c:160 msgid "Photo" msgstr "" -#: cups/ppd-cache.c:3533 +#: cups/ppd-cache.c:3562 msgid "Photo Film" msgstr "" @@ -5712,59 +5721,59 @@ msgstr "" msgid "Photo Labels" msgstr "" -#: cups/ppd-cache.c:3530 cups/ppd-cache.c:3531 +#: cups/ppd-cache.c:3559 cups/ppd-cache.c:3560 msgid "Photo Paper" msgstr "" -#: cups/ppd-cache.c:3503 cups/ppd-cache.c:3505 +#: cups/ppd-cache.c:3532 cups/ppd-cache.c:3534 msgid "Photo Paper Plus Glossy II" msgstr "" -#: cups/ppd-cache.c:3504 cups/ppd-cache.c:3506 +#: cups/ppd-cache.c:3533 cups/ppd-cache.c:3535 msgid "Photo Paper Pro Platinum" msgstr "" -#: cups/ppd-cache.c:3479 +#: cups/ppd-cache.c:3508 msgid "Plain Envelope" msgstr "" -#: cups/ppd-cache.c:3559 ppdc/sample.c:281 +#: cups/ppd-cache.c:3588 ppdc/sample.c:281 msgid "Plain Paper" msgstr "" -#: cups/ppd-cache.c:3539 +#: cups/ppd-cache.c:3568 msgid "Plastic" msgstr "" -#: cups/ppd-cache.c:3540 +#: cups/ppd-cache.c:3569 msgid "Plastic Archival" msgstr "" -#: cups/ppd-cache.c:3541 +#: cups/ppd-cache.c:3570 msgid "Plastic Colored" msgstr "" -#: cups/ppd-cache.c:3542 +#: cups/ppd-cache.c:3571 msgid "Plastic Glossy" msgstr "" -#: cups/ppd-cache.c:3543 +#: cups/ppd-cache.c:3572 msgid "Plastic High Gloss" msgstr "" -#: cups/ppd-cache.c:3544 +#: cups/ppd-cache.c:3573 msgid "Plastic Matte" msgstr "" -#: cups/ppd-cache.c:3545 +#: cups/ppd-cache.c:3574 msgid "Plastic Satin" msgstr "" -#: cups/ppd-cache.c:3546 +#: cups/ppd-cache.c:3575 msgid "Plastic Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3547 +#: cups/ppd-cache.c:3576 msgid "Plate" msgstr "" @@ -5772,7 +5781,7 @@ msgstr "" msgid "Policies" msgstr "" -#: cups/ppd-cache.c:3548 +#: cups/ppd-cache.c:3577 msgid "Polyester" msgstr "" @@ -5804,31 +5813,31 @@ msgstr "" msgid "Poster Fold" msgstr "" -#: cups/ppd-cache.c:3549 +#: cups/ppd-cache.c:3578 msgid "Pre Cut Tabs" msgstr "" -#: cups/ppd-cache.c:3453 +#: cups/ppd-cache.c:3482 msgid "Premium Inkjet Paper" msgstr "" -#: cups/ppd-cache.c:3454 +#: cups/ppd-cache.c:3483 msgid "Premium Photo Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3455 +#: cups/ppd-cache.c:3484 msgid "Premium Presentation Matte Paper" msgstr "" -#: backend/ipp.c:980 backend/ipp.c:988 +#: backend/ipp.c:982 backend/ipp.c:990 msgid "Preparing to print." msgstr "" -#: cups/ppd-cache.c:3480 +#: cups/ppd-cache.c:3509 msgid "Preprinted Envelope" msgstr "" -#: cups/ppd-cache.c:3569 +#: cups/ppd-cache.c:3598 msgid "Preprinted Paper" msgstr "" @@ -5844,7 +5853,7 @@ msgstr "" msgid "Print Mode" msgstr "" -#: cups/ppd-cache.c:4023 cups/ppd-cache.c:4081 cups/ppd-cache.c:4115 +#: cups/ppd-cache.c:4052 cups/ppd-cache.c:4110 cups/ppd-cache.c:4144 msgid "Print Quality" msgstr "" @@ -5876,19 +5885,19 @@ msgstr "" msgid "Print file sent." msgstr "" -#: backend/ipp.c:2235 +#: backend/ipp.c:2238 msgid "Print job canceled at printer." msgstr "" -#: backend/ipp.c:2227 +#: backend/ipp.c:2230 msgid "Print job too large." msgstr "" -#: backend/ipp.c:1696 +#: backend/ipp.c:1699 msgid "Print job was not accepted." msgstr "" -#: scheduler/ipp.c:5503 +#: scheduler/ipp.c:5507 #, c-format msgid "Printer \"%s\" already exists." msgstr "" @@ -5917,15 +5926,15 @@ msgstr "" msgid "Printer Settings" msgstr "" -#: backend/ipp.c:2230 +#: backend/ipp.c:2233 msgid "Printer cannot print supplied content." msgstr "" -#: backend/ipp.c:2233 +#: backend/ipp.c:2236 msgid "Printer cannot print with supplied options." msgstr "" -#: cups/ppd-cache.c:4142 +#: cups/ppd-cache.c:4171 msgid "Printer does not support required IPP attributes or document formats." msgstr "" @@ -5943,11 +5952,11 @@ msgstr "" msgid "Printing page %d, %u%% complete." msgstr "" -#: cups/ppd-cache.c:3007 cups/ppd-cache.c:3929 +#: cups/ppd-cache.c:3007 cups/ppd-cache.c:3958 msgid "Punch" msgstr "" -#: cups/ppd-cache.c:3570 +#: cups/ppd-cache.c:3599 msgid "Punched Paper" msgstr "" @@ -5955,7 +5964,7 @@ msgstr "" msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1551 scheduler/ipp.c:10969 +#: scheduler/ipp.c:1551 scheduler/ipp.c:10973 msgid "Quota limit reached." msgstr "" @@ -5963,11 +5972,11 @@ msgstr "" msgid "Rank Owner Job File(s) Total Size" msgstr "" -#: cups/ppd-cache.c:3373 +#: cups/ppd-cache.c:3402 msgid "Rear" msgstr "" -#: cups/ppd-cache.c:3761 +#: cups/ppd-cache.c:3790 msgid "Rear Tray" msgstr "" @@ -6013,7 +6022,7 @@ msgstr "" msgid "Rewind" msgstr "" -#: cups/ppd-cache.c:3371 +#: cups/ppd-cache.c:3400 msgid "Right" msgstr "" @@ -6021,51 +6030,51 @@ msgstr "" msgid "Right Gate Fold" msgstr "" -#: cups/ppd-cache.c:3762 +#: cups/ppd-cache.c:3791 msgid "Right Tray" msgstr "" -#: cups/ppd-cache.c:3550 +#: cups/ppd-cache.c:3579 msgid "Roll" msgstr "" -#: cups/ppd-cache.c:3395 +#: cups/ppd-cache.c:3424 msgid "Roll 1" msgstr "" -#: cups/ppd-cache.c:3404 +#: cups/ppd-cache.c:3433 msgid "Roll 10" msgstr "" -#: cups/ppd-cache.c:3396 +#: cups/ppd-cache.c:3425 msgid "Roll 2" msgstr "" -#: cups/ppd-cache.c:3397 +#: cups/ppd-cache.c:3426 msgid "Roll 3" msgstr "" -#: cups/ppd-cache.c:3398 +#: cups/ppd-cache.c:3427 msgid "Roll 4" msgstr "" -#: cups/ppd-cache.c:3399 +#: cups/ppd-cache.c:3428 msgid "Roll 5" msgstr "" -#: cups/ppd-cache.c:3400 +#: cups/ppd-cache.c:3429 msgid "Roll 6" msgstr "" -#: cups/ppd-cache.c:3401 +#: cups/ppd-cache.c:3430 msgid "Roll 7" msgstr "" -#: cups/ppd-cache.c:3402 +#: cups/ppd-cache.c:3431 msgid "Roll 8" msgstr "" -#: cups/ppd-cache.c:3403 +#: cups/ppd-cache.c:3432 msgid "Roll 9" msgstr "" @@ -6086,27 +6095,27 @@ msgstr "" msgid "Saddle Stitch" msgstr "" -#: cups/ppd-cache.c:3514 +#: cups/ppd-cache.c:3543 msgid "Satin Labels" msgstr "" -#: cups/ppd-cache.c:3463 +#: cups/ppd-cache.c:3492 msgid "Satin Optical Disc" msgstr "" -#: cups/ppd-cache.c:3537 +#: cups/ppd-cache.c:3566 msgid "Satin Photo Paper" msgstr "" -#: cups/ppd-cache.c:3551 +#: cups/ppd-cache.c:3580 msgid "Screen" msgstr "" -#: cups/ppd-cache.c:3552 +#: cups/ppd-cache.c:3581 msgid "Screen Paged" msgstr "" -#: cups/ppd-cache.c:3515 +#: cups/ppd-cache.c:3544 msgid "Security Labels" msgstr "" @@ -6114,35 +6123,35 @@ msgstr "" msgid "See Other" msgstr "" -#: scheduler/ipp.c:7118 scheduler/ipp.c:7137 +#: scheduler/ipp.c:7122 scheduler/ipp.c:7141 msgid "See remote printer." msgstr "" -#: cups/ppd-cache.c:3553 +#: cups/ppd-cache.c:3582 msgid "Self Adhesive" msgstr "" -#: cups/ppd-cache.c:3554 +#: cups/ppd-cache.c:3583 msgid "Self Adhesive Film" msgstr "" -#: cups/tls-darwin.c:745 cups/tls-gnutls.c:584 +#: cups/tls-darwin.c:747 cups/tls-gnutls.c:586 msgid "Self-signed credentials are blocked." msgstr "" -#: cups/ppd-cache.c:3487 +#: cups/ppd-cache.c:3516 msgid "Semi-Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3516 +#: cups/ppd-cache.c:3545 msgid "Semi-Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3464 +#: cups/ppd-cache.c:3493 msgid "Semi-Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3538 +#: cups/ppd-cache.c:3567 msgid "Semi-Gloss Photo Paper" msgstr "" @@ -6166,7 +6175,7 @@ msgstr "" msgid "Server Stopped" msgstr "" -#: cups/tls-darwin.c:1186 cups/tls-gnutls.c:1264 +#: cups/tls-darwin.c:1191 cups/tls-gnutls.c:1282 msgid "Server credentials not set." msgstr "" @@ -6199,23 +6208,23 @@ msgstr "" msgid "Shipping Address" msgstr "" -#: cups/ppd-cache.c:3682 ppdc/sample.c:265 +#: cups/ppd-cache.c:3711 ppdc/sample.c:265 msgid "Short-Edge (Landscape)" msgstr "" -#: cups/ppd-cache.c:3555 +#: cups/ppd-cache.c:3584 msgid "Shrink Foil" msgstr "" -#: cups/ppd-cache.c:3369 +#: cups/ppd-cache.c:3398 msgid "Side" msgstr "" -#: cups/ppd-cache.c:3763 +#: cups/ppd-cache.c:3792 msgid "Side Tray" msgstr "" -#: cups/ppd-cache.c:3556 +#: cups/ppd-cache.c:3585 msgid "Single Face" msgstr "" @@ -6251,11 +6260,11 @@ msgstr "" msgid "Single Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3557 +#: cups/ppd-cache.c:3586 msgid "Single Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:3558 +#: cups/ppd-cache.c:3587 msgid "Sleeve" msgstr "" @@ -6268,43 +6277,43 @@ msgstr "" msgid "Spooling job, %.0f%% complete." msgstr "" -#: cups/ppd-cache.c:3764 +#: cups/ppd-cache.c:3793 msgid "Stacker 1" msgstr "" -#: cups/ppd-cache.c:3773 +#: cups/ppd-cache.c:3802 msgid "Stacker 10" msgstr "" -#: cups/ppd-cache.c:3765 +#: cups/ppd-cache.c:3794 msgid "Stacker 2" msgstr "" -#: cups/ppd-cache.c:3766 +#: cups/ppd-cache.c:3795 msgid "Stacker 3" msgstr "" -#: cups/ppd-cache.c:3767 +#: cups/ppd-cache.c:3796 msgid "Stacker 4" msgstr "" -#: cups/ppd-cache.c:3768 +#: cups/ppd-cache.c:3797 msgid "Stacker 5" msgstr "" -#: cups/ppd-cache.c:3769 +#: cups/ppd-cache.c:3798 msgid "Stacker 6" msgstr "" -#: cups/ppd-cache.c:3770 +#: cups/ppd-cache.c:3799 msgid "Stacker 7" msgstr "" -#: cups/ppd-cache.c:3771 +#: cups/ppd-cache.c:3800 msgid "Stacker 8" msgstr "" -#: cups/ppd-cache.c:3772 +#: cups/ppd-cache.c:3801 msgid "Stacker 9" msgstr "" @@ -6312,7 +6321,7 @@ msgstr "" msgid "Standard" msgstr "" -#: cups/ppd-cache.c:3029 cups/ppd-cache.c:3835 +#: cups/ppd-cache.c:3029 cups/ppd-cache.c:3864 msgid "Staple" msgstr "" @@ -6351,8 +6360,8 @@ msgstr "" msgid "Statement" msgstr "" -#: scheduler/ipp.c:3628 scheduler/ipp.c:6930 scheduler/ipp.c:7640 -#: scheduler/ipp.c:9161 +#: scheduler/ipp.c:3628 scheduler/ipp.c:6934 scheduler/ipp.c:7644 +#: scheduler/ipp.c:9165 #, c-format msgid "Subscription #%d does not exist." msgstr "" @@ -6373,11 +6382,11 @@ msgstr "" msgid "Super B/A3" msgstr "" -#: cups/http-support.c:1346 +#: cups/http-support.c:1343 msgid "Switching Protocols" msgstr "" -#: cups/ppd-cache.c:3571 +#: cups/ppd-cache.c:3600 msgid "Tab Stock" msgstr "" @@ -6410,8 +6419,8 @@ msgstr "" msgid "The \"%s\" attribute is required for print jobs." msgstr "" -#: scheduler/ipp.c:6591 scheduler/ipp.c:6671 scheduler/ipp.c:6684 -#: scheduler/ipp.c:6696 scheduler/ipp.c:6711 +#: scheduler/ipp.c:6595 scheduler/ipp.c:6675 scheduler/ipp.c:6688 +#: scheduler/ipp.c:6700 scheduler/ipp.c:6715 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" @@ -6421,17 +6430,17 @@ msgstr "" msgid "The '%s' Job Status attribute cannot be supplied in a job creation request." msgstr "" -#: scheduler/ipp.c:5265 +#: scheduler/ipp.c:5269 #, c-format msgid "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "" -#: scheduler/ipp.c:7160 +#: scheduler/ipp.c:7164 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:7149 +#: scheduler/ipp.c:7153 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" @@ -6465,7 +6474,7 @@ msgstr "" msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2124 scheduler/ipp.c:5842 +#: scheduler/ipp.c:2124 scheduler/ipp.c:5846 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -6478,7 +6487,7 @@ msgstr "" msgid "The optical photoconductor will need to be replaced soon." msgstr "" -#: backend/ipp.c:1000 +#: backend/ipp.c:1002 msgid "The printer configuration is incorrect or the printer no longer exists." msgstr "" @@ -6486,8 +6495,8 @@ msgstr "" msgid "The printer did not respond." msgstr "" -#: backend/ipp.c:773 backend/ipp.c:963 backend/ipp.c:1077 backend/ipp.c:1498 -#: backend/ipp.c:1668 backend/lpd.c:896 backend/socket.c:359 +#: backend/ipp.c:775 backend/ipp.c:965 backend/ipp.c:1079 backend/ipp.c:1501 +#: backend/ipp.c:1671 backend/lpd.c:896 backend/socket.c:359 #: backend/usb-unix.c:122 backend/usb-unix.c:412 backend/usb-unix.c:495 msgid "The printer is in use." msgstr "" @@ -6504,7 +6513,7 @@ msgstr "" msgid "The printer is not connected." msgstr "" -#: backend/ipp.c:751 backend/ipp.c:784 backend/ipp.c:959 backend/lpd.c:875 +#: backend/ipp.c:753 backend/ipp.c:786 backend/ipp.c:961 backend/lpd.c:875 #: backend/lpd.c:916 backend/socket.c:338 backend/socket.c:371 msgid "The printer is not responding." msgstr "" @@ -6521,7 +6530,7 @@ msgstr "" msgid "The printer is offline." msgstr "" -#: backend/ipp.c:767 backend/lpd.c:890 backend/socket.c:353 +#: backend/ipp.c:769 backend/lpd.c:890 backend/socket.c:353 msgid "The printer is unreachable at this time." msgstr "" @@ -6533,7 +6542,7 @@ msgstr "" msgid "The printer may be out of toner." msgstr "" -#: backend/ipp.c:760 backend/lpd.c:883 backend/socket.c:346 +#: backend/ipp.c:762 backend/lpd.c:883 backend/socket.c:346 msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -6542,13 +6551,13 @@ msgid "The printer name may only contain up to 127 printable characters and may msgstr "" #: scheduler/ipp.c:810 scheduler/ipp.c:1093 scheduler/ipp.c:3267 -#: scheduler/ipp.c:3448 scheduler/ipp.c:5248 scheduler/ipp.c:5676 -#: scheduler/ipp.c:5991 scheduler/ipp.c:6557 scheduler/ipp.c:7364 -#: scheduler/ipp.c:7420 scheduler/ipp.c:7746 scheduler/ipp.c:8018 -#: scheduler/ipp.c:8107 scheduler/ipp.c:8140 scheduler/ipp.c:8464 -#: scheduler/ipp.c:8871 scheduler/ipp.c:8953 scheduler/ipp.c:10127 -#: scheduler/ipp.c:10579 scheduler/ipp.c:10932 scheduler/ipp.c:11014 -#: scheduler/ipp.c:11389 +#: scheduler/ipp.c:3448 scheduler/ipp.c:5252 scheduler/ipp.c:5680 +#: scheduler/ipp.c:5995 scheduler/ipp.c:6561 scheduler/ipp.c:7368 +#: scheduler/ipp.c:7424 scheduler/ipp.c:7750 scheduler/ipp.c:8022 +#: scheduler/ipp.c:8111 scheduler/ipp.c:8144 scheduler/ipp.c:8468 +#: scheduler/ipp.c:8875 scheduler/ipp.c:8957 scheduler/ipp.c:10131 +#: scheduler/ipp.c:10583 scheduler/ipp.c:10936 scheduler/ipp.c:11018 +#: scheduler/ipp.c:11393 msgid "The printer or class does not exist." msgstr "" @@ -6601,12 +6610,12 @@ msgstr "" msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." msgstr "" -#: scheduler/ipp.c:6655 +#: scheduler/ipp.c:6659 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:5920 +#: scheduler/ipp.c:5924 msgid "There are too many subscriptions." msgstr "" @@ -6633,23 +6642,23 @@ msgstr "" msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" -#: cups/ppd-cache.c:3366 +#: cups/ppd-cache.c:3395 msgid "Top" msgstr "" -#: cups/ppd-cache.c:3774 +#: cups/ppd-cache.c:3803 msgid "Top Tray" msgstr "" -#: cups/ppd-cache.c:3572 +#: cups/ppd-cache.c:3601 msgid "Tractor" msgstr "" -#: cups/ppd-cache.c:3573 +#: cups/ppd-cache.c:3602 msgid "Transfer" msgstr "" -#: cups/ppd-cache.c:3574 ppdc/sample.c:284 +#: cups/ppd-cache.c:3603 ppdc/sample.c:284 msgid "Transparency" msgstr "" @@ -6657,83 +6666,83 @@ msgstr "" msgid "Tray" msgstr "" -#: cups/ppd-cache.c:3375 cups/ppd-cache.c:3775 ppdc/sample.c:256 +#: cups/ppd-cache.c:3404 cups/ppd-cache.c:3804 ppdc/sample.c:256 msgid "Tray 1" msgstr "" -#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3784 +#: cups/ppd-cache.c:3413 cups/ppd-cache.c:3813 msgid "Tray 10" msgstr "" -#: cups/ppd-cache.c:3385 +#: cups/ppd-cache.c:3414 msgid "Tray 11" msgstr "" -#: cups/ppd-cache.c:3386 +#: cups/ppd-cache.c:3415 msgid "Tray 12" msgstr "" -#: cups/ppd-cache.c:3387 +#: cups/ppd-cache.c:3416 msgid "Tray 13" msgstr "" -#: cups/ppd-cache.c:3388 +#: cups/ppd-cache.c:3417 msgid "Tray 14" msgstr "" -#: cups/ppd-cache.c:3389 +#: cups/ppd-cache.c:3418 msgid "Tray 15" msgstr "" -#: cups/ppd-cache.c:3390 +#: cups/ppd-cache.c:3419 msgid "Tray 16" msgstr "" -#: cups/ppd-cache.c:3391 +#: cups/ppd-cache.c:3420 msgid "Tray 17" msgstr "" -#: cups/ppd-cache.c:3392 +#: cups/ppd-cache.c:3421 msgid "Tray 18" msgstr "" -#: cups/ppd-cache.c:3393 +#: cups/ppd-cache.c:3422 msgid "Tray 19" msgstr "" -#: cups/ppd-cache.c:3376 cups/ppd-cache.c:3776 ppdc/sample.c:257 +#: cups/ppd-cache.c:3405 cups/ppd-cache.c:3805 ppdc/sample.c:257 msgid "Tray 2" msgstr "" -#: cups/ppd-cache.c:3394 +#: cups/ppd-cache.c:3423 msgid "Tray 20" msgstr "" -#: cups/ppd-cache.c:3377 cups/ppd-cache.c:3777 ppdc/sample.c:258 +#: cups/ppd-cache.c:3406 cups/ppd-cache.c:3806 ppdc/sample.c:258 msgid "Tray 3" msgstr "" -#: cups/ppd-cache.c:3378 cups/ppd-cache.c:3778 ppdc/sample.c:259 +#: cups/ppd-cache.c:3407 cups/ppd-cache.c:3807 ppdc/sample.c:259 msgid "Tray 4" msgstr "" -#: cups/ppd-cache.c:3379 cups/ppd-cache.c:3779 +#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3808 msgid "Tray 5" msgstr "" -#: cups/ppd-cache.c:3380 cups/ppd-cache.c:3780 +#: cups/ppd-cache.c:3409 cups/ppd-cache.c:3809 msgid "Tray 6" msgstr "" -#: cups/ppd-cache.c:3381 cups/ppd-cache.c:3781 +#: cups/ppd-cache.c:3410 cups/ppd-cache.c:3810 msgid "Tray 7" msgstr "" -#: cups/ppd-cache.c:3382 cups/ppd-cache.c:3782 +#: cups/ppd-cache.c:3411 cups/ppd-cache.c:3811 msgid "Tray 8" msgstr "" -#: cups/ppd-cache.c:3383 cups/ppd-cache.c:3783 +#: cups/ppd-cache.c:3412 cups/ppd-cache.c:3812 msgid "Tray 9" msgstr "" @@ -6753,12 +6762,12 @@ msgstr "" msgid "Triple Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3575 +#: cups/ppd-cache.c:3604 msgid "Triple Wall Cardboard" msgstr "" -#: cups/tls-darwin.c:650 cups/tls-darwin.c:732 cups/tls-gnutls.c:482 -#: cups/tls-gnutls.c:564 +#: cups/tls-darwin.c:652 cups/tls-darwin.c:734 cups/tls-gnutls.c:484 +#: cups/tls-gnutls.c:566 msgid "Trust on first use is disabled." msgstr "" @@ -6822,7 +6831,7 @@ msgstr "" msgid "Unable to add class" msgstr "" -#: backend/ipp.c:1855 +#: backend/ipp.c:1858 msgid "Unable to add document to print job." msgstr "" @@ -6851,7 +6860,7 @@ msgstr "" msgid "Unable to cancel RSS subscription" msgstr "" -#: backend/ipp.c:2140 backend/ipp.c:2650 +#: backend/ipp.c:2143 backend/ipp.c:2675 msgid "Unable to cancel print job." msgstr "" @@ -6867,12 +6876,12 @@ msgstr "" msgid "Unable to change server settings" msgstr "" -#: cups/ipp.c:5385 +#: cups/ipp.c:5389 #, c-format msgid "Unable to compile mimeMediaType regular expression: %s." msgstr "" -#: cups/ipp.c:5331 +#: cups/ipp.c:5335 #, c-format msgid "Unable to compile naturalLanguage regular expression: %s." msgstr "" @@ -6881,11 +6890,11 @@ msgstr "" msgid "Unable to configure printer options." msgstr "" -#: cups/adminutil.c:899 cups/request.c:1016 +#: cups/adminutil.c:899 cups/request.c:1050 msgid "Unable to connect to host." msgstr "" -#: backend/ipp.c:730 backend/ipp.c:1275 backend/lpd.c:856 backend/socket.c:319 +#: backend/ipp.c:732 backend/ipp.c:1277 backend/lpd.c:856 backend/socket.c:319 #: backend/usb-unix.c:108 msgid "Unable to contact printer, queuing on next printer in class." msgstr "" @@ -6924,19 +6933,19 @@ msgstr "" msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "" -#: cups/tls-darwin.c:616 cups/tls-gnutls.c:445 +#: cups/tls-darwin.c:618 cups/tls-gnutls.c:447 msgid "Unable to create credentials from array." msgstr "" -#: cups/ppd-util.c:542 cups/util.c:500 +#: cups/ppd-util.c:553 cups/util.c:500 msgid "Unable to create printer-uri" msgstr "" -#: scheduler/ipp.c:5513 +#: scheduler/ipp.c:5517 msgid "Unable to create printer." msgstr "" -#: cups/tls-darwin.c:1476 cups/tls-gnutls.c:1476 +#: cups/tls-darwin.c:1482 cups/tls-gnutls.c:1494 msgid "Unable to create server credentials." msgstr "" @@ -6960,35 +6969,35 @@ msgstr "" msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/tls-darwin.c:1643 +#: cups/tls-darwin.c:1670 msgid "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/tls-darwin.c:1633 +#: cups/tls-darwin.c:1660 msgid "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/tls-darwin.c:1628 +#: cups/tls-darwin.c:1655 msgid "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/tls-darwin.c:1638 +#: cups/tls-darwin.c:1665 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/tls-darwin.c:1648 +#: cups/tls-darwin.c:1675 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)." msgstr "" -#: cups/tls-darwin.c:1623 +#: cups/tls-darwin.c:1650 msgid "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/tls-darwin.c:1618 +#: cups/tls-darwin.c:1645 msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/tls-darwin.c:1675 cups/tls-sspi.c:1278 cups/tls-sspi.c:1295 +#: cups/tls-darwin.c:1708 cups/tls-sspi.c:1283 cups/tls-sspi.c:1300 msgid "Unable to establish a secure connection to host." msgstr "" @@ -7000,11 +7009,11 @@ msgstr "" msgid "Unable to find printer." msgstr "" -#: cups/tls-darwin.c:1489 +#: cups/tls-darwin.c:1495 msgid "Unable to find server credentials." msgstr "" -#: backend/ipp.c:3311 +#: backend/ipp.c:3336 msgid "Unable to get backend exit status." msgstr "" @@ -7032,7 +7041,7 @@ msgstr "" msgid "Unable to get printer status" msgstr "" -#: backend/ipp.c:1024 +#: backend/ipp.c:1026 msgid "Unable to get printer status." msgstr "" @@ -7055,7 +7064,7 @@ msgstr "" msgid "Unable to locate printer \"%s\"." msgstr "" -#: backend/dnssd.c:785 backend/ipp.c:342 backend/lpd.c:191 +#: backend/dnssd.c:785 backend/ipp.c:345 backend/lpd.c:191 #: backend/socket.c:160 msgid "Unable to locate printer." msgstr "" @@ -7088,7 +7097,7 @@ msgstr "" msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:6334 +#: scheduler/ipp.c:6338 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" @@ -7097,7 +7106,7 @@ msgstr "" msgid "Unable to open help file." msgstr "" -#: backend/ipp.c:384 backend/ipp.c:1595 backend/ipp.c:1808 backend/lpd.c:479 +#: backend/ipp.c:386 backend/ipp.c:1598 backend/ipp.c:1811 backend/lpd.c:479 #: backend/socket.c:147 backend/usb.c:229 filter/gziptoany.c:71 #: filter/pstops.c:268 msgid "Unable to open print file" @@ -7117,7 +7126,7 @@ msgstr "" msgid "Unable to read print data." msgstr "" -#: scheduler/ipp.c:8623 scheduler/ipp.c:9866 +#: scheduler/ipp.c:8627 scheduler/ipp.c:9870 msgid "Unable to rename job document file." msgstr "" @@ -7155,7 +7164,7 @@ msgstr "" msgid "Unable to set server default" msgstr "" -#: backend/ipp.c:3170 backend/ipp.c:3247 backend/ipp.c:3255 +#: backend/ipp.c:3195 backend/ipp.c:3272 backend/ipp.c:3280 msgid "Unable to start backend process." msgstr "" @@ -7193,7 +7202,7 @@ msgstr "" msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "" -#: backend/ipp.c:526 +#: backend/ipp.c:528 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "" @@ -7208,7 +7217,7 @@ msgstr "" msgid "Unknown format character: \"%c\"." msgstr "" -#: cups/hash.c:233 +#: cups/hash.c:264 msgid "Unknown hash algorithm." msgstr "" @@ -7216,7 +7225,7 @@ msgstr "" msgid "Unknown media size name." msgstr "" -#: backend/ipp.c:590 +#: backend/ipp.c:592 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "" @@ -7231,21 +7240,21 @@ msgstr "" msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:10801 +#: scheduler/ipp.c:10805 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:10784 +#: scheduler/ipp.c:10788 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" -#: cups/http.c:2292 +#: cups/http.c:2293 msgid "Unknown request method." msgstr "" -#: cups/http.c:2312 +#: cups/http.c:2313 msgid "Unknown request version." msgstr "" @@ -7257,22 +7266,22 @@ msgstr "" msgid "Unknown service name." msgstr "" -#: backend/ipp.c:555 +#: backend/ipp.c:557 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "" -#: scheduler/ipp.c:11260 +#: scheduler/ipp.c:11264 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11290 +#: scheduler/ipp.c:11294 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11365 +#: scheduler/ipp.c:11369 msgid "Unsupported 'job-name' value." msgstr "" @@ -7281,17 +7290,17 @@ msgstr "" msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:8430 scheduler/ipp.c:9678 +#: scheduler/ipp.c:8434 scheduler/ipp.c:9682 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:8566 scheduler/ipp.c:9831 +#: scheduler/ipp.c:8570 scheduler/ipp.c:9835 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9814 +#: scheduler/ipp.c:9818 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" @@ -7337,7 +7346,7 @@ msgstr "" msgid "Upgrade Required" msgstr "" -#: systemv/lpadmin.c:635 +#: systemv/lpadmin.c:662 msgid "" "Usage:\n" "\n" @@ -7349,7 +7358,7 @@ msgid "" " [-u allow:user,user] [-u deny:user,user]" msgstr "" -#: backend/dnssd.c:225 backend/ipp.c:331 backend/lpd.c:178 +#: backend/dnssd.c:225 backend/ipp.c:334 backend/lpd.c:178 #: backend/socket.c:124 backend/usb.c:175 filter/commandtops.c:61 #: filter/gziptoany.c:44 filter/pstops.c:229 monitor/bcp.c:54 #: monitor/tbcp.c:53 @@ -7441,7 +7450,7 @@ msgstr "" msgid "VarBind uses indefinite length" msgstr "" -#: cups/ppd-cache.c:3563 +#: cups/ppd-cache.c:3592 msgid "Vellum Paper" msgstr "" @@ -7449,7 +7458,7 @@ msgstr "" msgid "Version uses indefinite length" msgstr "" -#: backend/ipp.c:1975 +#: backend/ipp.c:1978 msgid "Waiting for job to complete." msgstr "" @@ -7465,7 +7474,7 @@ msgstr "" msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" -#: cups/ppd-cache.c:3488 +#: cups/ppd-cache.c:3517 msgid "Waterproof Fabric" msgstr "" @@ -7473,11 +7482,11 @@ msgstr "" msgid "Web Interface is Disabled" msgstr "" -#: cups/ppd-cache.c:3576 +#: cups/ppd-cache.c:3605 msgid "Wet Film" msgstr "" -#: cups/ppd-cache.c:3481 +#: cups/ppd-cache.c:3510 msgid "Windowed Envelope" msgstr "" @@ -7514,11 +7523,11 @@ msgstr "" msgid "completed" msgstr "" -#: scheduler/ipp.c:6206 +#: scheduler/ipp.c:6210 msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:7092 scheduler/ipp.c:7331 +#: scheduler/ipp.c:7096 scheduler/ipp.c:7335 msgid "cups-driverd failed to execute." msgstr "" @@ -7778,154 +7787,166 @@ msgstr "" msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:8096 +#: scheduler/ipp.c:8100 msgid "job-printer-uri attribute missing." msgstr "" -#: systemv/lpadmin.c:125 systemv/lpadmin.c:362 +#: systemv/lpadmin.c:124 systemv/lpadmin.c:380 msgid "lpadmin: Class name can only contain printable characters." msgstr "" -#: systemv/lpadmin.c:215 +#: systemv/lpadmin.c:214 #, c-format msgid "lpadmin: Expected PPD after \"-%c\" option." msgstr "" -#: systemv/lpadmin.c:443 +#: systemv/lpadmin.c:461 msgid "lpadmin: Expected allow/deny:userlist after \"-u\" option." msgstr "" -#: systemv/lpadmin.c:353 +#: systemv/lpadmin.c:371 msgid "lpadmin: Expected class after \"-r\" option." msgstr "" -#: systemv/lpadmin.c:115 +#: systemv/lpadmin.c:114 msgid "lpadmin: Expected class name after \"-c\" option." msgstr "" -#: systemv/lpadmin.c:537 +#: systemv/lpadmin.c:555 msgid "lpadmin: Expected description after \"-D\" option." msgstr "" -#: systemv/lpadmin.c:473 +#: systemv/lpadmin.c:491 msgid "lpadmin: Expected device URI after \"-v\" option." msgstr "" -#: systemv/lpadmin.c:550 +#: systemv/lpadmin.c:568 msgid "lpadmin: Expected file type(s) after \"-I\" option." msgstr "" -#: systemv/lpadmin.c:194 +#: systemv/lpadmin.c:193 msgid "lpadmin: Expected hostname after \"-h\" option." msgstr "" -#: systemv/lpadmin.c:569 +#: systemv/lpadmin.c:587 msgid "lpadmin: Expected location after \"-L\" option." msgstr "" -#: systemv/lpadmin.c:266 +#: systemv/lpadmin.c:284 msgid "lpadmin: Expected model after \"-m\" option." msgstr "" -#: systemv/lpadmin.c:401 +#: systemv/lpadmin.c:419 msgid "lpadmin: Expected name after \"-R\" option." msgstr "" -#: systemv/lpadmin.c:286 +#: systemv/lpadmin.c:304 msgid "lpadmin: Expected name=value after \"-o\" option." msgstr "" -#: systemv/lpadmin.c:306 +#: systemv/lpadmin.c:324 msgid "lpadmin: Expected printer after \"-p\" option." msgstr "" -#: systemv/lpadmin.c:157 +#: systemv/lpadmin.c:156 msgid "lpadmin: Expected printer name after \"-d\" option." msgstr "" -#: systemv/lpadmin.c:506 +#: systemv/lpadmin.c:524 msgid "lpadmin: Expected printer or class after \"-x\" option." msgstr "" -#: systemv/lpadmin.c:942 +#: systemv/lpadmin.c:969 msgid "lpadmin: No member names were seen." msgstr "" -#: systemv/lpadmin.c:729 +#: systemv/lpadmin.c:756 #, c-format msgid "lpadmin: Printer %s is already a member of class %s." msgstr "" -#: systemv/lpadmin.c:956 +#: systemv/lpadmin.c:983 #, c-format msgid "lpadmin: Printer %s is not a member of class %s." msgstr "" -#: systemv/lpadmin.c:166 systemv/lpadmin.c:315 systemv/lpadmin.c:515 +#: systemv/lpadmin.c:165 systemv/lpadmin.c:333 systemv/lpadmin.c:533 msgid "lpadmin: Printer name can only contain printable characters." msgstr "" -#: systemv/lpadmin.c:99 +#: systemv/lpadmin.c:617 +msgid "lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS." +msgstr "" + +#: systemv/lpadmin.c:232 +msgid "lpadmin: System V interface scripts are no longer supported for security reasons." +msgstr "" + +#: systemv/lpadmin.c:98 msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:91 systemv/lpadmin.c:141 systemv/lpadmin.c:244 -#: systemv/lpadmin.c:328 systemv/lpadmin.c:377 systemv/lpadmin.c:489 -#: systemv/lpadmin.c:611 +#: systemv/lpadmin.c:90 systemv/lpadmin.c:140 systemv/lpadmin.c:262 +#: systemv/lpadmin.c:346 systemv/lpadmin.c:395 systemv/lpadmin.c:507 +#: systemv/lpadmin.c:646 #, c-format msgid "lpadmin: Unable to connect to server: %s" msgstr "" -#: systemv/lpadmin.c:1396 +#: systemv/lpadmin.c:1446 msgid "lpadmin: Unable to create temporary file" msgstr "" -#: systemv/lpadmin.c:385 +#: systemv/lpadmin.c:403 msgid "" "lpadmin: Unable to delete option:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:1388 +#: systemv/lpadmin.c:1438 #, c-format msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d." msgstr "" -#: systemv/lpadmin.c:1408 +#: systemv/lpadmin.c:1458 #, c-format msgid "lpadmin: Unable to open PPD file \"%s\" - %s" msgstr "" -#: systemv/lpadmin.c:337 +#: systemv/lpadmin.c:355 msgid "" "lpadmin: Unable to remove a printer from the class:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:620 +#: systemv/lpadmin.c:635 msgid "" "lpadmin: Unable to set the printer options:\n" " You must specify a printer name first." msgstr "" -#: systemv/lpadmin.c:456 +#: systemv/lpadmin.c:474 #, c-format msgid "lpadmin: Unknown allow/deny option \"%s\"." msgstr "" -#: systemv/lpadmin.c:585 +#: systemv/lpadmin.c:603 #, c-format msgid "lpadmin: Unknown argument \"%s\"." msgstr "" -#: systemv/lpadmin.c:578 +#: systemv/lpadmin.c:596 #, c-format msgid "lpadmin: Unknown option \"%c\"." msgstr "" -#: systemv/lpadmin.c:554 +#: systemv/lpadmin.c:620 +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + +#: systemv/lpadmin.c:572 msgid "lpadmin: Warning - content type list ignored." msgstr "" @@ -8012,16 +8033,16 @@ msgstr "" msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:5891 +#: scheduler/ipp.c:5895 msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2078 scheduler/ipp.c:5796 +#: scheduler/ipp.c:2078 scheduler/ipp.c:5800 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:2068 scheduler/ipp.c:5786 +#: scheduler/ipp.c:2068 scheduler/ipp.c:5790 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" @@ -8537,7 +8558,7 @@ msgstr "" msgid "processing" msgstr "" -#: systemv/lp.c:666 +#: systemv/lp.c:643 #, c-format msgid "request id is %s-%d (%d file(s))" msgstr "" @@ -8879,183 +8900,183 @@ msgstr "Right Gate Fold" msgid "finishing-template.fold-z" msgstr "Z Fold" msgid "finishing-template.jdf-f10-1" -msgstr "JDF F10-1" +msgstr "JDF Fold F10-1" msgid "finishing-template.jdf-f10-2" -msgstr "JDF F10-2" +msgstr "JDF Fold F10-2" msgid "finishing-template.jdf-f10-3" -msgstr "JDF F10-3" +msgstr "JDF Fold F10-3" msgid "finishing-template.jdf-f12-1" -msgstr "JDF F12-1" +msgstr "JDF Fold F12-1" msgid "finishing-template.jdf-f12-10" -msgstr "JDF F12-10" +msgstr "JDF Fold F12-10" msgid "finishing-template.jdf-f12-11" -msgstr "JDF F12-11" +msgstr "JDF Fold F12-11" msgid "finishing-template.jdf-f12-12" -msgstr "JDF F12-12" +msgstr "JDF Fold F12-12" msgid "finishing-template.jdf-f12-13" -msgstr "JDF F12-13" +msgstr "JDF Fold F12-13" msgid "finishing-template.jdf-f12-14" -msgstr "JDF F12-14" +msgstr "JDF Fold F12-14" msgid "finishing-template.jdf-f12-2" -msgstr "JDF F12-2" +msgstr "JDF Fold F12-2" msgid "finishing-template.jdf-f12-3" -msgstr "JDF F12-3" +msgstr "JDF Fold F12-3" msgid "finishing-template.jdf-f12-4" -msgstr "JDF F12-4" +msgstr "JDF Fold F12-4" msgid "finishing-template.jdf-f12-5" -msgstr "JDF F12-5" +msgstr "JDF Fold F12-5" msgid "finishing-template.jdf-f12-6" -msgstr "JDF F12-6" +msgstr "JDF Fold F12-6" msgid "finishing-template.jdf-f12-7" -msgstr "JDF F12-7" +msgstr "JDF Fold F12-7" msgid "finishing-template.jdf-f12-8" -msgstr "JDF F12-8" +msgstr "JDF Fold F12-8" msgid "finishing-template.jdf-f12-9" -msgstr "JDF F12-9" +msgstr "JDF Fold F12-9" msgid "finishing-template.jdf-f14-1" -msgstr "JDF F14-1" +msgstr "JDF Fold F14-1" msgid "finishing-template.jdf-f16-1" -msgstr "JDF F16-1" +msgstr "JDF Fold F16-1" msgid "finishing-template.jdf-f16-10" -msgstr "JDF F16-10" +msgstr "JDF Fold F16-10" msgid "finishing-template.jdf-f16-11" -msgstr "JDF F16-11" +msgstr "JDF Fold F16-11" msgid "finishing-template.jdf-f16-12" -msgstr "JDF F16-12" +msgstr "JDF Fold F16-12" msgid "finishing-template.jdf-f16-13" -msgstr "JDF F16-13" +msgstr "JDF Fold F16-13" msgid "finishing-template.jdf-f16-14" -msgstr "JDF F16-14" +msgstr "JDF Fold F16-14" msgid "finishing-template.jdf-f16-2" -msgstr "JDF F16-2" +msgstr "JDF Fold F16-2" msgid "finishing-template.jdf-f16-3" -msgstr "JDF F16-3" +msgstr "JDF Fold F16-3" msgid "finishing-template.jdf-f16-4" -msgstr "JDF F16-4" +msgstr "JDF Fold F16-4" msgid "finishing-template.jdf-f16-5" -msgstr "JDF F16-5" +msgstr "JDF Fold F16-5" msgid "finishing-template.jdf-f16-6" -msgstr "JDF F16-6" +msgstr "JDF Fold F16-6" msgid "finishing-template.jdf-f16-7" -msgstr "JDF F16-7" +msgstr "JDF Fold F16-7" msgid "finishing-template.jdf-f16-8" -msgstr "JDF F16-8" +msgstr "JDF Fold F16-8" msgid "finishing-template.jdf-f16-9" -msgstr "JDF F16-9" +msgstr "JDF Fold F16-9" msgid "finishing-template.jdf-f18-1" -msgstr "JDF F18-1" +msgstr "JDF Fold F18-1" msgid "finishing-template.jdf-f18-2" -msgstr "JDF F18-2" +msgstr "JDF Fold F18-2" msgid "finishing-template.jdf-f18-3" -msgstr "JDF F18-3" +msgstr "JDF Fold F18-3" msgid "finishing-template.jdf-f18-4" -msgstr "JDF F18-4" +msgstr "JDF Fold F18-4" msgid "finishing-template.jdf-f18-5" -msgstr "JDF F18-5" +msgstr "JDF Fold F18-5" msgid "finishing-template.jdf-f18-6" -msgstr "JDF F18-6" +msgstr "JDF Fold F18-6" msgid "finishing-template.jdf-f18-7" -msgstr "JDF F18-7" +msgstr "JDF Fold F18-7" msgid "finishing-template.jdf-f18-8" -msgstr "JDF F18-8" +msgstr "JDF Fold F18-8" msgid "finishing-template.jdf-f18-9" -msgstr "JDF F18-9" +msgstr "JDF Fold F18-9" msgid "finishing-template.jdf-f2-1" -msgstr "JDF F2-1" +msgstr "JDF Fold F2-1" msgid "finishing-template.jdf-f20-1" -msgstr "JDF F20-1" +msgstr "JDF Fold F20-1" msgid "finishing-template.jdf-f20-2" -msgstr "JDF F20-2" +msgstr "JDF Fold F20-2" msgid "finishing-template.jdf-f24-1" -msgstr "JDF F24-1" +msgstr "JDF Fold F24-1" msgid "finishing-template.jdf-f24-10" -msgstr "JDF F24-10" +msgstr "JDF Fold F24-10" msgid "finishing-template.jdf-f24-11" -msgstr "JDF F24-11" +msgstr "JDF Fold F24-11" msgid "finishing-template.jdf-f24-2" -msgstr "JDF F24-2" +msgstr "JDF Fold F24-2" msgid "finishing-template.jdf-f24-3" -msgstr "JDF F24-3" +msgstr "JDF Fold F24-3" msgid "finishing-template.jdf-f24-4" -msgstr "JDF F24-4" +msgstr "JDF Fold F24-4" msgid "finishing-template.jdf-f24-5" -msgstr "JDF F24-5" +msgstr "JDF Fold F24-5" msgid "finishing-template.jdf-f24-6" -msgstr "JDF F24-6" +msgstr "JDF Fold F24-6" msgid "finishing-template.jdf-f24-7" -msgstr "JDF F24-7" +msgstr "JDF Fold F24-7" msgid "finishing-template.jdf-f24-8" -msgstr "JDF F24-8" +msgstr "JDF Fold F24-8" msgid "finishing-template.jdf-f24-9" -msgstr "JDF F24-9" +msgstr "JDF Fold F24-9" msgid "finishing-template.jdf-f28-1" -msgstr "JDF F28-1" +msgstr "JDF Fold F28-1" msgid "finishing-template.jdf-f32-1" -msgstr "JDF F32-1" +msgstr "JDF Fold F32-1" msgid "finishing-template.jdf-f32-2" -msgstr "JDF F32-2" +msgstr "JDF Fold F32-2" msgid "finishing-template.jdf-f32-3" -msgstr "JDF F32-3" +msgstr "JDF Fold F32-3" msgid "finishing-template.jdf-f32-4" -msgstr "JDF F32-4" +msgstr "JDF Fold F32-4" msgid "finishing-template.jdf-f32-5" -msgstr "JDF F32-5" +msgstr "JDF Fold F32-5" msgid "finishing-template.jdf-f32-6" -msgstr "JDF F32-6" +msgstr "JDF Fold F32-6" msgid "finishing-template.jdf-f32-7" -msgstr "JDF F32-7" +msgstr "JDF Fold F32-7" msgid "finishing-template.jdf-f32-8" -msgstr "JDF F32-8" +msgstr "JDF Fold F32-8" msgid "finishing-template.jdf-f32-9" -msgstr "JDF F32-9" +msgstr "JDF Fold F32-9" msgid "finishing-template.jdf-f36-1" -msgstr "JDF F36-1" +msgstr "JDF Fold F36-1" msgid "finishing-template.jdf-f36-2" -msgstr "JDF F36-2" +msgstr "JDF Fold F36-2" msgid "finishing-template.jdf-f4-1" -msgstr "JDF F4-1" +msgstr "JDF Fold F4-1" msgid "finishing-template.jdf-f4-2" -msgstr "JDF F4-2" +msgstr "JDF Fold F4-2" msgid "finishing-template.jdf-f40-1" -msgstr "JDF F40-1" +msgstr "JDF Fold F40-1" msgid "finishing-template.jdf-f48-1" -msgstr "JDF F48-1" +msgstr "JDF Fold F48-1" msgid "finishing-template.jdf-f48-2" -msgstr "JDF F48-2" +msgstr "JDF Fold F48-2" msgid "finishing-template.jdf-f6-1" -msgstr "JDF F6-1" +msgstr "JDF Fold F6-1" msgid "finishing-template.jdf-f6-2" -msgstr "JDF F6-2" +msgstr "JDF Fold F6-2" msgid "finishing-template.jdf-f6-3" -msgstr "JDF F6-3" +msgstr "JDF Fold F6-3" msgid "finishing-template.jdf-f6-4" -msgstr "JDF F6-4" +msgstr "JDF Fold F6-4" msgid "finishing-template.jdf-f6-5" -msgstr "JDF F6-5" +msgstr "JDF Fold F6-5" msgid "finishing-template.jdf-f6-6" -msgstr "JDF F6-6" +msgstr "JDF Fold F6-6" msgid "finishing-template.jdf-f6-7" -msgstr "JDF F6-7" +msgstr "JDF Fold F6-7" msgid "finishing-template.jdf-f6-8" -msgstr "JDF F6-8" +msgstr "JDF Fold F6-8" msgid "finishing-template.jdf-f64-1" -msgstr "JDF F64-1" +msgstr "JDF Fold F64-1" msgid "finishing-template.jdf-f64-2" -msgstr "JDF F64-2" +msgstr "JDF Fold F64-2" msgid "finishing-template.jdf-f8-1" -msgstr "JDF F8-1" +msgstr "JDF Fold F8-1" msgid "finishing-template.jdf-f8-2" -msgstr "JDF F8-2" +msgstr "JDF Fold F8-2" msgid "finishing-template.jdf-f8-3" -msgstr "JDF F8-3" +msgstr "JDF Fold F8-3" msgid "finishing-template.jdf-f8-4" -msgstr "JDF F8-4" +msgstr "JDF Fold F8-4" msgid "finishing-template.jdf-f8-5" -msgstr "JDF F8-5" +msgstr "JDF Fold F8-5" msgid "finishing-template.jdf-f8-6" -msgstr "JDF F8-6" +msgstr "JDF Fold F8-6" msgid "finishing-template.jdf-f8-7" -msgstr "JDF F8-7" +msgstr "JDF Fold F8-7" msgid "finishing-template.jog-offset" msgstr "Jog Offset" msgid "finishing-template.laminate" @@ -10055,41 +10076,41 @@ msgstr "Media Name" msgid "media-source" msgstr "Media Source" msgid "media-source.alternate" -msgstr "Alternate" +msgstr "Alternate Tray" msgid "media-source.alternate-roll" msgstr "Alternate Roll" msgid "media-source.auto" -msgstr "Automatic" +msgstr "Automatic Tray" msgid "media-source.bottom" -msgstr "Bottom" +msgstr "Bottom Tray" msgid "media-source.by-pass-tray" msgstr "By-pass Tray" msgid "media-source.center" -msgstr "Center" +msgstr "Center Tray" msgid "media-source.disc" -msgstr "Disc" +msgstr "Disc Feed" msgid "media-source.envelope" -msgstr "Envelope" +msgstr "Envelope Feed" msgid "media-source.hagaki" -msgstr "Hagaki" +msgstr "Hagaki Feed" msgid "media-source.large-capacity" -msgstr "Large Capacity" +msgstr "Large Capacity Tray" msgid "media-source.left" -msgstr "Left" +msgstr "Left Tray" msgid "media-source.main" -msgstr "Main" +msgstr "Main Tray" msgid "media-source.main-roll" msgstr "Main Roll" msgid "media-source.manual" -msgstr "Manual" +msgstr "Manual Feed" msgid "media-source.middle" -msgstr "Middle" +msgstr "Middle Tray" msgid "media-source.photo" -msgstr "Photo" +msgstr "Photo Tray" msgid "media-source.rear" -msgstr "Rear" +msgstr "Rear Tray" msgid "media-source.right" -msgstr "Right" +msgstr "Right Tray" msgid "media-source.roll-1" msgstr "Roll 1" msgid "media-source.roll-10" @@ -10161,7 +10182,7 @@ msgstr "Media Tooth (Texture)" msgid "media-tooth.antique" msgstr "Antique" msgid "media-tooth.calendared" -msgstr "Calendared" +msgstr "Extra Smooth" msgid "media-tooth.coarse" msgstr "Coarse" msgid "media-tooth.fine" @@ -10175,7 +10196,7 @@ msgstr "Smooth" msgid "media-tooth.stipple" msgstr "Stipple" msgid "media-tooth.uncalendared" -msgstr "Uncalendared" +msgstr "Rough" msgid "media-tooth.vellum" msgstr "Vellum" msgid "media-top-margin" @@ -10194,6 +10215,32 @@ msgid "media-type.cardstock" msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" msgid "media-type.continuous" msgstr "Continuous" msgid "media-type.continuous-long" @@ -10290,6 +10337,14 @@ msgid "media-type.image-setter-paper" msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" msgid "media-type.labels" msgstr "Labels" msgid "media-type.labels-colored" diff --git a/locale/cups.strings b/locale/cups.strings index bd94a3d..0ba8344 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -366,6 +366,7 @@ "%s: Bad printer URI \"%s\"." = "%s: Bad printer URI “%s”."; "%s: Bad version %s for \"-V\"." = "%s: Bad version %s for “-V”."; "%s: Don't know what to do." = "%s: Don’t know what to do."; +"%s: Error - %s" = "%s: Error - %s"; "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination “%s”."; "%s: Error - add '/version=1.1' to server name." = "%s: Error - add ‘/version=1.1’ to server name."; "%s: Error - bad job ID." = "%s: Error - bad job ID."; @@ -967,6 +968,7 @@ "Fold" = "Fold"; "Folio" = "Folio"; "Forbidden" = "Forbidden"; +"Found" = "Found"; "Full Cut Tabs" = "Full Cut Tabs"; "Gate Fold" = "Gate Fold"; "General" = "General"; @@ -1787,6 +1789,8 @@ "lpadmin: Printer %s is already a member of class %s." = "lpadmin: Printer %s is already a member of class %s."; "lpadmin: Printer %s is not a member of class %s." = "lpadmin: Printer %s is not a member of class %s."; "lpadmin: Printer name can only contain printable characters." = "lpadmin: Printer name can only contain printable characters."; +"lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS." = "lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS."; +"lpadmin: System V interface scripts are no longer supported for security reasons." = "lpadmin: System V interface scripts are no longer supported for security reasons."; "lpadmin: Unable to add a printer to the class:\n You must specify a printer name first." = "lpadmin: Unable to add a printer to the class:\n You must specify a printer name first."; "lpadmin: Unable to connect to server: %s" = "lpadmin: Unable to connect to server: %s"; "lpadmin: Unable to create temporary file" = "lpadmin: Unable to create temporary file"; @@ -1798,6 +1802,7 @@ "lpadmin: Unknown allow/deny option \"%s\"." = "lpadmin: Unknown allow/deny option “%s”."; "lpadmin: Unknown argument \"%s\"." = "lpadmin: Unknown argument “%s”."; "lpadmin: Unknown option \"%c\"." = "lpadmin: Unknown option “%c”."; +"lpadmin: Use the 'everywhere' model for shared printers." = "lpadmin: Use the ‘everywhere’ model for shared printers."; "lpadmin: Warning - content type list ignored." = "lpadmin: Warning - content type list ignored."; "lpc> " = "lpc> "; "lpinfo: Expected 1284 device ID string after \"--device-id\"." = "lpinfo: Expected 1284 device ID string after “--device-id”."; @@ -2080,95 +2085,95 @@ "finishing-template.fold-poster" = "Poster Fold"; "finishing-template.fold-right-gate" = "Right Gate Fold"; "finishing-template.fold-z" = "Z Fold"; -"finishing-template.jdf-f10-1" = "JDF F10-1"; -"finishing-template.jdf-f10-2" = "JDF F10-2"; -"finishing-template.jdf-f10-3" = "JDF F10-3"; -"finishing-template.jdf-f12-1" = "JDF F12-1"; -"finishing-template.jdf-f12-10" = "JDF F12-10"; -"finishing-template.jdf-f12-11" = "JDF F12-11"; -"finishing-template.jdf-f12-12" = "JDF F12-12"; -"finishing-template.jdf-f12-13" = "JDF F12-13"; -"finishing-template.jdf-f12-14" = "JDF F12-14"; -"finishing-template.jdf-f12-2" = "JDF F12-2"; -"finishing-template.jdf-f12-3" = "JDF F12-3"; -"finishing-template.jdf-f12-4" = "JDF F12-4"; -"finishing-template.jdf-f12-5" = "JDF F12-5"; -"finishing-template.jdf-f12-6" = "JDF F12-6"; -"finishing-template.jdf-f12-7" = "JDF F12-7"; -"finishing-template.jdf-f12-8" = "JDF F12-8"; -"finishing-template.jdf-f12-9" = "JDF F12-9"; -"finishing-template.jdf-f14-1" = "JDF F14-1"; -"finishing-template.jdf-f16-1" = "JDF F16-1"; -"finishing-template.jdf-f16-10" = "JDF F16-10"; -"finishing-template.jdf-f16-11" = "JDF F16-11"; -"finishing-template.jdf-f16-12" = "JDF F16-12"; -"finishing-template.jdf-f16-13" = "JDF F16-13"; -"finishing-template.jdf-f16-14" = "JDF F16-14"; -"finishing-template.jdf-f16-2" = "JDF F16-2"; -"finishing-template.jdf-f16-3" = "JDF F16-3"; -"finishing-template.jdf-f16-4" = "JDF F16-4"; -"finishing-template.jdf-f16-5" = "JDF F16-5"; -"finishing-template.jdf-f16-6" = "JDF F16-6"; -"finishing-template.jdf-f16-7" = "JDF F16-7"; -"finishing-template.jdf-f16-8" = "JDF F16-8"; -"finishing-template.jdf-f16-9" = "JDF F16-9"; -"finishing-template.jdf-f18-1" = "JDF F18-1"; -"finishing-template.jdf-f18-2" = "JDF F18-2"; -"finishing-template.jdf-f18-3" = "JDF F18-3"; -"finishing-template.jdf-f18-4" = "JDF F18-4"; -"finishing-template.jdf-f18-5" = "JDF F18-5"; -"finishing-template.jdf-f18-6" = "JDF F18-6"; -"finishing-template.jdf-f18-7" = "JDF F18-7"; -"finishing-template.jdf-f18-8" = "JDF F18-8"; -"finishing-template.jdf-f18-9" = "JDF F18-9"; -"finishing-template.jdf-f2-1" = "JDF F2-1"; -"finishing-template.jdf-f20-1" = "JDF F20-1"; -"finishing-template.jdf-f20-2" = "JDF F20-2"; -"finishing-template.jdf-f24-1" = "JDF F24-1"; -"finishing-template.jdf-f24-10" = "JDF F24-10"; -"finishing-template.jdf-f24-11" = "JDF F24-11"; -"finishing-template.jdf-f24-2" = "JDF F24-2"; -"finishing-template.jdf-f24-3" = "JDF F24-3"; -"finishing-template.jdf-f24-4" = "JDF F24-4"; -"finishing-template.jdf-f24-5" = "JDF F24-5"; -"finishing-template.jdf-f24-6" = "JDF F24-6"; -"finishing-template.jdf-f24-7" = "JDF F24-7"; -"finishing-template.jdf-f24-8" = "JDF F24-8"; -"finishing-template.jdf-f24-9" = "JDF F24-9"; -"finishing-template.jdf-f28-1" = "JDF F28-1"; -"finishing-template.jdf-f32-1" = "JDF F32-1"; -"finishing-template.jdf-f32-2" = "JDF F32-2"; -"finishing-template.jdf-f32-3" = "JDF F32-3"; -"finishing-template.jdf-f32-4" = "JDF F32-4"; -"finishing-template.jdf-f32-5" = "JDF F32-5"; -"finishing-template.jdf-f32-6" = "JDF F32-6"; -"finishing-template.jdf-f32-7" = "JDF F32-7"; -"finishing-template.jdf-f32-8" = "JDF F32-8"; -"finishing-template.jdf-f32-9" = "JDF F32-9"; -"finishing-template.jdf-f36-1" = "JDF F36-1"; -"finishing-template.jdf-f36-2" = "JDF F36-2"; -"finishing-template.jdf-f4-1" = "JDF F4-1"; -"finishing-template.jdf-f4-2" = "JDF F4-2"; -"finishing-template.jdf-f40-1" = "JDF F40-1"; -"finishing-template.jdf-f48-1" = "JDF F48-1"; -"finishing-template.jdf-f48-2" = "JDF F48-2"; -"finishing-template.jdf-f6-1" = "JDF F6-1"; -"finishing-template.jdf-f6-2" = "JDF F6-2"; -"finishing-template.jdf-f6-3" = "JDF F6-3"; -"finishing-template.jdf-f6-4" = "JDF F6-4"; -"finishing-template.jdf-f6-5" = "JDF F6-5"; -"finishing-template.jdf-f6-6" = "JDF F6-6"; -"finishing-template.jdf-f6-7" = "JDF F6-7"; -"finishing-template.jdf-f6-8" = "JDF F6-8"; -"finishing-template.jdf-f64-1" = "JDF F64-1"; -"finishing-template.jdf-f64-2" = "JDF F64-2"; -"finishing-template.jdf-f8-1" = "JDF F8-1"; -"finishing-template.jdf-f8-2" = "JDF F8-2"; -"finishing-template.jdf-f8-3" = "JDF F8-3"; -"finishing-template.jdf-f8-4" = "JDF F8-4"; -"finishing-template.jdf-f8-5" = "JDF F8-5"; -"finishing-template.jdf-f8-6" = "JDF F8-6"; -"finishing-template.jdf-f8-7" = "JDF F8-7"; +"finishing-template.jdf-f10-1" = "JDF Fold F10-1"; +"finishing-template.jdf-f10-2" = "JDF Fold F10-2"; +"finishing-template.jdf-f10-3" = "JDF Fold F10-3"; +"finishing-template.jdf-f12-1" = "JDF Fold F12-1"; +"finishing-template.jdf-f12-10" = "JDF Fold F12-10"; +"finishing-template.jdf-f12-11" = "JDF Fold F12-11"; +"finishing-template.jdf-f12-12" = "JDF Fold F12-12"; +"finishing-template.jdf-f12-13" = "JDF Fold F12-13"; +"finishing-template.jdf-f12-14" = "JDF Fold F12-14"; +"finishing-template.jdf-f12-2" = "JDF Fold F12-2"; +"finishing-template.jdf-f12-3" = "JDF Fold F12-3"; +"finishing-template.jdf-f12-4" = "JDF Fold F12-4"; +"finishing-template.jdf-f12-5" = "JDF Fold F12-5"; +"finishing-template.jdf-f12-6" = "JDF Fold F12-6"; +"finishing-template.jdf-f12-7" = "JDF Fold F12-7"; +"finishing-template.jdf-f12-8" = "JDF Fold F12-8"; +"finishing-template.jdf-f12-9" = "JDF Fold F12-9"; +"finishing-template.jdf-f14-1" = "JDF Fold F14-1"; +"finishing-template.jdf-f16-1" = "JDF Fold F16-1"; +"finishing-template.jdf-f16-10" = "JDF Fold F16-10"; +"finishing-template.jdf-f16-11" = "JDF Fold F16-11"; +"finishing-template.jdf-f16-12" = "JDF Fold F16-12"; +"finishing-template.jdf-f16-13" = "JDF Fold F16-13"; +"finishing-template.jdf-f16-14" = "JDF Fold F16-14"; +"finishing-template.jdf-f16-2" = "JDF Fold F16-2"; +"finishing-template.jdf-f16-3" = "JDF Fold F16-3"; +"finishing-template.jdf-f16-4" = "JDF Fold F16-4"; +"finishing-template.jdf-f16-5" = "JDF Fold F16-5"; +"finishing-template.jdf-f16-6" = "JDF Fold F16-6"; +"finishing-template.jdf-f16-7" = "JDF Fold F16-7"; +"finishing-template.jdf-f16-8" = "JDF Fold F16-8"; +"finishing-template.jdf-f16-9" = "JDF Fold F16-9"; +"finishing-template.jdf-f18-1" = "JDF Fold F18-1"; +"finishing-template.jdf-f18-2" = "JDF Fold F18-2"; +"finishing-template.jdf-f18-3" = "JDF Fold F18-3"; +"finishing-template.jdf-f18-4" = "JDF Fold F18-4"; +"finishing-template.jdf-f18-5" = "JDF Fold F18-5"; +"finishing-template.jdf-f18-6" = "JDF Fold F18-6"; +"finishing-template.jdf-f18-7" = "JDF Fold F18-7"; +"finishing-template.jdf-f18-8" = "JDF Fold F18-8"; +"finishing-template.jdf-f18-9" = "JDF Fold F18-9"; +"finishing-template.jdf-f2-1" = "JDF Fold F2-1"; +"finishing-template.jdf-f20-1" = "JDF Fold F20-1"; +"finishing-template.jdf-f20-2" = "JDF Fold F20-2"; +"finishing-template.jdf-f24-1" = "JDF Fold F24-1"; +"finishing-template.jdf-f24-10" = "JDF Fold F24-10"; +"finishing-template.jdf-f24-11" = "JDF Fold F24-11"; +"finishing-template.jdf-f24-2" = "JDF Fold F24-2"; +"finishing-template.jdf-f24-3" = "JDF Fold F24-3"; +"finishing-template.jdf-f24-4" = "JDF Fold F24-4"; +"finishing-template.jdf-f24-5" = "JDF Fold F24-5"; +"finishing-template.jdf-f24-6" = "JDF Fold F24-6"; +"finishing-template.jdf-f24-7" = "JDF Fold F24-7"; +"finishing-template.jdf-f24-8" = "JDF Fold F24-8"; +"finishing-template.jdf-f24-9" = "JDF Fold F24-9"; +"finishing-template.jdf-f28-1" = "JDF Fold F28-1"; +"finishing-template.jdf-f32-1" = "JDF Fold F32-1"; +"finishing-template.jdf-f32-2" = "JDF Fold F32-2"; +"finishing-template.jdf-f32-3" = "JDF Fold F32-3"; +"finishing-template.jdf-f32-4" = "JDF Fold F32-4"; +"finishing-template.jdf-f32-5" = "JDF Fold F32-5"; +"finishing-template.jdf-f32-6" = "JDF Fold F32-6"; +"finishing-template.jdf-f32-7" = "JDF Fold F32-7"; +"finishing-template.jdf-f32-8" = "JDF Fold F32-8"; +"finishing-template.jdf-f32-9" = "JDF Fold F32-9"; +"finishing-template.jdf-f36-1" = "JDF Fold F36-1"; +"finishing-template.jdf-f36-2" = "JDF Fold F36-2"; +"finishing-template.jdf-f4-1" = "JDF Fold F4-1"; +"finishing-template.jdf-f4-2" = "JDF Fold F4-2"; +"finishing-template.jdf-f40-1" = "JDF Fold F40-1"; +"finishing-template.jdf-f48-1" = "JDF Fold F48-1"; +"finishing-template.jdf-f48-2" = "JDF Fold F48-2"; +"finishing-template.jdf-f6-1" = "JDF Fold F6-1"; +"finishing-template.jdf-f6-2" = "JDF Fold F6-2"; +"finishing-template.jdf-f6-3" = "JDF Fold F6-3"; +"finishing-template.jdf-f6-4" = "JDF Fold F6-4"; +"finishing-template.jdf-f6-5" = "JDF Fold F6-5"; +"finishing-template.jdf-f6-6" = "JDF Fold F6-6"; +"finishing-template.jdf-f6-7" = "JDF Fold F6-7"; +"finishing-template.jdf-f6-8" = "JDF Fold F6-8"; +"finishing-template.jdf-f64-1" = "JDF Fold F64-1"; +"finishing-template.jdf-f64-2" = "JDF Fold F64-2"; +"finishing-template.jdf-f8-1" = "JDF Fold F8-1"; +"finishing-template.jdf-f8-2" = "JDF Fold F8-2"; +"finishing-template.jdf-f8-3" = "JDF Fold F8-3"; +"finishing-template.jdf-f8-4" = "JDF Fold F8-4"; +"finishing-template.jdf-f8-5" = "JDF Fold F8-5"; +"finishing-template.jdf-f8-6" = "JDF Fold F8-6"; +"finishing-template.jdf-f8-7" = "JDF Fold F8-7"; "finishing-template.jog-offset" = "Jog Offset"; "finishing-template.laminate" = "Laminate"; "finishing-template.punch" = "Punch"; @@ -2668,24 +2673,24 @@ "media-size" = "Media Dimensions"; "media-size-name" = "Media Name"; "media-source" = "Media Source"; -"media-source.alternate" = "Alternate"; +"media-source.alternate" = "Alternate Tray"; "media-source.alternate-roll" = "Alternate Roll"; -"media-source.auto" = "Automatic"; -"media-source.bottom" = "Bottom"; +"media-source.auto" = "Automatic Tray"; +"media-source.bottom" = "Bottom Tray"; "media-source.by-pass-tray" = "By-pass Tray"; -"media-source.center" = "Center"; -"media-source.disc" = "Disc"; -"media-source.envelope" = "Envelope"; -"media-source.hagaki" = "Hagaki"; -"media-source.large-capacity" = "Large Capacity"; -"media-source.left" = "Left"; -"media-source.main" = "Main"; +"media-source.center" = "Center Tray"; +"media-source.disc" = "Disc Feed"; +"media-source.envelope" = "Envelope Feed"; +"media-source.hagaki" = "Hagaki Feed"; +"media-source.large-capacity" = "Large Capacity Tray"; +"media-source.left" = "Left Tray"; +"media-source.main" = "Main Tray"; "media-source.main-roll" = "Main Roll"; -"media-source.manual" = "Manual"; -"media-source.middle" = "Middle"; -"media-source.photo" = "Photo"; -"media-source.rear" = "Rear"; -"media-source.right" = "Right"; +"media-source.manual" = "Manual Feed"; +"media-source.middle" = "Middle Tray"; +"media-source.photo" = "Photo Tray"; +"media-source.rear" = "Rear Tray"; +"media-source.right" = "Right Tray"; "media-source.roll-1" = "Roll 1"; "media-source.roll-10" = "Roll 10"; "media-source.roll-2" = "Roll 2"; @@ -2721,14 +2726,14 @@ "media-thickness" = "Media Thickness"; "media-tooth" = "Media Tooth (Texture)"; "media-tooth.antique" = "Antique"; -"media-tooth.calendared" = "Calendared"; +"media-tooth.calendared" = "Extra Smooth"; "media-tooth.coarse" = "Coarse"; "media-tooth.fine" = "Fine"; "media-tooth.linen" = "Linen"; "media-tooth.medium" = "Medium"; "media-tooth.smooth" = "Smooth"; "media-tooth.stipple" = "Stipple"; -"media-tooth.uncalendared" = "Uncalendared"; +"media-tooth.uncalendared" = "Rough"; "media-tooth.vellum" = "Vellum"; "media-top-margin" = "Media Top Margin"; "media-type" = "Media Type"; @@ -2738,6 +2743,19 @@ "media-type.cardboard" = "Cardboard"; "media-type.cardstock" = "Cardstock"; "media-type.cd" = "CD"; +"media-type.com.hp.advanced-photo" = "Advanced Photo Paper"; +"media-type.com.hp.brochure-glossy" = "Glossy Brochure Paper"; +"media-type.com.hp.brochure-matte" = "Matte Brochure Paper"; +"media-type.com.hp.cover-matte" = "Matte Cover Paper"; +"media-type.com.hp.ecosmart-lite" = "Office Recycled Paper"; +"media-type.com.hp.everyday-glossy" = "Everyday Glossy Photo Paper"; +"media-type.com.hp.everyday-matte" = "Everyday Matte Paper"; +"media-type.com.hp.extra-heavy" = "Extra Heavyweight Paper"; +"media-type.com.hp.intermediate" = "Multipurpose Paper"; +"media-type.com.hp.mid-weight" = "Mid-Weight Paper"; +"media-type.com.hp.premium-inkjet" = "Premium Inkjet Paper"; +"media-type.com.hp.premium-photo" = "Premium Photo Glossy Paper"; +"media-type.com.hp.premium-presentation-matte" = "Premium Presentation Matte Paper"; "media-type.continuous" = "Continuous"; "media-type.continuous-long" = "Continuous Long"; "media-type.continuous-short" = "Continuous Short"; @@ -2786,6 +2804,10 @@ "media-type.gravure-cylinder" = "Gravure Cylinder"; "media-type.image-setter-paper" = "Image Setter Paper"; "media-type.imaging-cylinder" = "Imaging Cylinder"; +"media-type.jp.co.canon_photo-paper-plus-glossy-ii" = "Photo Paper Plus Glossy II"; +"media-type.jp.co.canon_photo-paper-pro-platinum" = "Photo Paper Pro Platinum"; +"media-type.jp.co.canon-photo-paper-plus-glossy-ii" = "Photo Paper Plus Glossy II"; +"media-type.jp.co.canon-photo-paper-pro-platinum" = "Photo Paper Pro Platinum"; "media-type.labels" = "Labels"; "media-type.labels-colored" = "Colored Labels"; "media-type.labels-glossy" = "Glossy Labels"; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index cedbf3a..1627451 100644 --- a/locale/cups_ca.po +++ b/locale/cups_ca.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -1640,6 +1640,10 @@ msgid "%s: Don't know what to do." msgstr "%s: no sé que fer." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3598,6 +3602,9 @@ msgstr "Foli" msgid "Forbidden" msgstr "Prohibit" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -8012,6 +8019,16 @@ msgstr "" "lpadmin: el nom de la impressora només pot contenir caràcters imprimibles." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8066,6 +8083,9 @@ msgstr "lpadmin: l'argument «%s» és desconegut." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: l'opció «%c» és desconeguda." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: avís - s'ignora el contingut de la llista de tipus." @@ -8817,6 +8837,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8961,6 +9020,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_cs.po b/locale/cups_cs.po index 0f53414..fe2ebe9 100644 --- a/locale/cups_cs.po +++ b/locale/cups_cs.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2012-09-14 10:26+0100\n" "Last-Translator: Jan Bartos \n" "Language-Team: Czech\n" @@ -1463,6 +1463,10 @@ msgid "%s: Don't know what to do." msgstr "" #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3396,6 +3400,9 @@ msgstr "Fólie" msgid "Forbidden" msgstr "Zakázaný" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -7741,6 +7748,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "" msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -7787,6 +7804,9 @@ msgstr "" msgid "lpadmin: Unknown option \"%c\"." msgstr "" +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "" @@ -8530,6 +8550,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8674,6 +8733,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_de.po b/locale/cups_de.po index 322c936..bf834cc 100644 --- a/locale/cups_de.po +++ b/locale/cups_de.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2017-10-25 14:57+0200\n" "Last-Translator: Michael Weghorn \n" "Language-Team: LANGUAGE \n" @@ -1527,6 +1527,10 @@ msgid "%s: Don't know what to do." msgstr "%s: Unklar was zu tun ist." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3476,6 +3480,9 @@ msgstr "Folio" msgid "Forbidden" msgstr "Verboten" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -7873,6 +7880,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "lpadmin: Druckername darf nur druckbare Zeichen enthalten." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -7925,6 +7942,9 @@ msgstr "lpadmin: unbekanntes Argument \"%s\"." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: Unbekannte Option »%c«." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: Warnung - Inhaltstypliste ignoriert." @@ -8668,6 +8688,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8812,6 +8871,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_es.po b/locale/cups_es.po index ef2c2d6..63eacfb 100644 --- a/locale/cups_es.po +++ b/locale/cups_es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.2\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2016-06-26 21:17+0100\n" "Last-Translator: Juan Pablo González Riopedre \n" "Language-Team: Spanish\n" @@ -1670,6 +1670,10 @@ msgid "%s: Don't know what to do." msgstr "%s: No sé que hay que hacer." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3628,6 +3632,9 @@ msgstr "Folio" msgid "Forbidden" msgstr "Prohibido" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -5933,8 +5940,8 @@ msgstr "Uso: cupstestdsc [opciones] nombre_archivo.ps [... nombre_archivo.ps]" msgid "" "Usage: cupstestppd [options] filename1.ppd[.gz] [... filenameN.ppd[.gz]]" msgstr "" -"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN." -"ppd[.gz]]" +"Uso: cupstestppd [opciones] nombre_archivo1.ppd[.gz] [... nombre_archivoN.ppd" +"[.gz]]" msgid "" "Usage: ippfind [options] regtype[,subtype][.domain.] ... [expression]\n" @@ -8062,6 +8069,16 @@ msgstr "" "imprimibles." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8117,6 +8134,9 @@ msgstr "lpadmin: Argumento \"%s\" desconocido." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: Opción \"%c\" desconocida." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: Advertencia - lista de tipo de contenido no tenida en cuenta." @@ -8863,6 +8883,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -9007,6 +9066,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_fr.po b/locale/cups_fr.po index e551e8c..341551b 100644 --- a/locale/cups_fr.po +++ b/locale/cups_fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: Stéphane Blondon \n" "Language-Team: LANGUAGE \n" @@ -1523,6 +1523,10 @@ msgid "%s: Don't know what to do." msgstr "%s : ne sait pas quoi faire." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3458,6 +3462,9 @@ msgstr "Folio" msgid "Forbidden" msgstr "Interdit" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -7808,6 +7815,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "" msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -7854,6 +7871,9 @@ msgstr "" msgid "lpadmin: Unknown option \"%c\"." msgstr "" +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "" @@ -8597,6 +8617,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8741,6 +8800,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_it.po b/locale/cups_it.po index 2a54532..3acab47 100644 --- a/locale/cups_it.po +++ b/locale/cups_it.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2013-07-14 12:00+0200\n" "Last-Translator: Giovanni Scafora \n" "Language-Team: Arch Linux Italian Team \n" @@ -1665,6 +1665,10 @@ msgid "%s: Don't know what to do." msgstr "%s: non so cosa fare." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3626,6 +3630,9 @@ msgstr "Foglio" msgid "Forbidden" msgstr "Vietato" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -8034,6 +8041,16 @@ msgstr "" "lpadmin: il nome della stampante può contenere solo caratteri stampabili." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8088,6 +8105,9 @@ msgstr "lpadmin: argomento sconosciuto \"%s\"." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: opzione sconosciuta \"%c\"." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: attenzione - contenuto nell'elenco tipo ignorato." @@ -8834,6 +8854,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8978,6 +9037,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 935ccfb..a07da5f 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2014-11-15 19:27+0900\n" "Last-Translator: OPFC TRANSCUPS \n" "Language-Team: OPFC TRANSCUPS \n" @@ -1641,6 +1641,10 @@ msgid "%s: Don't know what to do." msgstr "%s: 何が起きているか不明です。" #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています。" @@ -3600,6 +3604,9 @@ msgstr "フォリオ" msgid "Forbidden" msgstr "Forbidden" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -7996,6 +8003,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "lpadmin: プリンター名には表示可能文字だけが使用できます。" msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8050,6 +8067,9 @@ msgstr "lpadmin: \"%s\" は未知の引数です。" msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: \"%c\" は未知のオプションです。" +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: 警告 - コンテンツタイプリストは無視されます。" @@ -8803,6 +8823,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8947,6 +9006,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_pt_BR.po b/locale/cups_pt_BR.po index b463fee..89d1a34 100644 --- a/locale/cups_pt_BR.po +++ b/locale/cups_pt_BR.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.1.2\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2016-01-31 16:45-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" @@ -1674,6 +1674,10 @@ msgid "%s: Don't know what to do." msgstr "%s: Não sei o que fazer." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3629,6 +3633,9 @@ msgstr "Fólio" msgid "Forbidden" msgstr "Proibido" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -8039,6 +8046,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "lpadmin: Nome da impressora só pode conter caracteres imprimíveis." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8093,6 +8110,9 @@ msgstr "lpadmin: Argumento desconhecido \"%s\"." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: Opção desconhecida \"%c\"." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: Aviso - lista de tipos de conteúdos ignorada." @@ -8838,6 +8858,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8982,6 +9041,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 5eef074..c801f06 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2015-01-28 12:00-0800\n" "Last-Translator: Aleksandr Proklov\n" "Language-Team: PuppyRus Linux Team\n" @@ -1602,6 +1602,10 @@ msgid "%s: Don't know what to do." msgstr "%s: Дальнейшие действия неизвестны." #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" @@ -3557,6 +3561,9 @@ msgstr "Фолио" msgid "Forbidden" msgstr "Запрещено" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "" @@ -7949,6 +7956,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "lpadmin: Имя принтера может содержать только печатаемые символы." msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -8003,6 +8020,9 @@ msgstr "lpadmin: Неизвестный аргумент \"%s\"." msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin: Неизвестный параметр \"%c\"." +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin: Внимание - список типов содержимого пропущен." @@ -8748,6 +8768,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8892,6 +8951,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/locale/cups_zh_CN.po b/locale/cups_zh_CN.po index 7110146..ae34e8a 100644 --- a/locale/cups_zh_CN.po +++ b/locale/cups_zh_CN.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" -"POT-Creation-Date: 2017-10-23 17:48-0400\n" +"POT-Creation-Date: 2018-03-19 18:36-0400\n" "PO-Revision-Date: 2017-06-11 12:38+0800\n" "Last-Translator: Mingcong Bai \n" "Language-Team: \n" @@ -1596,6 +1596,10 @@ msgid "%s: Don't know what to do." msgstr "%s：不知如何处理。" #, c-format +msgid "%s: Error - %s" +msgstr "" + +#, c-format msgid "" "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "%s：错误 — %s 环境变量指定了不存在的目的地“%s”。" @@ -3539,6 +3543,9 @@ msgstr "对开本" msgid "Forbidden" msgstr "已禁止" +msgid "Found" +msgstr "" + msgid "Full Cut Tabs" msgstr "完整裁剪标签" @@ -7904,6 +7911,16 @@ msgid "lpadmin: Printer name can only contain printable characters." msgstr "lpadmin：打印机名称中只能包含可打印字符。" msgid "" +"lpadmin: Raw queues are deprecated and will stop working in a future version " +"of CUPS." +msgstr "" + +msgid "" +"lpadmin: System V interface scripts are no longer supported for security " +"reasons." +msgstr "" + +msgid "" "lpadmin: Unable to add a printer to the class:\n" " You must specify a printer name first." msgstr "" @@ -7958,6 +7975,9 @@ msgstr "lpadmin：未知参数“%s”。" msgid "lpadmin: Unknown option \"%c\"." msgstr "lpadmin：未知选项“%c”。" +msgid "lpadmin: Use the 'everywhere' model for shared printers." +msgstr "" + msgid "lpadmin: Warning - content type list ignored." msgstr "lpadmin：警告 — 内容类型列表已被忽略。" @@ -8701,6 +8721,45 @@ msgstr "Cardstock" msgid "media-type.cd" msgstr "CD" +msgid "media-type.com.hp.advanced-photo" +msgstr "Advanced Photo Paper" + +msgid "media-type.com.hp.brochure-glossy" +msgstr "Glossy Brochure Paper" + +msgid "media-type.com.hp.brochure-matte" +msgstr "Matte Brochure Paper" + +msgid "media-type.com.hp.cover-matte" +msgstr "Matte Cover Paper" + +msgid "media-type.com.hp.ecosmart-lite" +msgstr "Office Recycled Paper" + +msgid "media-type.com.hp.everyday-glossy" +msgstr "Everyday Glossy Photo Paper" + +msgid "media-type.com.hp.everyday-matte" +msgstr "Everyday Matte Paper" + +msgid "media-type.com.hp.extra-heavy" +msgstr "Extra Heavyweight Paper" + +msgid "media-type.com.hp.intermediate" +msgstr "Multipurpose Paper" + +msgid "media-type.com.hp.mid-weight" +msgstr "Mid-Weight Paper" + +msgid "media-type.com.hp.premium-inkjet" +msgstr "Premium Inkjet Paper" + +msgid "media-type.com.hp.premium-photo" +msgstr "Premium Photo Glossy Paper" + +msgid "media-type.com.hp.premium-presentation-matte" +msgstr "Premium Presentation Matte Paper" + msgid "media-type.continuous" msgstr "Continuous" @@ -8845,6 +8904,18 @@ msgstr "Image Setter Paper" msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon-photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + +msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" +msgstr "Photo Paper Plus Glossy II" + +msgid "media-type.jp.co.canon_photo-paper-pro-platinum" +msgstr "Photo Paper Pro Platinum" + msgid "media-type.labels" msgstr "Labels" diff --git a/man/lpadmin.man b/man/lpadmin.man index 1760728..c4f01ec 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,8 +1,8 @@ .\" .\" lpadmin man page for CUPS. .\" -.\" Copyright 2007-2016 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Apple Inc. and are protected by Federal copyright @@ -10,7 +10,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 lpadmin 8 "CUPS" "29 March 2016" "Apple Inc." +.TH lpadmin 8 "CUPS" "19 March 2018" "Apple Inc." .SH NAME lpadmin \- configure cups printers and classes .SH SYNOPSIS @@ -91,6 +91,7 @@ Use the \fI-m\fR option with the .BR lpinfo (8) command to get a list of supported models. The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP \fIdevice-uri\fR. +Note: The "raw" model is deprecated and will not be supported in a future version of CUPS. .TP 5 \fB\-o cupsIPPSupplies=true\fR .TP 5 diff --git a/packaging/cups.spec b/packaging/cups.spec index 1c19c4e..d582489 100644 --- a/packaging/cups.spec +++ b/packaging/cups.spec @@ -43,12 +43,12 @@ Summary: CUPS Name: cups -Version: 2.2.6 +Version: 2.2.7 Release: 0 Epoch: 1 License: GPL Group: System Environment/Daemons -Source: https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz +Source: https://github.com/apple/cups/releases/download/v2.2.7/cups-2.2.7-source.tar.gz Url: http://www.cups.org Packager: Anonymous Vendor: Example Corp diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index c791d30..859f160 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -1,7 +1,7 @@ // // Shared message catalog class for the CUPS PPD Compiler. // -// Copyright 2007-2016 by Apple Inc. +// Copyright 2007-2017 by Apple Inc. // Copyright 2002-2006 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -58,7 +58,7 @@ ppdcCatalog::ppdcCatalog(const char *l, // I - Locale filename = new ppdcString(f); messages = new ppdcArray(); - if (l) + if (l && strcmp(l, "en")) { // Try loading the base messages for this locale... char pofile[1024]; // Message catalog file diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 89c75fe..58c6475 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -143,6 +143,7 @@ Version "2.1" Throughput 8 ManualCopies Yes ColorDevice No + Attribute "cupsSNMPSupplies" "" "false" HWMargins 2 14.9 2 14.9 @@ -437,6 +438,7 @@ Version "2.1" ModelNumber $INTELLITECH_PCL Throughput 8 ColorDevice No + Attribute "cupsSNMPSupplies" "" "false" HWMargins 0 5.76 0 5.76 VariablePaperSize Yes @@ -588,6 +590,7 @@ Version "2.1" DriverType label Throughput 8 ColorDevice False + Attribute "cupsSNMPSupplies" "" "false" // Zebra CPCL Label Printer { diff --git a/scheduler/auth.c b/scheduler/auth.c index 14a07ae..8b134b5 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1146,7 +1146,8 @@ cupsdCheckGroup( const char *groupname) /* I - Group name */ { int i; /* Looping var */ - struct group *group; /* System group info */ + struct group *group; /* Group info */ + gid_t groupid; /* ID of named group */ #ifdef HAVE_MBR_UID_TO_UUID uuid_t useruuid, /* UUID for username */ groupuuid; /* UUID for groupname */ @@ -1176,6 +1177,8 @@ cupsdCheckGroup( * Group exists, check it... */ + groupid = group->gr_gid; + #ifdef HAVE_GETGROUPLIST if (user) { @@ -1194,22 +1197,27 @@ cupsdCheckGroup( #endif /* __APPLE__ */ for (i = 0; i < ngroups; i ++) - if ((int)group->gr_gid == (int)groups[i]) + if ((int)groupid == (int)groups[i]) return (1); } -#endif /* HAVE_GETGROUPLIST */ +#else for (i = 0; group->gr_mem[i]; i ++) + { if (!_cups_strcasecmp(username, group->gr_mem[i])) return (1); + } +#endif /* HAVE_GETGROUPLIST */ } + else + groupid = (gid_t)-1; /* * Group doesn't exist or user not in group list, check the group ID * against the user's group ID... */ - if (user && group && group->gr_gid == user->pw_gid) + if (user && groupid == user->pw_gid) return (1); #ifdef HAVE_MBR_UID_TO_UUID @@ -1219,13 +1227,13 @@ cupsdCheckGroup( if (user && !mbr_uid_to_uuid(user->pw_uid, useruuid)) { - if (group) + if (groupid != (gid_t)-1) { /* * Map group name to UUID and check membership... */ - if (!mbr_gid_to_uuid(group->gr_gid, groupuuid)) + if (!mbr_gid_to_uuid(groupid, groupuuid)) if (!mbr_check_membership(useruuid, groupuuid, &is_member)) if (is_member) return (1); diff --git a/scheduler/client.c b/scheduler/client.c index d628dc6..c36c1d2 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -2369,25 +2369,38 @@ cupsdSendHeader( * requests when the request requires system group membership - then the * client knows the root certificate can/should be used. * - * Also, for macOS we also look for @AUTHKEY and add an "authkey" - * parameter as needed... + * Also, for macOS we also look for @AUTHKEY and add an "AuthRef key=foo" + * method as needed... */ char *name, /* Current user name */ *auth_key; /* Auth key buffer */ size_t auth_size; /* Size of remaining buffer */ + int need_local = 1; /* Do we need to list "Local" method? */ auth_key = auth_str + strlen(auth_str); auth_size = sizeof(auth_str) - (size_t)(auth_key - auth_str); +#if defined(SO_PEERCRED) && defined(AF_LOCAL) + if (httpAddrFamily(httpGetAddress(con->http)) == AF_LOCAL) + { + strlcpy(auth_key, ", PeerCred", auth_size); + auth_key += 10; + auth_size -= 10; + } +#endif /* SO_PEERCRED && AF_LOCAL */ + for (name = (char *)cupsArrayFirst(con->best->names); name; name = (char *)cupsArrayNext(con->best->names)) { + cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdSendHeader: require \"%s\"", name); + #ifdef HAVE_AUTHORIZATION_H if (!_cups_strncasecmp(name, "@AUTHKEY(", 9)) { - snprintf(auth_key, auth_size, ", authkey=\"%s\"", name + 9); + snprintf(auth_key, auth_size, ", AuthRef key=\"%s\"", name + 9); + need_local = 0; /* end parenthesis is stripped in conf.c */ break; } @@ -2397,16 +2410,18 @@ cupsdSendHeader( { #ifdef HAVE_AUTHORIZATION_H if (SystemGroupAuthKey) - snprintf(auth_key, auth_size, - ", authkey=\"%s\"", - SystemGroupAuthKey); + snprintf(auth_key, auth_size, ", AuthRef key=\"%s\"", SystemGroupAuthKey); else #else - strlcpy(auth_key, ", trc=\"y\"", auth_size); + strlcpy(auth_key, ", Local trc=\"y\"", auth_size); #endif /* HAVE_AUTHORIZATION_H */ + need_local = 0; break; } } + + if (need_local) + strlcat(auth_key, ", Local", auth_size); } if (auth_str[0]) diff --git a/scheduler/conf.c b/scheduler/conf.c index bc52d2a..8c2694f 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -617,7 +617,7 @@ cupsdReadConfiguration(void) cupsdSetString(&ServerKeychain, "/Library/Keychains/System.keychain"); # endif /* HAVE_GNUTLS */ - _httpTLSSetOptions(0); + _httpTLSSetOptions(_HTTP_TLS_NONE, _HTTP_TLS_1_0, _HTTP_TLS_MAX); #endif /* HAVE_SSL */ language = cupsLangDefault(); @@ -2999,7 +2999,9 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ * SSLOptions [AllowRC4] [AllowSSL3] [AllowDH] [DenyCBC] [DenyTLS1.0] [None] */ - int options = 0; /* SSL/TLS options */ + int options = _HTTP_TLS_NONE,/* SSL/TLS options */ + min_version = _HTTP_TLS_1_0, + max_version = _HTTP_TLS_MAX; if (value) { @@ -3023,24 +3025,40 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ * Compare... */ - if (!_cups_strcasecmp(start, "AllowRC4")) + if (!_cups_strcasecmp(start, "AllowRC4")) options |= _HTTP_TLS_ALLOW_RC4; - else if (!_cups_strcasecmp(start, "AllowSSL3")) - options |= _HTTP_TLS_ALLOW_SSL3; + else if (!_cups_strcasecmp(start, "AllowSSL3")) + min_version = _HTTP_TLS_SSL3; else if (!_cups_strcasecmp(start, "AllowDH")) options |= _HTTP_TLS_ALLOW_DH; else if (!_cups_strcasecmp(start, "DenyCBC")) options |= _HTTP_TLS_DENY_CBC; else if (!_cups_strcasecmp(start, "DenyTLS1.0")) - options |= _HTTP_TLS_DENY_TLS10; - else if (!_cups_strcasecmp(start, "None")) - options = 0; + min_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MaxTLS1.0")) + max_version = _HTTP_TLS_1_0; + else if (!_cups_strcasecmp(start, "MaxTLS1.1")) + max_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MaxTLS1.2")) + max_version = _HTTP_TLS_1_2; + else if (!_cups_strcasecmp(start, "MaxTLS1.3")) + max_version = _HTTP_TLS_1_3; + else if (!_cups_strcasecmp(start, "MinTLS1.0")) + min_version = _HTTP_TLS_1_0; + else if (!_cups_strcasecmp(start, "MinTLS1.1")) + min_version = _HTTP_TLS_1_1; + else if (!_cups_strcasecmp(start, "MinTLS1.2")) + min_version = _HTTP_TLS_1_2; + else if (!_cups_strcasecmp(start, "MinTLS1.3")) + min_version = _HTTP_TLS_1_3; + else if (!_cups_strcasecmp(start, "None")) + options = _HTTP_TLS_NONE; else if (_cups_strcasecmp(start, "NoEmptyFragments")) cupsdLogMessage(CUPSD_LOG_WARN, "Unknown SSL option %s at line %d.", start, linenum); } } - _httpTLSSetOptions(options); + _httpTLSSetOptions(options, min_version, max_version); } #endif /* HAVE_SSL */ else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen") diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 9030911..45e6e65 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -5,7 +5,7 @@ * created from driver information files, and dynamically generated PPD files * using driver helper programs. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2018 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -2404,7 +2404,7 @@ load_ppds(const char *d, /* I - Actual directory */ { fprintf(stderr, "ERROR: [cups-driverd] Skipping \"%s\": loop detected!\n", d); - return (0); + return (1); } /* @@ -2619,7 +2619,7 @@ load_ppds_dat(char *filename, /* I - Filename buffer */ unsigned ppdsync; /* Sync word */ int num_ppds; /* Number of PPDs */ - if (cupsFileRead(fp, (char *)&ppdsync, sizeof(ppdsync)) == sizeof(ppdsync) && + if ((size_t)cupsFileRead(fp, (char *)&ppdsync, sizeof(ppdsync)) == sizeof(ppdsync) && ppdsync == PPD_SYNC && !stat(filename, &fileinfo) && (((size_t)fileinfo.st_size - sizeof(ppdsync)) % sizeof(ppd_rec_t)) == 0 && @@ -2728,7 +2728,7 @@ read_tar(cups_file_t *fp, /* I - Archive to read */ tar_rec_t record; /* Record from file */ - while (cupsFileRead(fp, (char *)&record, sizeof(record)) == sizeof(record)) + while ((size_t)cupsFileRead(fp, (char *)&record, sizeof(record)) == sizeof(record)) { /* * Check for a valid tar header... diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 2308e05..3dab90c 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,8 +1,8 @@ /* * Directory services routines for the CUPS scheduler. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright © 2007-2018 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 @@ -698,20 +698,21 @@ dnssdDeregisterInstance( DNSServiceRefDeallocate(*srv); + *srv = NULL; + # else /* HAVE_AVAHI */ + if (!from_callback) + avahi_threaded_poll_lock(DNSSDMaster); + if (*srv) { - if (!from_callback) - avahi_threaded_poll_lock(DNSSDMaster); - avahi_entry_group_free(*srv); - - if (!from_callback) - avahi_threaded_poll_unlock(DNSSDMaster); + *srv = NULL; } -# endif /* HAVE_DNSSD */ - *srv = NULL; + if (!from_callback) + avahi_threaded_poll_unlock(DNSSDMaster); +# endif /* HAVE_DNSSD */ } diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 5cf980a..ad8f1f0 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -4896,6 +4896,8 @@ copy_printer_attrs( * and document-format attributes that may be provided by the client. */ + _cupsRWLockRead(&printer->lock); + curtime = time(NULL); if (!ra || cupsArrayFind(ra, "marker-change-time")) @@ -5088,6 +5090,8 @@ copy_printer_attrs( if (printer->ppd_attrs) copy_attrs(con->response, printer->ppd_attrs, ra, IPP_TAG_ZERO, 0, NULL); copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY, NULL); + + _cupsRWUnlock(&printer->lock); } diff --git a/scheduler/log.c b/scheduler/log.c index 3ffa193..5dbb0ba 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -960,7 +960,7 @@ cupsdLogPage(cupsd_job_t *job, /* I - Job being printed */ *bufptr = '\0'; #ifdef HAVE_SYSTEMD_SD_JOURNAL_H - if (!strcmp(ErrorLog, "syslog")) + if (!strcmp(PageLog, "syslog")) { static const char * const job_states[] = { /* job-state strings */ @@ -1157,7 +1157,7 @@ cupsdLogRequest(cupsd_client_t *con, /* I - Request to log */ } #ifdef HAVE_SYSTEMD_SD_JOURNAL_H - if (!strcmp(ErrorLog, "syslog")) + if (!strcmp(AccessLog, "syslog")) { sd_journal_print(LOG_INFO, "REQUEST %s - %s \"%s %s HTTP/%d.%d\" %d " CUPS_LLFMT " %s %s", con->http->hostname, con->username[0] != '\0' ? con->username : "-", states[con->operation], _httpEncodeURI(temp, con->uri, sizeof(temp)), con->http->version / 100, con->http->version % 100, code, CUPS_LLCAST con->bytes, con->request ? ippOpString(con->request->request.op.operation_id) : "-", con->response ? ippErrorString(con->response->request.status.status_code) : "-"); return (1); diff --git a/scheduler/main.c b/scheduler/main.c index 8925c83..acf0316 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */ * Write dirty config/state files... */ - if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0) + if (DirtyCleanTime && current_time >= DirtyCleanTime) cupsdCleanDirty(); #ifdef __APPLE__ diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in index 0a27c76..50faa39 100644 --- a/scheduler/org.cups.cupsd.service.in +++ b/scheduler/org.cups.cupsd.service.in @@ -5,6 +5,7 @@ Documentation=man:cupsd(8) [Service] ExecStart=@sbindir@/cupsd -l Type=simple +Restart=always [Install] Also=org.cups.cupsd.socket org.cups.cupsd.path diff --git a/scheduler/process.c b/scheduler/process.c index 584b82e..5c01b4b 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -23,13 +23,16 @@ #ifdef HAVE_POSIX_SPAWN # include extern char **environ; -#endif /* HAVE_POSIX_SPAWN */ -#ifdef HAVE_POSIX_SPAWN -# if !defined(__OpenBSD__) || OpenBSD >= 201505 -# define USE_POSIX_SPAWN 1 -# else +/* Don't use posix_spawn on systems with bugs in their implementations... */ +# if defined(OpenBSD) && OpenBSD < 201505 # define USE_POSIX_SPAWN 0 -# endif /* !__OpenBSD__ || */ +# elif defined(__UCLIBC__) && __UCLIBC_MAJOR__ == 1 && __UCLIBC_MINOR__ == 0 && __UCLIBC_SUBLEVEL__ < 27 +# define USE_POSIX_SPAWN 0 +# elif defined(__UCLIBC__) && __UCLIBC_MAJOR__ < 1 +# define USE_POSIX_SPAWN 0 +# else /* All other platforms */ +# define USE_POSIX_SPAWN 1 +# endif /* ... */ #else # define USE_POSIX_SPAWN 0 #endif /* HAVE_POSIX_SPAWN */ diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 5e5c183..81955d1 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -2,7 +2,7 @@ * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for * CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -83,11 +83,11 @@ main(int argc, /* I - Number of command-line arguments */ switch (*opt) { case 'E' : /* Encrypt */ - #ifdef HAVE_SSL +#ifdef HAVE_SSL cupsSetEncryption(HTTP_ENCRYPT_REQUIRED); - #else +#else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), command); - #endif /* HAVE_SSL */ +#endif /* HAVE_SSL */ break; case 'U' : /* Username */ diff --git a/systemv/lp.c b/systemv/lp.c index 9672b08..5033459 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,7 +1,7 @@ /* * "lp" command for CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -586,33 +586,10 @@ main(int argc, /* I - Number of command-line arguments */ if (printer == NULL) { - val = NULL; - - if ((printer = getenv("LPDEST")) == NULL) - { - if ((printer = getenv("PRINTER")) != NULL) - { - if (!strcmp(printer, "lp")) - printer = NULL; - else - val = "PRINTER"; - } - } - else - val = "LPDEST"; - - if (printer && !cupsGetNamedDest(NULL, printer, NULL)) - _cupsLangPrintf(stderr, - _("%s: Error - %s environment variable names " - "non-existent destination \"%s\"."), argv[0], val, - printer); - else if (cupsLastError() == IPP_NOT_FOUND) - _cupsLangPrintf(stderr, - _("%s: Error - no default destination available."), - argv[0]); + if (!cupsGetNamedDest(NULL, NULL, NULL) && cupsLastError() == IPP_STATUS_ERROR_NOT_FOUND) + _cupsLangPrintf(stderr, _("%s: Error - %s"), argv[0], cupsLastErrorString()); else - _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."), - argv[0]); + _cupsLangPrintf(stderr, _("%s: Error - scheduler not responding."), argv[0]); return (1); } diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index c608c2d..1ea0d33 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,8 +1,8 @@ /* * "lpadmin" command for CUPS. * - * Copyright 2007-2016 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -33,7 +33,7 @@ static int delete_printer_from_class(http_t *http, char *printer, static int delete_printer_option(http_t *http, char *printer, char *option); static int enable_printer(http_t *http, char *printer); -static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize); +static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize, int *num_options, cups_option_t **options); static cups_ptype_t get_printer_type(http_t *http, char *printer, char *uri, size_t urisize); static int set_printer_options(http_t *http, char *printer, @@ -46,23 +46,22 @@ static int validate_name(const char *name); * 'main()' - Parse options and configure the scheduler. */ -int -main(int argc, /* I - Number of command-line arguments */ - char *argv[]) /* I - Command-line arguments */ +int /* O - Exit status */ +main(int argc, /* I - Number of command-line arguments */ + char *argv[]) /* I - Command-line arguments */ { - int i; /* Looping var */ - http_t *http; /* Connection to server */ - char *printer, /* Destination printer */ - *pclass, /* Printer class name */ - *opt, /* Option pointer */ - *val; /* Pointer to allow/deny value */ - int num_options; /* Number of options */ - cups_option_t *options; /* Options */ - char *file, /* New PPD file */ - evefile[1024] = ""; - /* IPP Everywhere PPD */ - const char *ppd_name, /* ppd-name value */ - *device_uri; /* device-uri value */ + int i; /* Looping var */ + http_t *http; /* Connection to server */ + char *printer, /* Destination printer */ + *pclass, /* Printer class name */ + *opt, /* Option pointer */ + *val; /* Pointer to allow/deny value */ + int num_options; /* Number of options */ + cups_option_t *options; /* Options */ + char *file, /* New PPD file */ + evefile[1024] = ""; /* IPP Everywhere PPD */ + const char *ppd_name, /* ppd-name value */ + *device_uri; /* device-uri value */ _cupsSetLocale(argv); @@ -218,6 +217,25 @@ main(int argc, /* I - Number of command-line arguments */ file = argv[i]; } + + if (*opt == 'i') + { + /* + * Check to see that the specified file is, in fact, a PPD... + */ + + cups_file_t *fp = cupsFileOpen(file, "r"); + char line[256]; + + if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "*PPD-Adobe", 10)) + { + _cupsLangPuts(stderr, _("lpadmin: System V interface scripts are no longer supported for security reasons.")); + cupsFileClose(fp); + return (1); + } + + cupsFileClose(fp); + } break; case 'E' : /* Enable the printer/enable encryption */ @@ -591,9 +609,19 @@ main(int argc, /* I - Number of command-line arguments */ * Set options as needed... */ - if ((ppd_name = cupsGetOption("ppd-name", num_options, options)) != NULL && !strcmp(ppd_name, "everywhere") && (device_uri = cupsGetOption("device-uri", num_options, options)) != NULL) + ppd_name = cupsGetOption("ppd-name", num_options, options); + device_uri = cupsGetOption("device-uri", num_options, options); + + if (ppd_name && !strcmp(ppd_name, "raw")) { - if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile))) == NULL) + _cupsLangPuts(stderr, _("lpadmin: Raw queues are deprecated and will stop working in a future version of CUPS.")); + + if (device_uri && (!strncmp(device_uri, "ipp://", 6) || !strncmp(device_uri, "ipps://", 7)) && strstr(device_uri, "/printers/")) + _cupsLangPuts(stderr, _("lpadmin: Use the 'everywhere' model for shared printers.")); + } + else if (ppd_name && !strcmp(ppd_name, "everywhere") && device_uri) + { + if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile), &num_options, &options)) == NULL) return (1); num_options = cupsRemoveOption("ppd-name", num_options, &options); @@ -1144,20 +1172,31 @@ enable_printer(http_t *http, /* I - Server connection */ * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI. */ -static char * /* O - Filename or NULL */ -get_printer_ppd(const char *uri, /* I - Printer URI */ - char *buffer, /* I - Filename buffer */ - size_t bufsize) /* I - Size of filename buffer */ +static char * /* O - Filename or NULL */ +get_printer_ppd( + const char *uri, /* I - Printer URI */ + char *buffer, /* I - Filename buffer */ + size_t bufsize, /* I - Size of filename buffer */ + int *num_options, /* IO - Number of options */ + cups_option_t **options) /* IO - Options */ { http_t *http; /* Connection to printer */ ipp_t *request, /* Get-Printer-Attributes request */ *response; /* Get-Printer-Attributes response */ + ipp_attribute_t *attr; /* Attribute from response */ char resolved[1024], /* Resolved URI */ scheme[32], /* URI scheme */ userpass[256], /* Username:password */ host[256], /* Hostname */ resource[256]; /* Resource path */ int port; /* Port number */ + static const char * const pattrs[] = /* Attributes to use */ + { + "job-template", + "printer-defaults", + "printer-description", + "media-col-database" + }; /* @@ -1198,9 +1237,21 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]), NULL, pattrs); response = cupsDoRequest(http, request, resource); - if (!_ppdCreateFromIPP(buffer, bufsize, response)) + if (_ppdCreateFromIPP(buffer, bufsize, response)) + { + if (!cupsGetOption("printer-geo-location", *num_options, *options) && (attr = ippFindAttribute(response, "printer-geo-location", IPP_TAG_URI)) != NULL) + *num_options = cupsAddOption("printer-geo-location", ippGetString(attr, 0, NULL), *num_options, options); + + if (!cupsGetOption("printer-info", *num_options, *options) && (attr = ippFindAttribute(response, "printer-info", IPP_TAG_TEXT)) != NULL) + *num_options = cupsAddOption("printer-info", ippGetString(attr, 0, NULL), *num_options, options); + + if (!cupsGetOption("printer-location", *num_options, *options) && (attr = ippFindAttribute(response, "printer-location", IPP_TAG_TEXT)) != NULL) + *num_options = cupsAddOption("printer-location", ippGetString(attr, 0, NULL), *num_options, options); + } + else _cupsLangPrintf(stderr, _("%s: Unable to create PPD file: %s"), "lpadmin", strerror(errno)); ippDelete(response); @@ -1572,8 +1623,7 @@ validate_name(const char *name) /* I - Name to check */ for (ptr = name; *ptr; ptr ++) if (*ptr == '@') break; - else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || - *ptr == '#') + else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '\\' || *ptr == '?' || *ptr == '\'' || *ptr == '\"' || *ptr == '#') return (0); /* diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index b250df5..f7056e3 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,7 +1,7 @@ /* * "lpinfo" command for CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -454,6 +454,25 @@ show_models( } ippDelete(response); + + /* + * Show the "everywhere" model, which is handled by the lpadmin command... + */ + + if ((!include_schemes || strstr(include_schemes, "everywhere")) && (!exclude_schemes || !strstr(exclude_schemes, "everywhere"))) + { + if (long_status) + { + _cupsLangPrintf(stdout, + _("Model: name = %s\n" + " natural_language = %s\n" + " make-and-model = %s\n" + " device-id = %s"), + "everywhere", cupsLangDefault()->language, "IPP Everywhere", "CMD:PwgRaster"); + } + else + _cupsLangPuts(stdout, "everywhere IPP Everywhere"); + } } else { diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test index a1c8f00..9e23db6 100644 --- a/test/ipp-everywhere.test +++ b/test/ipp-everywhere.test @@ -1,8 +1,8 @@ # # IPP Everywhere test suite. # -# Copyright 2007-2013 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products. All rights reserved. +# Copyright © 2007-2018 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 @@ -179,7 +179,7 @@ INCLUDE "ipp-2.0.test" # Test printing all sample documents { NAME "Print color.jpg-4x6 @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -191,7 +191,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -199,7 +199,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -214,7 +214,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -222,7 +222,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -237,7 +237,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/color.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -245,7 +245,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -257,7 +257,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -265,7 +265,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -280,7 +280,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -288,7 +288,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -303,7 +303,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -311,7 +311,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -323,7 +323,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -331,7 +331,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -346,7 +346,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -354,7 +354,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -369,7 +369,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -377,7 +377,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -389,7 +389,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -397,7 +397,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -412,7 +412,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -420,7 +420,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -435,7 +435,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -443,7 +443,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -455,7 +455,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -463,7 +463,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -478,7 +478,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -486,7 +486,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -501,7 +501,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -509,7 +509,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -521,7 +521,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -529,7 +529,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -544,7 +544,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -552,7 +552,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -567,7 +567,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/color.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -575,7 +575,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -587,7 +587,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -595,7 +595,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -610,7 +610,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -618,7 +618,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -633,7 +633,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -641,7 +641,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -653,7 +653,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -661,7 +661,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -676,7 +676,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -684,7 +684,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -699,7 +699,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -707,7 +707,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -719,7 +719,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -727,7 +727,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -742,7 +742,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -750,7 +750,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -765,7 +765,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -773,7 +773,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -785,7 +785,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -793,7 +793,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -808,7 +808,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -816,7 +816,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -831,7 +831,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -839,7 +839,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -851,7 +851,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -859,7 +859,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -874,7 +874,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -882,7 +882,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -897,7 +897,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/color.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -905,7 +905,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -917,7 +917,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -925,7 +925,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -940,7 +940,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -948,7 +948,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -963,7 +963,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -971,7 +971,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -983,7 +983,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -991,7 +991,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1006,7 +1006,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1014,7 +1014,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1029,7 +1029,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1037,7 +1037,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -1049,7 +1049,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1057,7 +1057,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1072,7 +1072,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1080,7 +1080,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1095,7 +1095,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1103,7 +1103,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -1115,7 +1115,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1123,7 +1123,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1138,7 +1138,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1146,7 +1146,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1161,7 +1161,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1169,7 +1169,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -1181,7 +1181,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1189,7 +1189,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1204,7 +1204,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1212,7 +1212,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1227,7 +1227,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/color.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1235,7 +1235,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -1247,7 +1247,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1255,7 +1255,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1270,7 +1270,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1278,7 +1278,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1293,7 +1293,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1301,7 +1301,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -1313,7 +1313,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1321,7 +1321,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1336,7 +1336,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1344,7 +1344,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1359,7 +1359,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1367,7 +1367,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -1379,7 +1379,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1387,7 +1387,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1402,7 +1402,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1410,7 +1410,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1425,7 +1425,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1433,7 +1433,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -1445,7 +1445,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1453,7 +1453,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1468,7 +1468,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1476,7 +1476,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1491,7 +1491,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1499,7 +1499,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -1511,7 +1511,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1519,7 +1519,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1534,7 +1534,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1542,7 +1542,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1557,7 +1557,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/color.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1565,7 +1565,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -1577,7 +1577,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1585,7 +1585,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1600,7 +1600,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1608,7 +1608,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1623,7 +1623,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1631,7 +1631,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -1643,7 +1643,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1651,7 +1651,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1666,7 +1666,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1674,7 +1674,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1689,7 +1689,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1697,7 +1697,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -1709,7 +1709,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1717,7 +1717,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1732,7 +1732,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1740,7 +1740,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1755,7 +1755,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1763,7 +1763,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -1775,7 +1775,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1783,7 +1783,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1798,7 +1798,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1806,7 +1806,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1821,7 +1821,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1829,7 +1829,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -1841,7 +1841,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1849,7 +1849,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1864,7 +1864,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1872,7 +1872,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1887,7 +1887,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/color.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1895,7 +1895,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -1907,7 +1907,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1915,7 +1915,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1930,7 +1930,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1938,7 +1938,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -1953,7 +1953,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1961,7 +1961,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -1973,7 +1973,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -1981,7 +1981,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -1996,7 +1996,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2004,7 +2004,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2019,7 +2019,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2027,7 +2027,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -2039,7 +2039,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2047,7 +2047,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2062,7 +2062,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2070,7 +2070,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2085,7 +2085,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2093,7 +2093,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-16" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 @@ -2105,7 +2105,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "color.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2113,7 +2113,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2128,7 +2128,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "color.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2136,7 +2136,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_16 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2151,7 +2151,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "color.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2159,7 +2159,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -2171,7 +2171,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2179,7 +2179,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2194,7 +2194,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2202,7 +2202,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2217,7 +2217,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2225,7 +2225,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -2237,7 +2237,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2245,7 +2245,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2260,7 +2260,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2268,7 +2268,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2283,7 +2283,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2291,7 +2291,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -2303,7 +2303,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2311,7 +2311,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2326,7 +2326,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2334,7 +2334,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2349,7 +2349,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2357,7 +2357,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -2369,7 +2369,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2377,7 +2377,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2392,7 +2392,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2400,7 +2400,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 150dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2415,7 +2415,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2423,7 +2423,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -2435,7 +2435,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2443,7 +2443,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2458,7 +2458,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2466,7 +2466,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2481,7 +2481,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2489,7 +2489,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -2501,7 +2501,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2509,7 +2509,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2524,7 +2524,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2532,7 +2532,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2547,7 +2547,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2555,7 +2555,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -2567,7 +2567,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2575,7 +2575,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2590,7 +2590,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2598,7 +2598,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2613,7 +2613,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2621,7 +2621,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -2633,7 +2633,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2641,7 +2641,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2656,7 +2656,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2664,7 +2664,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 180dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2679,7 +2679,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2687,7 +2687,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -2699,7 +2699,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2707,7 +2707,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2722,7 +2722,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2730,7 +2730,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2745,7 +2745,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2753,7 +2753,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -2765,7 +2765,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2773,7 +2773,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2788,7 +2788,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2796,7 +2796,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2811,7 +2811,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2819,7 +2819,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -2831,7 +2831,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2839,7 +2839,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2854,7 +2854,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2862,7 +2862,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2877,7 +2877,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2885,7 +2885,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -2897,7 +2897,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2905,7 +2905,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2920,7 +2920,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2928,7 +2928,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 300dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -2943,7 +2943,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2951,7 +2951,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -2963,7 +2963,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2971,7 +2971,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -2986,7 +2986,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -2994,7 +2994,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3009,7 +3009,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3017,7 +3017,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -3029,7 +3029,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3037,7 +3037,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3052,7 +3052,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3060,7 +3060,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3075,7 +3075,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3083,7 +3083,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -3095,7 +3095,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3103,7 +3103,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3118,7 +3118,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3126,7 +3126,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3141,7 +3141,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3149,7 +3149,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -3161,7 +3161,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3169,7 +3169,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3184,7 +3184,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3192,7 +3192,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 360dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3207,7 +3207,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3215,7 +3215,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -3227,7 +3227,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3235,7 +3235,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3250,7 +3250,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3258,7 +3258,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3273,7 +3273,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3281,7 +3281,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -3293,7 +3293,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3301,7 +3301,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3316,7 +3316,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3324,7 +3324,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3339,7 +3339,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3347,7 +3347,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -3359,7 +3359,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3367,7 +3367,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3382,7 +3382,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3390,7 +3390,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3405,7 +3405,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3413,7 +3413,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -3425,7 +3425,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3433,7 +3433,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3448,7 +3448,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3456,7 +3456,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 600dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3471,7 +3471,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3479,7 +3479,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -3491,7 +3491,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3499,7 +3499,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3514,7 +3514,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3522,7 +3522,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3537,7 +3537,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3545,7 +3545,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -3557,7 +3557,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3565,7 +3565,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3580,7 +3580,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3588,7 +3588,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3603,7 +3603,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3611,7 +3611,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -3623,7 +3623,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3631,7 +3631,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3646,7 +3646,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3654,7 +3654,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3669,7 +3669,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3677,7 +3677,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -3689,7 +3689,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-a4" - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3697,7 +3697,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3712,7 +3712,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3720,7 +3720,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-a4 @ 720dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3735,7 +3735,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3743,7 +3743,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -3755,7 +3755,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3763,7 +3763,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3778,7 +3778,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3786,7 +3786,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3801,7 +3801,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/document-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3809,7 +3809,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -3821,7 +3821,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3829,7 +3829,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3844,7 +3844,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3852,7 +3852,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3867,7 +3867,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/document-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3875,7 +3875,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -3887,7 +3887,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3895,7 +3895,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3910,7 +3910,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3918,7 +3918,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3933,7 +3933,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/document-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3941,7 +3941,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -3953,7 +3953,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3961,7 +3961,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -3976,7 +3976,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -3984,7 +3984,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 150dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -3999,7 +3999,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/document-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4007,7 +4007,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -4019,7 +4019,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4027,7 +4027,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4042,7 +4042,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4050,7 +4050,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4065,7 +4065,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/document-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4073,7 +4073,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -4085,7 +4085,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4093,7 +4093,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4108,7 +4108,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4116,7 +4116,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4131,7 +4131,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/document-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4139,7 +4139,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -4151,7 +4151,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4159,7 +4159,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4174,7 +4174,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4182,7 +4182,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4197,7 +4197,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/document-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4205,7 +4205,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -4217,7 +4217,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4225,7 +4225,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4240,7 +4240,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4248,7 +4248,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 180dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4263,7 +4263,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/document-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4271,7 +4271,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -4283,7 +4283,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4291,7 +4291,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4306,7 +4306,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4314,7 +4314,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4329,7 +4329,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/document-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4337,7 +4337,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -4349,7 +4349,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4357,7 +4357,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4372,7 +4372,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4380,7 +4380,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4395,7 +4395,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/document-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4403,7 +4403,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -4415,7 +4415,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4423,7 +4423,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4438,7 +4438,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4446,7 +4446,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4461,7 +4461,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/document-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4469,7 +4469,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -4481,7 +4481,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4489,7 +4489,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4504,7 +4504,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4512,7 +4512,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 300dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4527,7 +4527,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/document-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4535,7 +4535,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -4547,7 +4547,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4555,7 +4555,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4570,7 +4570,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4578,7 +4578,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4593,7 +4593,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/document-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4601,7 +4601,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -4613,7 +4613,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4621,7 +4621,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4636,7 +4636,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4644,7 +4644,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4659,7 +4659,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/document-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4667,7 +4667,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -4679,7 +4679,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4687,7 +4687,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4702,7 +4702,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4710,7 +4710,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4725,7 +4725,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/document-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4733,7 +4733,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -4745,7 +4745,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4753,7 +4753,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4768,7 +4768,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4776,7 +4776,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 360dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4791,7 +4791,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/document-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4799,7 +4799,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -4811,7 +4811,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4819,7 +4819,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4834,7 +4834,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4842,7 +4842,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4857,7 +4857,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/document-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4865,7 +4865,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -4877,7 +4877,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4885,7 +4885,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4900,7 +4900,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4908,7 +4908,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4923,7 +4923,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/document-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4931,7 +4931,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -4943,7 +4943,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4951,7 +4951,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -4966,7 +4966,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4974,7 +4974,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -4989,7 +4989,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/document-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -4997,7 +4997,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -5009,7 +5009,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5017,7 +5017,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5032,7 +5032,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5040,7 +5040,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 600dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5055,7 +5055,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/document-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5063,7 +5063,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -5075,7 +5075,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5083,7 +5083,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5098,7 +5098,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5106,7 +5106,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5121,7 +5121,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/document-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5129,7 +5129,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -5141,7 +5141,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5149,7 +5149,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5164,7 +5164,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5172,7 +5172,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5187,7 +5187,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/document-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5195,7 +5195,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -5207,7 +5207,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5215,7 +5215,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5230,7 +5230,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5238,7 +5238,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5253,7 +5253,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/document-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5261,7 +5261,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -5273,7 +5273,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "document-letter" - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5281,7 +5281,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5296,7 +5296,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "document-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5304,7 +5304,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print document-letter @ 720dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5319,7 +5319,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "document-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/document-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5327,7 +5327,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -5339,7 +5339,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5347,7 +5347,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5362,7 +5362,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5370,7 +5370,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5385,7 +5385,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/gray.jpg-4x6-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5393,7 +5393,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -5405,7 +5405,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5413,7 +5413,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5428,7 +5428,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5436,7 +5436,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5451,7 +5451,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5459,7 +5459,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -5471,7 +5471,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5479,7 +5479,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5494,7 +5494,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5502,7 +5502,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5517,7 +5517,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5525,7 +5525,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -5537,7 +5537,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5545,7 +5545,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5560,7 +5560,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5568,7 +5568,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5583,7 +5583,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/gray.jpg-4x6-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5591,7 +5591,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -5603,7 +5603,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5611,7 +5611,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5626,7 +5626,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5634,7 +5634,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5649,7 +5649,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5657,7 +5657,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -5669,7 +5669,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5677,7 +5677,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5692,7 +5692,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5700,7 +5700,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5715,7 +5715,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5723,7 +5723,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -5735,7 +5735,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5743,7 +5743,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5758,7 +5758,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5766,7 +5766,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5781,7 +5781,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/gray.jpg-4x6-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5789,7 +5789,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -5801,7 +5801,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5809,7 +5809,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5824,7 +5824,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5832,7 +5832,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5847,7 +5847,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5855,7 +5855,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -5867,7 +5867,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5875,7 +5875,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5890,7 +5890,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5898,7 +5898,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5913,7 +5913,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5921,7 +5921,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -5933,7 +5933,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5941,7 +5941,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -5956,7 +5956,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5964,7 +5964,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -5979,7 +5979,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/gray.jpg-4x6-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -5987,7 +5987,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -5999,7 +5999,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6007,7 +6007,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6022,7 +6022,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6030,7 +6030,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6045,7 +6045,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6053,7 +6053,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -6065,7 +6065,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6073,7 +6073,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6088,7 +6088,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6096,7 +6096,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6111,7 +6111,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6119,7 +6119,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -6131,7 +6131,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6139,7 +6139,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6154,7 +6154,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6162,7 +6162,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6177,7 +6177,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/gray.jpg-4x6-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6185,7 +6185,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -6197,7 +6197,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6205,7 +6205,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6220,7 +6220,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6228,7 +6228,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6243,7 +6243,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6251,7 +6251,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -6263,7 +6263,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6271,7 +6271,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6286,7 +6286,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6294,7 +6294,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6309,7 +6309,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6317,7 +6317,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -6329,7 +6329,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6337,7 +6337,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6352,7 +6352,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6360,7 +6360,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6375,7 +6375,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/gray.jpg-4x6-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6383,7 +6383,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -6395,7 +6395,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6403,7 +6403,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6418,7 +6418,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6426,7 +6426,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6441,7 +6441,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6449,7 +6449,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -6461,7 +6461,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "gray.jpg-4x6" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6469,7 +6469,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6484,7 +6484,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "gray.jpg-4x6" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6492,7 +6492,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6507,7 +6507,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "gray.jpg-4x6" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6515,7 +6515,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -6527,7 +6527,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6535,7 +6535,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6550,7 +6550,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6558,7 +6558,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6573,7 +6573,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-a4-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6581,7 +6581,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -6593,7 +6593,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6601,7 +6601,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6616,7 +6616,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6624,7 +6624,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6639,7 +6639,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6647,7 +6647,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -6659,7 +6659,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6667,7 +6667,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6682,7 +6682,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6690,7 +6690,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6705,7 +6705,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-a4-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6713,7 +6713,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -6725,7 +6725,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6733,7 +6733,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6748,7 +6748,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6756,7 +6756,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 150dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6771,7 +6771,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-a4-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6779,7 +6779,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -6791,7 +6791,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6799,7 +6799,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6814,7 +6814,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6822,7 +6822,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6837,7 +6837,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-a4-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6845,7 +6845,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -6857,7 +6857,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6865,7 +6865,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6880,7 +6880,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6888,7 +6888,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6903,7 +6903,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6911,7 +6911,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -6923,7 +6923,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6931,7 +6931,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -6946,7 +6946,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6954,7 +6954,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -6969,7 +6969,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-a4-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6977,7 +6977,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -6989,7 +6989,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -6997,7 +6997,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7012,7 +7012,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7020,7 +7020,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 180dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7035,7 +7035,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-a4-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7043,7 +7043,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -7055,7 +7055,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7063,7 +7063,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7078,7 +7078,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7086,7 +7086,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7101,7 +7101,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-a4-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7109,7 +7109,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -7121,7 +7121,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7129,7 +7129,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7144,7 +7144,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7152,7 +7152,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7167,7 +7167,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7175,7 +7175,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -7187,7 +7187,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7195,7 +7195,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7210,7 +7210,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7218,7 +7218,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7233,7 +7233,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-a4-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7241,7 +7241,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -7253,7 +7253,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7261,7 +7261,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7276,7 +7276,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7284,7 +7284,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 300dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7299,7 +7299,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-a4-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7307,7 +7307,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -7319,7 +7319,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7327,7 +7327,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7342,7 +7342,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7350,7 +7350,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7365,7 +7365,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-a4-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7373,7 +7373,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -7385,7 +7385,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7393,7 +7393,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7408,7 +7408,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7416,7 +7416,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7431,7 +7431,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7439,7 +7439,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -7451,7 +7451,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7459,7 +7459,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7474,7 +7474,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7482,7 +7482,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7497,7 +7497,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-a4-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7505,7 +7505,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -7517,7 +7517,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7525,7 +7525,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7540,7 +7540,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7548,7 +7548,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 360dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7563,7 +7563,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-a4-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7571,7 +7571,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -7583,7 +7583,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7591,7 +7591,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7606,7 +7606,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7614,7 +7614,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7629,7 +7629,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-a4-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7637,7 +7637,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -7649,7 +7649,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7657,7 +7657,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7672,7 +7672,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7680,7 +7680,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7695,7 +7695,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7703,7 +7703,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -7715,7 +7715,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7723,7 +7723,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7738,7 +7738,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7746,7 +7746,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7761,7 +7761,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-a4-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7769,7 +7769,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -7781,7 +7781,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7789,7 +7789,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7804,7 +7804,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7812,7 +7812,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 600dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7827,7 +7827,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-a4-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7835,7 +7835,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -7847,7 +7847,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7855,7 +7855,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7870,7 +7870,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7878,7 +7878,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7893,7 +7893,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-a4-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7901,7 +7901,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -7913,7 +7913,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7921,7 +7921,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -7936,7 +7936,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7944,7 +7944,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -7959,7 +7959,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7967,7 +7967,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -7979,7 +7979,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -7987,7 +7987,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8002,7 +8002,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8010,7 +8010,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8025,7 +8025,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-a4-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8033,7 +8033,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -8045,7 +8045,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-a4" - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8053,7 +8053,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8068,7 +8068,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-a4" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8076,7 +8076,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-a4 @ 720dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8091,7 +8091,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-a4" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-a4-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8099,7 +8099,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -8111,7 +8111,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8119,7 +8119,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8134,7 +8134,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8142,7 +8142,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8157,7 +8157,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/black-1/onepage-letter-black-1-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8165,7 +8165,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -8177,7 +8177,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8185,7 +8185,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8200,7 +8200,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8208,7 +8208,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8223,7 +8223,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8231,7 +8231,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -8243,7 +8243,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8251,7 +8251,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8266,7 +8266,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8274,7 +8274,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8289,7 +8289,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/sgray-8/onepage-letter-sgray-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8297,7 +8297,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -8309,7 +8309,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8317,7 +8317,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8332,7 +8332,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8340,7 +8340,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 150dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg SKIP-IF-NOT-DEFINED HAVE_150DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8355,7 +8355,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg + FILE pwg-raster-samples-150dpi-20150616/srgb-8/onepage-letter-srgb-8-150dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8363,7 +8363,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -8375,7 +8375,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8383,7 +8383,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8398,7 +8398,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8406,7 +8406,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8421,7 +8421,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/black-1/onepage-letter-black-1-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8429,7 +8429,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -8441,7 +8441,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8449,7 +8449,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8464,7 +8464,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8472,7 +8472,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8487,7 +8487,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8495,7 +8495,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -8507,7 +8507,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8515,7 +8515,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8530,7 +8530,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8538,7 +8538,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8553,7 +8553,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/sgray-8/onepage-letter-sgray-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8561,7 +8561,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -8573,7 +8573,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8581,7 +8581,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8596,7 +8596,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8604,7 +8604,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 180dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg SKIP-IF-NOT-DEFINED HAVE_180DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8619,7 +8619,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg + FILE pwg-raster-samples-180dpi-20150616/srgb-8/onepage-letter-srgb-8-180dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8627,7 +8627,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -8639,7 +8639,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8647,7 +8647,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8662,7 +8662,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8670,7 +8670,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8685,7 +8685,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/black-1/onepage-letter-black-1-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8693,7 +8693,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -8705,7 +8705,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8713,7 +8713,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8728,7 +8728,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8736,7 +8736,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8751,7 +8751,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8759,7 +8759,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -8771,7 +8771,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8779,7 +8779,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8794,7 +8794,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8802,7 +8802,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8817,7 +8817,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/sgray-8/onepage-letter-sgray-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8825,7 +8825,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -8837,7 +8837,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8845,7 +8845,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8860,7 +8860,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8868,7 +8868,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 300dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg SKIP-IF-NOT-DEFINED HAVE_300DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8883,7 +8883,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg + FILE pwg-raster-samples-300dpi-20150616/srgb-8/onepage-letter-srgb-8-300dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8891,7 +8891,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -8903,7 +8903,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8911,7 +8911,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8926,7 +8926,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8934,7 +8934,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -8949,7 +8949,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/black-1/onepage-letter-black-1-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8957,7 +8957,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -8969,7 +8969,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -8977,7 +8977,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -8992,7 +8992,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9000,7 +9000,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9015,7 +9015,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9023,7 +9023,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -9035,7 +9035,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9043,7 +9043,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9058,7 +9058,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9066,7 +9066,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9081,7 +9081,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/sgray-8/onepage-letter-sgray-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9089,7 +9089,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -9101,7 +9101,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9109,7 +9109,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9124,7 +9124,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9132,7 +9132,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 360dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg SKIP-IF-NOT-DEFINED HAVE_360DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9147,7 +9147,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg + FILE pwg-raster-samples-360dpi-20150616/srgb-8/onepage-letter-srgb-8-360dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9155,7 +9155,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -9167,7 +9167,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9175,7 +9175,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9190,7 +9190,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9198,7 +9198,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9213,7 +9213,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/black-1/onepage-letter-black-1-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9221,7 +9221,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -9233,7 +9233,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9241,7 +9241,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9256,7 +9256,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9264,7 +9264,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9279,7 +9279,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9287,7 +9287,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -9299,7 +9299,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9307,7 +9307,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9322,7 +9322,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9330,7 +9330,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9345,7 +9345,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/sgray-8/onepage-letter-sgray-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9353,7 +9353,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -9365,7 +9365,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9373,7 +9373,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9388,7 +9388,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9396,7 +9396,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 600dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg SKIP-IF-NOT-DEFINED HAVE_600DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9411,7 +9411,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg + FILE pwg-raster-samples-600dpi-20150616/srgb-8/onepage-letter-srgb-8-600dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9419,7 +9419,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, black-1" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 @@ -9431,7 +9431,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9439,7 +9439,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, black-1, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9454,7 +9454,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9462,7 +9462,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, black-1, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_BLACK_1 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9477,7 +9477,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/black-1/onepage-letter-black-1-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9485,7 +9485,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, cmyk-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 @@ -9497,7 +9497,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9505,7 +9505,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, cmyk-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9520,7 +9520,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9528,7 +9528,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, cmyk-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_CMYK_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9543,7 +9543,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9551,7 +9551,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, sgray-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 @@ -9563,7 +9563,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9571,7 +9571,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, sgray-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9586,7 +9586,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9594,7 +9594,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, sgray-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SGRAY_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9609,7 +9609,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/sgray-8/onepage-letter-sgray-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9617,7 +9617,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, srgb-8" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 @@ -9629,7 +9629,7 @@ INCLUDE "ipp-2.0.test" ATTR name requesting-user-name $user ATTR mimeMediaType document-format image/pwg-raster ATTR name job-name "onepage-letter" - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9637,7 +9637,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, srgb-8, deflate" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_DEFLATE @@ -9652,7 +9652,7 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression deflate ATTR name job-name "onepage-letter" COMPRESSION deflate - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH @@ -9660,7 +9660,7 @@ INCLUDE "ipp-2.0.test" { NAME "Print onepage-letter @ 720dpi, srgb-8, gzip" - SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + SKIP-IF-MISSING pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg SKIP-IF-NOT-DEFINED HAVE_720DPI SKIP-IF-NOT-DEFINED HAVE_SRGB_8 SKIP-IF-NOT-DEFINED HAVE_GZIP @@ -9675,8 +9675,13 @@ INCLUDE "ipp-2.0.test" ATTR keyword compression gzip ATTR name job-name "onepage-letter" COMPRESSION gzip - FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg + FILE pwg-raster-samples-720dpi-20150616/srgb-8/onepage-letter-srgb-8-720dpi.pwg STATUS successful-ok STATUS server-error-busy REPEAT-MATCH } + + +# +# End of "$Id$". +# diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 41dace7..1063be4 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -3,8 +3,8 @@ # Perform the complete set of IPP compliance tests specified in the # CUPS Software Test Plan. # -# Copyright 2007-2017 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. +# Copyright © 2007-2018 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 @@ -304,8 +304,9 @@ for file in ../locale/cups_*.po; do loc=`basename $file .po | cut -c 6-` mkdir $BASE/share/locale/$loc ln -s $root/locale/cups_$loc.po $BASE/share/locale/$loc - ln -s $root/locale/ppdc_$loc.po $BASE/share/locale/$loc done +mkdir $BASE/share/locale/en +ln -s $root/locale/cups.pot $BASE/share/locale/en/cups_en.po mkdir $BASE/share/mime mkdir $BASE/share/model mkdir $BASE/share/ppdc @@ -319,6 +320,7 @@ mkdir $BASE/ssl ln -s $root/backend/dnssd $BASE/bin/backend ln -s $root/backend/http $BASE/bin/backend ln -s $root/backend/ipp $BASE/bin/backend +ln -s ipp $BASE/bin/backend/ipps ln -s $root/backend/lpd $BASE/bin/backend ln -s $root/backend/mdns $BASE/bin/backend ln -s $root/backend/pseudo $BASE/bin/backend @@ -914,9 +916,9 @@ else fi # Paged printed on Test3 -count=`$GREP '^Test3 ' $BASE/log/page_log | grep -v total | awk 'BEGIN{count=0}{count=count+$7}END{print count}'` +count=`$GREP '^Test3 ' $BASE/log/page_log | awk 'BEGIN{count=0}{count=count+$7}END{print count}'` expected=2 -if test $count != $expected; then +if test $count -lt $expected; then echo "FAIL: Printer 'Test3' produced $count page(s), expected $expected." echo "

FAIL: Printer 'Test3' produced $count page(s), expected $expected.

" >>$strfile fail=`expr $fail + 1` diff --git a/test/testfile.ps b/test/testfile.ps index bf8c36c..a86f666 100644 --- a/test/testfile.ps +++ b/test/testfile.ps @@ -12,15 +12,15 @@ %%BeginProlog %%BeginResource procset testprint 1.3 0 % -% PostScript test page for CUPS. +% PostScript test page for CUPS. % -% Copyright 2007-2011 Apple Inc. -% Copyright 1993-2007 Easy Software Products +% Copyright (c) 2007-2011 Apple Inc. +% Copyright (c) 1993-2007 Easy Software Products % -% 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 is included with the CUPS source distribution. +% 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 is included with the CUPS source distribution. % /SEXTANT { % Draw a color wheel sextant... % (name) white radius r g b SEXTANT - @@ -573,10 +573,10 @@ gsave pageHeight 8 mul % Move down... 2 copy moveto % Position text smallFont setfont % Font - (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show + (Copyright 2007-2018 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are trademarks) show pageHeight 2 add sub % Move down... 2 copy moveto % Position text - (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + (of Apple Inc., One Apple Park Way, Cupertino, CA 95014, USA.) show pageHeight 2 mul 4 add sub % Move down... moveto % Position text (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show @@ -592,7 +592,4 @@ gsave % Show the page... grestore showpage -% -% End of "$Id: testfile.ps 6649 2007-07-11 21:46:42Z mike $". -% %%EOF diff --git a/vcnet/config.h b/vcnet/config.h index 96ec5fa..3507703 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -1,8 +1,8 @@ /* * Configuration file for CUPS on Windows. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -56,8 +56,8 @@ * and strnicmp() functions... */ -#define strcasecmp stricmp -#define strncasecmp strnicmp +#define strcasecmp _stricmp +#define strncasecmp _strnicmp /* @@ -94,8 +94,8 @@ typedef unsigned long useconds_t; * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.6" -#define CUPS_MINIMAL "CUPS/2.2.6" +#define CUPS_SVERSION "CUPS v2.2.7" +#define CUPS_MINIMAL "CUPS/2.2.7" /* diff --git a/vcnet/cupstestppd.vcxproj b/vcnet/cupstestppd.vcxproj index d10ded7..0d1bab8 100644 --- a/vcnet/cupstestppd.vcxproj +++ b/vcnet/cupstestppd.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,29 @@ {6BE0CDD3-4ED7-409C-A80F-19DF73664B1F} cupstestppd Win32Proj + 10.0.15063.0 Application - v140 + v141 Unicode true Application - v140 + v141 Unicode Application - v140 + v141 Unicode true Application - v140 + v141 Unicode diff --git a/vcnet/ippfind.vcxproj b/vcnet/ippfind.vcxproj index 0aaa804..ccbfd1e 100644 --- a/vcnet/ippfind.vcxproj +++ b/vcnet/ippfind.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,29 @@ {B484DA0C-62C8-4C32-83B6-CCEB58968B85} ippfind Win32Proj + 10.0.15063.0 Application - v140 + v141 Unicode true Application - v140 + v141 Unicode Application - v140 + v141 Unicode true Application - v140 + v141 Unicode diff --git a/vcnet/ippserver.vcxproj b/vcnet/ippserver.vcxproj index da0afa1..0b7a840 100644 --- a/vcnet/ippserver.vcxproj +++ b/vcnet/ippserver.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,29 @@ {82A03BC7-0746-4B85-8908-3C7A3FAA58A9} ippserver Win32Proj + 10.0.15063.0 Application - v140 + v141 Unicode true Application - v140 + v141 Unicode Application - v140 + v141 Unicode true Application - v140 + v141 Unicode diff --git a/vcnet/ipptool.vcxproj b/vcnet/ipptool.vcxproj index cc34fbc..8825c74 100644 --- a/vcnet/ipptool.vcxproj +++ b/vcnet/ipptool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,29 @@ {B246D91E-61F2-4433-BFD2-6C2A96FBD4D4} ipptool Win32Proj + 10.0.15063.0 Application - v140 + v141 Unicode true Application - v140 + v141 Unicode Application - v140 + v141 Unicode true Application - v140 + v141 Unicode diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj index 5ac35be..b60acc3 100644 --- a/vcnet/libcups2.vcxproj +++ b/vcnet/libcups2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,26 +22,27 @@ {CB4AA6F2-3E84-45BE-B505-95CD375E8BE3} libcups2 Win32Proj + 10.0.15063.0 DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte @@ -386,6 +387,7 @@ xcopy /I/Y "$(TargetPath)" + @@ -423,5 +425,12 @@ xcopy /I/Y "$(TargetPath)" + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/vcnet/libcups2.vcxproj.filters b/vcnet/libcups2.vcxproj.filters index 91f3269..7f6f301 100644 --- a/vcnet/libcups2.vcxproj.filters +++ b/vcnet/libcups2.vcxproj.filters @@ -167,6 +167,7 @@ Source Files + diff --git a/vcnet/libcupsimage2.vcxproj b/vcnet/libcupsimage2.vcxproj index e9534ff..7d8b9ee 100644 --- a/vcnet/libcupsimage2.vcxproj +++ b/vcnet/libcupsimage2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,26 +21,27 @@ {CB4AA6F2-3E84-45BE-B505-95CD375E1234} Win32Proj + 10.0.15063.0 DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte DynamicLibrary - v140 + v141 MultiByte diff --git a/vcnet/regex.vcxproj b/vcnet/regex.vcxproj index 44ad98e..48a34bb 100644 --- a/vcnet/regex.vcxproj +++ b/vcnet/regex.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,28 +22,29 @@ {18950A1B-D37A-40C7-B2DF-C12986C0526E} regex Win32Proj + 10.0.15063.0 DynamicLibrary - v140 + v141 Unicode true DynamicLibrary - v140 + v141 Unicode DynamicLibrary - v140 + v141 Unicode true DynamicLibrary - v140 + v141 Unicode diff --git a/vcnet/testfile.vcxproj b/vcnet/testfile.vcxproj index 9682d93..c89e57b 100644 --- a/vcnet/testfile.vcxproj +++ b/vcnet/testfile.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,16 +13,17 @@ {CE75FC5F-E0CF-45DC-AD27-84666D3FBA30} Win32Proj + 10.0.15063.0 Application - v140 + v141 MultiByte Application - v140 + v141 MultiByte diff --git a/vcnet/testhttp.vcxproj b/vcnet/testhttp.vcxproj index 3f1e513..c61a3c7 100644 --- a/vcnet/testhttp.vcxproj +++ b/vcnet/testhttp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,16 +13,17 @@ {90B0058C-8393-411F-BD3B-E2C831D4E883} Win32Proj + 10.0.15063.0 Application - v140 + v141 MultiByte Application - v140 + v141 MultiByte diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index 1f96704..55ca460 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -7215,7 +7215,7 @@ 72BF96371333042100B1EAD7 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Apple Inc."; TargetAttributes = { 270695FD1CADF3E200FFE5FB = { @@ -9407,6 +9407,7 @@ 270696581CADF3E200FFE5FB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; @@ -9426,6 +9427,7 @@ 270696591CADF3E200FFE5FB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; @@ -9445,6 +9447,7 @@ 270CCDAD135E3C9E00007BE2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9452,6 +9455,7 @@ 270CCDAE135E3C9E00007BE2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9459,6 +9463,7 @@ 270D02221D707E0200EA9403 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9466,6 +9471,7 @@ 270D02231D707E0200EA9403 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9473,6 +9479,7 @@ 271284EA1CC1261900E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9481,6 +9488,7 @@ 271284EB1CC1261900E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9489,6 +9497,7 @@ 271284F71CC1264B00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9497,6 +9506,7 @@ 271284F81CC1264B00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9505,6 +9515,7 @@ 271285041CC1265D00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9513,6 +9524,7 @@ 271285051CC1265D00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9521,6 +9533,7 @@ 271285111CC1267A00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9529,6 +9542,7 @@ 271285121CC1267A00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9537,6 +9551,7 @@ 2712851E1CC1269700E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9545,6 +9560,7 @@ 2712851F1CC1269700E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9553,6 +9569,7 @@ 2712852B1CC126AA00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9561,6 +9578,7 @@ 2712852C1CC126AA00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9569,6 +9587,7 @@ 271285381CC1270B00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9577,6 +9596,7 @@ 271285391CC1270B00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9585,6 +9605,7 @@ 271285451CC1271E00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9593,6 +9614,7 @@ 271285461CC1271E00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9601,6 +9623,7 @@ 271285521CC1272D00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9609,6 +9632,7 @@ 271285531CC1272D00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9617,6 +9641,7 @@ 2712855F1CC1274300E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9625,6 +9650,7 @@ 271285601CC1274300E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9633,6 +9659,7 @@ 2712856C1CC1275200E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9641,6 +9668,7 @@ 2712856D1CC1275200E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9649,6 +9677,7 @@ 271285791CC1276400E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9657,6 +9686,7 @@ 2712857A1CC1276400E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9665,6 +9695,7 @@ 2712859E1CC12D1300E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9673,6 +9704,7 @@ 2712859F1CC12D1300E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9681,6 +9713,7 @@ 271285AD1CC12D3A00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9689,6 +9722,7 @@ 271285AE1CC12D3A00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9697,6 +9731,7 @@ 271285BB1CC12D4E00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9705,6 +9740,7 @@ 271285BC1CC12D4E00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9713,6 +9749,7 @@ 271285C91CC12D5E00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9721,6 +9758,7 @@ 271285CA1CC12D5E00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = "/usr/libexec/cups/cgi-bin"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9729,6 +9767,7 @@ 271285D61CC12DBF00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9737,6 +9776,7 @@ 271285D71CC12DBF00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9745,6 +9785,7 @@ 271285E31CC12DDF00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9753,6 +9794,7 @@ 271285E41CC12DDF00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9761,6 +9803,7 @@ 271285F01CC12E2D00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9769,6 +9812,7 @@ 271285F11CC12E2D00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9777,6 +9821,7 @@ 271285FE1CC12EEB00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9785,6 +9830,7 @@ 271285FF1CC12EEB00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9793,6 +9839,7 @@ 271286111CC12F0B00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9801,6 +9848,7 @@ 271286121CC12F0B00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9809,6 +9857,7 @@ 271286211CC12F1A00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9817,6 +9866,7 @@ 271286221CC12F1A00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9825,6 +9875,7 @@ 271286651CC1309000E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9832,6 +9883,7 @@ 271286661CC1309000E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9839,6 +9891,7 @@ 2712867B1CC1310E00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9846,6 +9899,7 @@ 2712867C1CC1310E00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9853,6 +9907,7 @@ 271286941CC13DC000E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9860,6 +9915,7 @@ 271286951CC13DC000E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9867,6 +9923,7 @@ 271286A51CC13DF100E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9874,6 +9931,7 @@ 271286A61CC13DF100E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9881,6 +9939,7 @@ 271286B61CC13DFF00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9888,6 +9947,7 @@ 271286B71CC13DFF00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9895,6 +9955,7 @@ 271286C71CC13E2100E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/monitor; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9903,6 +9964,7 @@ 271286C81CC13E2100E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/monitor; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9911,6 +9973,7 @@ 271286D71CC13E5B00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/monitor; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9919,6 +9982,7 @@ 271286D81CC13E5B00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/monitor; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9927,6 +9991,7 @@ 271286F11CC13F2000E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/notifier; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9935,6 +10000,7 @@ 271286F21CC13F2000E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/notifier; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9943,6 +10009,7 @@ 271287011CC13F3F00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/notifier; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9951,6 +10018,7 @@ 271287021CC13F3F00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/notifier; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9959,6 +10027,7 @@ 271287161CC13FAB00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9966,6 +10035,7 @@ 271287171CC13FAB00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -9973,6 +10043,7 @@ 2712872A1CC140BE00E517C7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9981,6 +10052,7 @@ 2712872B1CC140BE00E517C7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -9989,6 +10061,7 @@ 273BF6C41333B5000022CAAB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -9996,6 +10069,7 @@ 273BF6C51333B5000022CAAB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10003,6 +10077,7 @@ 273BF6DB1333B6270022CAAB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10010,6 +10085,7 @@ 273BF6DC1333B6270022CAAB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10017,6 +10093,7 @@ 274FF5D313332B1F00317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10025,6 +10102,7 @@ 274FF5D413332B1F00317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10033,6 +10111,7 @@ 274FF5E013332D3100317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -10041,6 +10120,7 @@ 274FF5E113332D3100317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -10049,6 +10129,7 @@ 274FF5F0133330C800317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10061,6 +10142,7 @@ 274FF5F1133330C800317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10073,6 +10155,7 @@ 274FF6301333333600317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10081,6 +10164,7 @@ 274FF6311333333600317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10089,6 +10173,7 @@ 274FF6451333358C00317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10097,6 +10182,7 @@ 274FF6461333358C00317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10105,6 +10191,7 @@ 274FF656133339C400317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10113,6 +10200,7 @@ 274FF657133339C400317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/daemon; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10121,6 +10209,7 @@ 274FF67F13333B2F00317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10129,6 +10218,7 @@ 274FF68013333B2F00317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10137,6 +10227,7 @@ 274FF6DE1333B1C400317ECB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10151,6 +10242,7 @@ 274FF6DF1333B1C400317ECB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10165,6 +10257,7 @@ 276683631337A9B6000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10173,6 +10266,7 @@ 276683641337A9B6000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10181,6 +10275,7 @@ 276683771337AC79000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10189,6 +10284,7 @@ 276683781337AC79000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10197,6 +10293,7 @@ 276683841337AC8C000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10205,6 +10302,7 @@ 276683851337AC8C000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10213,6 +10311,7 @@ 276683911337AC97000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10221,6 +10320,7 @@ 276683921337AC97000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10229,6 +10329,7 @@ 2766839E1337ACA2000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10237,6 +10338,7 @@ 2766839F1337ACA2000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10245,6 +10347,7 @@ 276683AB1337ACAB000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10253,6 +10356,7 @@ 276683AC1337ACAB000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10261,6 +10365,7 @@ 276683F71337F78F000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10269,6 +10374,7 @@ 276683F81337F78F000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10277,6 +10383,7 @@ 2766840B1337FA1E000D33D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10285,6 +10392,7 @@ 2766840C1337FA1E000D33D0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10293,6 +10401,7 @@ 2767FC4E19266A0D000F61D3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = testdest; }; name = Debug; @@ -10300,6 +10409,7 @@ 2767FC4F19266A0D000F61D3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = testdest; }; name = Release; @@ -10307,6 +10417,7 @@ 278C58D1136B640300836530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10314,6 +10425,7 @@ 278C58D2136B640300836530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10326,6 +10438,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -10363,6 +10476,7 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; @@ -10389,6 +10503,7 @@ 720DD6C91358FD5F0064AA82 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10397,6 +10512,7 @@ 720DD6CA1358FD5F0064AA82 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10405,6 +10521,7 @@ 72220EB01333047D00FCA411 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; DYLIB_CURRENT_VERSION = 2.12.0; @@ -10419,6 +10536,7 @@ 72220EB11333047D00FCA411 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DYLIB_COMPATIBILITY_VERSION = 2.0.0; DYLIB_CURRENT_VERSION = 2.12.0; @@ -10433,6 +10551,7 @@ 72220F6213330A5A00FCA411 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10441,6 +10560,7 @@ 72220F6313330A5A00FCA411 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/sbin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10449,6 +10569,7 @@ 72220FAE13330B2300FCA411 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10459,6 +10580,7 @@ 72220FAF13330B2300FCA411 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10469,6 +10591,7 @@ 724379041333E43E009631B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_MODE_FLAG = "u+rwX,go-rwX"; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -10478,6 +10601,7 @@ 724379051333E43E009631B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_MODE_FLAG = "u+rwX,go-rwX"; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -10487,6 +10611,7 @@ 7243791F1333E532009631B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10495,6 +10620,7 @@ 724379201333E532009631B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10503,6 +10629,7 @@ 724379371333FB85009631B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10511,6 +10638,7 @@ 724379381333FB85009631B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10519,6 +10647,7 @@ 7243794E1333FEA9009631B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10527,6 +10656,7 @@ 7243794F1333FEA9009631B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10535,6 +10665,7 @@ 724379621333FF1D009631B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10543,6 +10674,7 @@ 724379631333FF1D009631B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/backend; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -10551,6 +10683,7 @@ 724FA5331CC0370C0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10558,6 +10691,7 @@ 724FA5341CC0370C0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10565,6 +10699,7 @@ 724FA5461CC037370092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10572,6 +10707,7 @@ 724FA5471CC037370092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10579,6 +10715,7 @@ 724FA5591CC037500092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10586,6 +10723,7 @@ 724FA55A1CC037500092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10593,6 +10731,7 @@ 724FA56C1CC037670092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10600,6 +10739,7 @@ 724FA56D1CC037670092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10607,6 +10747,7 @@ 724FA57F1CC037810092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10614,6 +10755,7 @@ 724FA5801CC037810092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10621,6 +10763,7 @@ 724FA5921CC037980092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10628,6 +10771,7 @@ 724FA5931CC037980092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10635,6 +10779,7 @@ 724FA5A51CC037AA0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10642,6 +10787,7 @@ 724FA5A61CC037AA0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10649,6 +10795,7 @@ 724FA5B81CC037C60092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10656,6 +10803,7 @@ 724FA5B91CC037C60092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10663,6 +10811,7 @@ 724FA5CB1CC037D90092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10670,6 +10819,7 @@ 724FA5CC1CC037D90092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10677,6 +10827,7 @@ 724FA5DF1CC037F00092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10684,6 +10835,7 @@ 724FA5E01CC037F00092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10691,6 +10843,7 @@ 724FA5F31CC038040092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10698,6 +10851,7 @@ 724FA5F41CC038040092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10705,6 +10859,7 @@ 724FA6071CC038190092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10712,6 +10867,7 @@ 724FA6081CC038190092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10719,6 +10875,7 @@ 724FA61B1CC0382B0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10726,6 +10883,7 @@ 724FA61C1CC0382B0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10733,6 +10891,7 @@ 724FA62F1CC038410092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10740,6 +10899,7 @@ 724FA6301CC038410092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10747,6 +10907,7 @@ 724FA6431CC038560092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10754,6 +10915,7 @@ 724FA6441CC038560092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10761,6 +10923,7 @@ 724FA6571CC0386E0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10768,6 +10931,7 @@ 724FA6581CC0386E0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10775,6 +10939,7 @@ 724FA66E1CC038A50092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10782,6 +10947,7 @@ 724FA66F1CC038A50092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10789,6 +10955,7 @@ 724FA6811CC038BD0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10796,6 +10963,7 @@ 724FA6821CC038BD0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10803,6 +10971,7 @@ 724FA6951CC038D90092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10810,6 +10979,7 @@ 724FA6961CC038D90092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10817,6 +10987,7 @@ 724FA6A81CC039200092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10824,6 +10995,7 @@ 724FA6A91CC039200092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10831,6 +11003,7 @@ 724FA6BB1CC0393E0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10838,6 +11011,7 @@ 724FA6BC1CC0393E0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10845,6 +11019,7 @@ 724FA6CF1CC0395A0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10852,6 +11027,7 @@ 724FA6D01CC0395A0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10859,6 +11035,7 @@ 724FA6E81CC039DE0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10866,6 +11043,7 @@ 724FA6E91CC039DE0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10873,6 +11051,7 @@ 724FA6FD1CC03A210092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -10880,6 +11059,7 @@ 724FA6FE1CC03A210092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -10887,6 +11067,7 @@ 724FA70D1CC03A490092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10899,6 +11080,7 @@ 724FA70E1CC03A490092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10911,6 +11093,7 @@ 724FA71D1CC03A990092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10923,6 +11106,7 @@ 724FA71E1CC03A990092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10935,6 +11119,7 @@ 724FA73E1CC03AAF0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10949,6 +11134,7 @@ 724FA73F1CC03AAF0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10963,6 +11149,7 @@ 724FA74D1CC03ACC0092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10973,6 +11160,7 @@ 724FA74E1CC03ACC0092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -10983,6 +11171,7 @@ 724FA7691CC03AF60092477B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -10995,6 +11184,7 @@ 724FA76A1CC03AF60092477B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; @@ -11007,6 +11197,7 @@ 7258EAEA134594C4009286F1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -11015,6 +11206,7 @@ 7258EAEB134594C4009286F1 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/libexec/cups/filter; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -11023,6 +11215,7 @@ 726AD6FF135E88F1002C930D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -11030,6 +11223,7 @@ 726AD700135E88F1002C930D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -11039,10 +11233,14 @@ buildSettings = { ASSETCATALOG_COMPRESSION = lossless; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -11084,10 +11282,14 @@ buildSettings = { ASSETCATALOG_COMPRESSION = "respect-asset-catalog"; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -11124,6 +11326,7 @@ 72CF95EF18A19134000FCAE4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "ipptool copy"; }; @@ -11132,6 +11335,7 @@ 72CF95F018A19134000FCAE4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "ipptool copy"; }; @@ -11140,6 +11344,7 @@ 72F75A591336F951004BB496 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -11148,6 +11353,7 @@ 72F75A5A1336F951004BB496 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; INSTALL_PATH = /usr/bin; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -11156,6 +11362,7 @@ 72F75A631336F9A3004BB496 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; @@ -11166,6 +11373,7 @@ 72F75A641336F9A3004BB496 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; diff --git a/xcode/config.h b/xcode/config.h index 76d521c..c9acd93 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -1,8 +1,8 @@ /* * Configuration file for CUPS and Xcode. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -22,8 +22,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v2.2.6" -#define CUPS_MINIMAL "CUPS/2.2.6" +#define CUPS_SVERSION "CUPS v2.2.7" +#define CUPS_MINIMAL "CUPS/2.2.7" /* -- 2.7.4