From 94436c5a61aea055504f3ef734f968683b39730d Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 10 May 2013 16:04:59 +0000 Subject: [PATCH] Final sync-up with cups.org trunk repository git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4297 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.6.txt | 8 + CHANGES-IPPTOOL.txt | 9 +- CHANGES.txt | 2 +- INSTALL.txt | 2 +- IPPTOOL.txt | 7 +- README.txt | 2 +- backend/ipp.c | 2 +- backend/testbackend.c | 14 +- backend/usb-libusb.c | 22 +- cups/language.c | 25 +- cups/libcups2.def | 23 +- doc/help/man-backend.html | 171 +++++ doc/help/man-cancel.html | 81 ++ doc/help/man-classes.conf.html | 125 +++ doc/help/man-client.conf.html | 62 ++ doc/help/man-cups-config.html | 125 +++ doc/help/man-cups-deviced.html | 38 + doc/help/man-cups-driverd.html | 122 +++ doc/help/man-cups-files.conf.html | 169 ++++ doc/help/man-cups-lpd.html | 117 +++ doc/help/man-cups-snmp.conf.html | 82 ++ doc/help/man-cups-snmp.html | 52 ++ doc/help/man-cupsaccept.html | 77 ++ doc/help/man-cupsaddsmb.html | 205 +++++ doc/help/man-cupsctl.html | 98 +++ doc/help/man-cupsd.conf.html | 674 ++++++++++++++++ doc/help/man-cupsd.html | 74 ++ doc/help/man-cupsenable.html | 93 +++ doc/help/man-cupsfilter.html | 119 +++ doc/help/man-cupstestdsc.html | 44 ++ doc/help/man-cupstestppd.html | 181 +++++ doc/help/man-filter.html | 267 +++++++ doc/help/man-lp.html | 284 +++++++ doc/help/man-lpadmin.html | 248 ++++++ doc/help/man-lpc.html | 71 ++ doc/help/man-lpinfo.html | 122 +++ doc/help/man-lpmove.html | 65 ++ doc/help/man-lpoptions.html | 138 ++++ doc/help/man-lppasswd.html | 64 ++ doc/help/man-lpq.html | 73 ++ doc/help/man-lpr.html | 133 ++++ doc/help/man-lprm.html | 65 ++ doc/help/man-lpstat.html | 154 ++++ doc/help/man-mailto.conf.html | 60 ++ doc/help/man-mime.convs.html | 38 + doc/help/man-mime.types.html | 118 +++ doc/help/man-notifier.html | 173 +++++ doc/help/man-ppdc.html | 65 ++ doc/help/man-ppdcfile.html | 226 ++++++ doc/help/man-ppdhtml.html | 38 + doc/help/man-ppdi.html | 39 + doc/help/man-ppdmerge.html | 40 + doc/help/man-ppdpo.html | 43 ++ doc/help/man-printers.conf.html | 144 ++++ doc/help/man-subscriptions.conf.html | 96 +++ packaging/cups.spec.in | 13 +- scheduler/client.c | 27 +- scheduler/colorman.c | 23 +- scheduler/ipp.c | 14 +- scheduler/job.c | 11 +- scheduler/main.c | 2 +- systemv/cupstestppd.c | 2 +- test/Makefile | 3 +- test/create-job-format.test | 8 +- test/create-job-sheets.test | 8 +- test/get-devices.test | 4 +- test/get-job-attributes.test | 4 +- test/get-job-attributes2.test | 4 +- test/get-ppds-drv-only.test | 4 +- test/get-ppds.test | 4 +- test/get-subscriptions.test | 4 +- test/set-attrs-hold.test | 28 +- tools/makeipptoolpkg | 3 + vcnet/README.txt | 27 + vcnet/cups.sln | 5 +- vcnet/ipptool-installer.vdproj | 144 ++-- vcnet/libcups2-installer.vdproj | 1057 +++++++++++++++++++++++--- vcnet/libcups2.vcproj | 13 + vcnet/regex.vcproj | 154 ++++ 79 files changed, 6917 insertions(+), 238 deletions(-) create mode 100644 doc/help/man-backend.html create mode 100644 doc/help/man-cancel.html create mode 100644 doc/help/man-classes.conf.html create mode 100644 doc/help/man-client.conf.html create mode 100644 doc/help/man-cups-config.html create mode 100644 doc/help/man-cups-deviced.html create mode 100644 doc/help/man-cups-driverd.html create mode 100644 doc/help/man-cups-files.conf.html create mode 100644 doc/help/man-cups-lpd.html create mode 100644 doc/help/man-cups-snmp.conf.html create mode 100644 doc/help/man-cups-snmp.html create mode 100644 doc/help/man-cupsaccept.html create mode 100644 doc/help/man-cupsaddsmb.html create mode 100644 doc/help/man-cupsctl.html create mode 100644 doc/help/man-cupsd.conf.html create mode 100644 doc/help/man-cupsd.html create mode 100644 doc/help/man-cupsenable.html create mode 100644 doc/help/man-cupsfilter.html create mode 100644 doc/help/man-cupstestdsc.html create mode 100644 doc/help/man-cupstestppd.html create mode 100644 doc/help/man-filter.html create mode 100644 doc/help/man-lp.html create mode 100644 doc/help/man-lpadmin.html create mode 100644 doc/help/man-lpc.html create mode 100644 doc/help/man-lpinfo.html create mode 100644 doc/help/man-lpmove.html create mode 100644 doc/help/man-lpoptions.html create mode 100644 doc/help/man-lppasswd.html create mode 100644 doc/help/man-lpq.html create mode 100644 doc/help/man-lpr.html create mode 100644 doc/help/man-lprm.html create mode 100644 doc/help/man-lpstat.html create mode 100644 doc/help/man-mailto.conf.html create mode 100644 doc/help/man-mime.convs.html create mode 100644 doc/help/man-mime.types.html create mode 100644 doc/help/man-notifier.html create mode 100644 doc/help/man-ppdc.html create mode 100644 doc/help/man-ppdcfile.html create mode 100644 doc/help/man-ppdhtml.html create mode 100644 doc/help/man-ppdi.html create mode 100644 doc/help/man-ppdmerge.html create mode 100644 doc/help/man-ppdpo.html create mode 100644 doc/help/man-printers.conf.html create mode 100644 doc/help/man-subscriptions.conf.html create mode 100644 vcnet/README.txt diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt index 6d94e5e03..b1d718471 100644 --- a/CHANGES-1.6.txt +++ b/CHANGES-1.6.txt @@ -5,6 +5,14 @@ CHANGES IN CUPS V1.6.3 - The configure script now prefers Clang over GCC. - Fixed a compile problem on AIX (STR #4307) + - Fixed several ipptool test files that used old STATUS names. + - Kerberos credentials could get truncated when printing to a shared + printer. + - Printing using "ipps" URIs was not encrypted. + - Insecure ICC profiles prevented installation of user profiles for a + printer on OS X. + - Added more USB quirks for the libusb-based backend (STR #4311, + ) - The Russian web interface templates were broken (STR #4310) - The scheduler no longer tries to do Kerberos authentication over the loopback interface. diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index 2efec97c0..0fc207848 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -1,12 +1,17 @@ -CHANGES-IPPTOOL.txt - 2013-02-20 +CHANGES-IPPTOOL.txt - 2013-05-02 -------------------------------- This file provides a list of changes to the ipptool binary distribution posted on cups.org. +2013-05-02 -2013-02-nn + - Fixed several ipptool test files that used old STATUS names. + +2013-04-18 + + - Fixed some HTTP issues with authentication and compression. - The IPP/1.1 test file did not allow for sufficient retries when printing. - The IPP/1.1 test file did not allow for empty printer-name values. diff --git a/CHANGES.txt b/CHANGES.txt index f85fc21ce..757e4bb9f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 1.7b1 - 2013-04-09 +CHANGES.txt - 1.7b1 - 2013-04-18 -------------------------------- CHANGES IN CUPS V1.7b1 diff --git a/INSTALL.txt b/INSTALL.txt index 1295bbc29..2ec6992cc 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.7b1 - 2013-04-09 +INSTALL - CUPS v1.7b1 - 2013-04-18 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/IPPTOOL.txt b/IPPTOOL.txt index b7e0c49d7..150605766 100644 --- a/IPPTOOL.txt +++ b/IPPTOOL.txt @@ -1,4 +1,4 @@ -IPPTOOL.txt - 2013-01-31 +IPPTOOL.txt - 2013-05-02 ------------------------ See the file CHANGES-IPPTOOL.txt for a list of changes to this software. @@ -57,6 +57,7 @@ STANDARD TEST FILES get-notifications.test Shows events for an ippget subscription. get-printer-attributes.test Shows printer attributes + get-subscriptions.test Shows a list of subscriptions ipp-1.1.test IPP/1.1 conformance test suite ipp-2.0.test IPP/2.0 conformance test suite ipp-2.1.test IPP/2.1 conformance test suite @@ -67,6 +68,8 @@ STANDARD TEST FILES print-job-deflate.test Prints a file, compressing with deflate. print-job-gzip.test Prints a file, compressing with gzip + validate-job.test Validates attributes for a job + submission. CONFORMANCE TESTS @@ -120,7 +123,7 @@ CONFORMANCE TESTS ipps://192.168.0.1/ipp/print Print-by-reference (URL) printing can be tested by defining the document-uri - variable to a URL, for example: + variable as a URL, for example: ipptool -tf filename -d document-uri=url -I printer-uri ipp-1.1.test diff --git a/README.txt b/README.txt index 4792fe5ad..136d9ed6d 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v1.7b1 - 2013-04-09 +README - CUPS v1.7b1 - 2013-04-18 --------------------------------- ************************************************ diff --git a/backend/ipp.c b/backend/ipp.c index 85029a69b..9a474b9e0 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -431,7 +431,7 @@ main(int argc, /* I - Number of command-line args */ if (!port) port = IPP_PORT; /* Default to port 631 */ - if (!strcmp(scheme, "https")) + if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps")) cupsSetEncryption(HTTP_ENCRYPT_ALWAYS); else cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED); diff --git a/backend/testbackend.c b/backend/testbackend.c index 454533f5d..722859f7f 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -667,7 +667,19 @@ walk_cb(const char *oid, /* I - OID */ int datalen, /* I - Length of data */ void *context) /* I - Context (unused) */ { - printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, data); + char temp[80]; + if (datalen > (sizeof(temp) - 1)) + { + memcpy(temp, data, sizeof(temp) - 1); + temp[sizeof(temp) - 1] = '\0'; + } + else + { + memcpy(temp, data, datalen); + temp[datalen] = '\0'; + } + + printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, temp); } diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index 4c71e6586..bbce39a62 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -142,8 +142,12 @@ static const struct quirk_printer_struct quirk_printers[] = { { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ + { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, + Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut */ + { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D + Printer, https://bugs.launchpad.net/bugs/1160638 */ { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 @@ -158,6 +162,8 @@ static const struct quirk_printer_struct quirk_printers[] = { Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 + Printer, https://bugs.launchpad.net/bugs/1160638 */ { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695 */ @@ -165,24 +171,33 @@ static const struct quirk_printer_struct quirk_printers[] = { USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253 */ + { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1450 Laser Printer, + https://bugs.launchpad.net/bugs/1000253 */ { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. Okipage 14ex Printer, https://bugs.launchpad.net/bugs/872483 */ { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, https://bugs.launchpad.net/bugs/872483 */ - { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, + { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, http://bugs.debian.org/697970 */ + { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, + https://bugs.launchpad.net/bugs/872483 */ { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */ { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | USBLP_QUIRK_NO_REATTACH | USBLP_QUIRK_RESET }, + /* Prolific Technology, Inc. PL2305 Parallel Port + (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 https://bugs.launchpad.net/bugs/1102470 */ - /* Prolific Technology, Inc. PL2305 Parallel Port - (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ + { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics + CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, https://bugs.launchpad.net/bugs/1032456 */ { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, @@ -215,6 +230,7 @@ static const struct quirk_printer_struct quirk_printers[] = { { 0x04a9, 0x3256, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP810 */ { 0x04a9, 0x30F5, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP500 */ { 0x04a9, 0x31AF, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES3 */ + { 0x04a9, 0x31DD, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */ /* MISSING PIDs: CP520, CP530, CP790 */ { 0, 0 } }; diff --git a/cups/language.c b/cups/language.c index aee4dee3b..accdac768 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1184,24 +1184,40 @@ appleLangDefault(void) { if (getenv("SOFTWARE") != NULL && (lang = getenv("LANG")) != NULL) { + DEBUG_printf(("3appleLangDefault: Using LANG=%s", lang)); strlcpy(cg->language, lang, sizeof(cg->language)); return (cg->language); } else if ((bundle = CFBundleGetMainBundle()) != NULL && (bundleList = CFBundleCopyBundleLocalizations(bundle)) != NULL) { + DEBUG_puts("3appleLangDefault: Getting localizationList from bundle."); + localizationList = CFBundleCopyPreferredLocalizationsFromArray(bundleList); CFRelease(bundleList); } else + { + DEBUG_puts("3appleLangDefault: Getting localizationList from preferences."); + localizationList = CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), kCFPreferencesCurrentApplication); + } if (localizationList) { + +#ifdef DEBUG + if (CFGetTypeID(localizationList) == CFArrayGetTypeID()) + DEBUG_printf(("3appleLangDefault: Got localizationList, %d entries.", + (int)CFArrayGetCount(localizationList))); + else + DEBUG_puts("3appleLangDefault: Got localizationList but not an array."); +#endif /* DEBUG */ + if (CFGetTypeID(localizationList) == CFArrayGetTypeID() && CFArrayGetCount(localizationList) > 0) { @@ -1219,7 +1235,7 @@ appleLangDefault(void) kCFStringEncodingASCII); CFRelease(localeName); - DEBUG_printf(("9appleLangDefault: cg->language=\"%s\"", + DEBUG_printf(("3appleLangDefault: cg->language=\"%s\"", cg->language)); /* @@ -1233,7 +1249,7 @@ appleLangDefault(void) { if (!strcmp(cg->language, apple_language_locale[i].language)) { - DEBUG_printf(("9appleLangDefault: mapping \"%s\" to \"%s\"...", + DEBUG_printf(("3appleLangDefault: mapping \"%s\" to \"%s\"...", cg->language, apple_language_locale[i].locale)); strlcpy(cg->language, apple_language_locale[i].locale, sizeof(cg->language)); @@ -1251,6 +1267,8 @@ appleLangDefault(void) if (!strchr(cg->language, '.')) strlcat(cg->language, ".UTF-8", sizeof(cg->language)); } + else + DEBUG_puts("3appleLangDefault: Unable to get localeName."); } } @@ -1262,7 +1280,10 @@ appleLangDefault(void) */ if (!cg->language[0]) + { + DEBUG_puts("3appleLangDefault: Defaulting to en_US."); strlcpy(cg->language, "en_US.UTF-8", sizeof(cg->language)); + } } /* diff --git a/cups/libcups2.def b/cups/libcups2.def index c4cf46212..8745d9e14 100644 --- a/cups/libcups2.def +++ b/cups/libcups2.def @@ -61,14 +61,6 @@ _ppdNormalizeMakeAndModel _ppdOpen _ppdOpenFile _ppdParseOptions -_pwgGenerateSize -_pwgInitSize -_pwgMediaForLegacy -_pwgMediaForPPD -_pwgMediaForPWG -_pwgMediaForSize -_pwgMediaTypeForType -_pwgPageSizeForMedia cupsAddDest cupsAddOption cupsAdminCreateWindowsPPD @@ -134,6 +126,9 @@ cupsFileStdout cupsFileTell cupsFileUnlock cupsFileWrite +cupsFindDestDefault +cupsFindDestReady +cupsFindDestSupported cupsFreeDests cupsFreeJobs cupsFreeOptions @@ -141,6 +136,9 @@ cupsGetClasses cupsGetDefault cupsGetDefault2 cupsGetDest +cupsGetDestMediaByIndex +cupsGetDestMediaCount +cupsGetDestMediaDefault cupsGetDests cupsGetDests2 cupsGetFd @@ -301,6 +299,7 @@ ippContainsInteger ippContainsString ippCopyAttribute ippCopyAttributes +ippCreateRequestedArray ippDateToTime ippDelete ippDeleteAttribute @@ -319,6 +318,7 @@ ippGetDate ippGetGroupTag ippGetInteger ippGetName +ippGetOctetString ippGetOperation ippGetRange ippGetRequestId @@ -346,6 +346,7 @@ ippSetDate ippSetGroupTag ippSetInteger ippSetName +ippSetOctetString ippSetOperation ippSetRange ippSetRequestId @@ -400,3 +401,9 @@ ppdPageLength ppdPageSize ppdPageWidth ppdSetConformance +pwgFormatSizeName +pwgInitSize +pwgMediaForLegacy +pwgMediaForPPD +pwgMediaForPWG +pwgMediaForSize diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html new file mode 100644 index 000000000..5f41e34cd --- /dev/null +++ b/doc/help/man-backend.html @@ -0,0 +1,171 @@ + + + + + + backend(7) + + +

backend(7)

+ +

Name

+backend - cups backend transmission interfaces +

Synopsis

+backend +
+backend +job user title num-copies options [ +filename +] +

Description

+Backends are a special type of filter(7) which is used to send print data +to and discover different devices on the system. +

Like filters, backends must be capable of reading from a filename on the +command-line or from the standard input, copying the standard input to a +temporary file as required by the physical interface. +

The command name (argv[0]) is set to the device URI of the destination printer. +Starting with CUPS 1.1.22, any authentication information in argv[0] is removed, +so backend developers are urged to use the DEVICE_URI environment variable +whenever authentication information is required. The CUPS API includes a +cupsBackendDeviceURI function for retrieving the correct device URI. +

Back-channel data from the device should be relayed to the job +filters by writing to file descriptor 3. The CUPS API includes +the cupsBackChannelWrite function for this purpose. +

Warning

+CUPS backends are not generally design to be run directly by the user. Aside +from the device URI issue (argv[0] and DEVICE_URI environment variable contain +the device URI), CUPS backends also expect specific environment variables and +file descriptors, and typically run in a user session that (on OS X) has +additional restrictions that affect how it runs. Backends can also be installed +with restricted permissions (0500 or 0700) that tell the scheduler to run them +as the "root" user instead of an unprivileged user (typically "lp") on the +system. +

Unless you are a developer and know what you are doing, please do not run +backends directly. Instead, use the lp(1) or lpr(1) programs to send +a print job or lpinfo(8) program to query for available printers using the +backend. The one exception is the SNMP backend - see snmpbackend(8) for +more information. +

Device Discovery

+When run with no arguments, the backend should list the devices and schemes it +supports or is advertising to stdout. The output consists of zero or more lines +consisting of any of the following forms: + +
+    device-class scheme "Unknown" "device-info"
+    device-class device-uri "device-make-and-model" "device-info"
+    device-class device-uri "device-make-and-model" "device-info" "device-id"
+    device-class device-uri "device-make-and-model" "device-info" "device-id" "device-location"
+
+

The device-class field is one of the following values: +

+
direct +
+
+
The device-uri refers to a specific direct-access device with no options, such +as a parallel, USB, or SCSI device. +
+
file +
+
+
The device-uri refers to a file on disk. +
+
network +
+
+
The device-uri refers to a networked device and conforms to the general form for +network URIs. +
+
serial +
+
+
The device-uri refers to a serial device with configurable baud rate and other +options. If the device-uri contains a baud value, it represents the maximum baud +rate supported by the device. +
+
+

The scheme field provides the URI scheme that is supported by the backend. +Backends should use this form only when the backend supports any URI using that +scheme. The device-uri field specifies the full URI to use when +communicating with the device. +

The device-make-and-model field specifies the make and model of the +device, e.g. "Example Foojet 2000". If the make and model is not known, you must +report "Unknown". +

The device-info field specifies additional information about the device. +Typically this includes the make and model along with the port number or network +address, e.g. "Example Foojet 2000 USB #1". +

The optional device-id field specifies the IEEE-1284 device ID string for +the device, which is used to select a matching driver. +

The optional device-location field specifies the physical location of +the device, which is often used to pre-populate the printer-location attribute +when adding a printer. +

Permissions

+Backends without world execute permissions are run as the root user. Otherwise, +the backend is run using an unprivileged user account, typically "lp". +

Exit Codes

+The following exit codes are defined for backends; C API constants defined in +the <cups/backend.h> header file are defined in parenthesis: +
+
0 (CUPS_BACKEND_OK) +
+
+
The print file was successfully transmitted to the device or remote server. +
+
1 (CUPS_BACKEND_FAILED) +
+
+
The print file was not successfully transmitted to the device or remote server. +The scheduler will respond to this by canceling the job, retrying the job, or +stopping the queue depending on the state of the error-policy attribute. +
+
2 (CUPS_BACKEND_AUTH_REQUIRED) +
+
+
The print file was not successfully transmitted because valid authentication +information is required. The scheduler will respond to this by holding the job +and adding the "cups-held-for-authentication" keyword to the "job-reasons" +attribute. +
+
3 (CUPS_BACKEND_HOLD) +
+
+
The print file was not successfully transmitted because it cannot be printed at +this time. The scheduler will respond to this by holding the job. +
+
4 (CUPS_BACKEND_STOP) +
+
+
The print file was not successfully transmitted because it cannot be printed at +this time. The scheduler will respond to this by stopping the queue. +
+
5 (CUPS_BACKEND_CANCEL) +
+
+
The print file was not successfully transmitted because one or more attributes +are not supported or the job was canceled at the printer. The scheduler will +respond to this by canceling the job. +
+
6 (CUPS_BACKEND_RETRY) +
+
+
The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job at a future time - other jobs may print before +this one. +
+
7 (CUPS_BACKEND_RETRY_CURRENT) +
+
+
The print file was not successfully transmitted because of a temporary issue. +The scheduler will retry the job immediately without allowing intervening jobs. +
+
+

All other exit code values are reserved. +

See Also

+cups-snmp(8), cupsd(8), cupsd.conf(5), filter(7), +lpinfo(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html new file mode 100644 index 000000000..96a24c339 --- /dev/null +++ b/doc/help/man-cancel.html @@ -0,0 +1,81 @@ + + + + + + cancel(1) + + +

cancel(1)

+

Name

+cancel - cancel jobs +

Synopsis

+cancel +[ -E ] [ -U +username +] [ -a ] [ -h +hostname[:port] +] [ -u +username +] [ -x ] [ +id +] [ +destination +] [ +destination-id +] +

Description

+cancel cancels existing print jobs. The -a option will remove +all jobs from the specified destination. +

Options

+The following options are recognized by cancel: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-U username +
+
+
Specifies the username to use when connecting to the server. +
+
-a +
+
+
Cancel all jobs on the named destination, or all jobs on all +destinations if none is provided. +
+
-h hostname[:port] +
+
+
Chooses an alternate server. +
+
-u username +
+
+
Cancels jobs owned by username. +
+
-x +
+
+
Deletes job data files in addition to canceling. +
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", or "#". +Also, printer and class names are not case-sensitive. +

Notes

+Administrators wishing to prevent unauthorized cancellation of +jobs via the -u option should require authentication for +Cancel-Jobs operations in cupsd.conf(5). +

See Also

+lp(1), lpmove(8), lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html new file mode 100644 index 000000000..db767c275 --- /dev/null +++ b/doc/help/man-classes.conf.html @@ -0,0 +1,125 @@ + + + + + + classes.conf(5) + + +

classes.conf(5)

+

Name

+classes.conf - class configuration file for cups +

Description

+The classes.conf file defines the local printer classes that are +available. It is normally located in the /etc/cups directory and +is generated automatically by the cupsd(8) program when printer +classes are added or deleted. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +

Directives

+
+
<Class name> ... </Class> +
+
+
Defines a specific printer class. +
+
<DefaultClass name> ... </Class> +
+
+
Defines a default printer class. +
+
Accepting Yes +
+
+
Accepting No +
+
+
Specifies whether the printer is accepting new jobs. +
+
AllowUser [ user @group ... ] +
+
+
Allows specific users and groups to print to the printer. +
+
DenyUser [ user @group ... ] +
+
+
Prevents specific users and groups from printing to the printer. +
+
Info text +
+
+
Specifies human-readable text describing the printer. +
+
JobSheets banner banner +
+
+
Specifies the banner pages to use for the printer. +
+
KLimit number +
+
+
Specifies the job-k-limit value for the printer. +
+
Location text +
+
+
Specifies human-readable text describing the location of the printer. +
+
OpPolicy name +
+
+
Specifies the operation policy for the printer. +
+
PageLimit number +
+
+
Specifies the job-page-limit value for the printer. +
+
Printer +
+
+
Specifies a printer that is a member of the printer class. +
+
QuotaPeriod seconds +
+
+
Specifies the job-quota-period value for the printer. +
+
Shared Yes +
+
+
Shared No +
+
+
Specifies whether the printer is shared. +
+
State idle +
+
+
State stopped +
+
+
Specifies the initial state of the printer (Idle or Stopped) +
+
StateMessage text +
+
+
Specifies the message associated with the state. +
+
StateTime seconds +
+
+
Specifies the date/time associated with the state. +
+
+

See Also

+cupsd(8), cupsd.conf(5), mime.convs(5), +mime.types(5), printers.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html new file mode 100644 index 000000000..dfcac80f6 --- /dev/null +++ b/doc/help/man-client.conf.html @@ -0,0 +1,62 @@ + + + + + + client.conf(5) + + +

client.conf(5)

+

Name

+client.conf - client configuration file for cups +

Description

+The client.conf file configures the CUPS client and is +normally located in the /private/etc/cups or ~/.cups +directory. Each line in the file can be a configuration +directive, a blank line, or a comment. Comment lines start with +the # character. +

Directives

+The following directives are understood by the client. Consult the +on-line help for detailed descriptions: +
+
Encryption IfRequested +
+
+
Encryption Never +
+
+
Encryption Required +
+
+
Specifies the level of encryption that is required for a particular +location. +
+
GSSServiceName name +
+
Specifies the Kerberos service name that is used for authentication, typically +"host", "http", or "ipp". CUPS adds the remote hostname +("name@server.example.com") for you. The default name is +"host". +
+
ServerName hostname-or-ip-address[:port] +
+
+
ServerName /domain/socket +
+
+
Specifies the address and optionally the port to use when connecting to the +server. Note: Not supported on OS X 10.7 or later. +
+
User name +
+
+
Specifies the default user name to use for requests. +
+
+

See Also

+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html new file mode 100644 index 000000000..2bae394a9 --- /dev/null +++ b/doc/help/man-cups-config.html @@ -0,0 +1,125 @@ + + + + + + cups-config(1) + + +

cups-config(1)

+

Name

+cups-config - get cups api, compiler, directory, and link information. +

Synopsis

+cups-config +--api-version +
+cups-config +--build +
+cups-config +--cflags +
+cups-config +--datadir +
+cups-config +--help +
+cups-config +--ldflags +
+cups-config +[ +--image +] [ +--static +] --libs +
+cups-config +--serverbin +
+cups-config +--serverroot +
+cups-config +--version +
+

Description

+cups-config is the CUPS program configuration utility. It should be +used by application developers to determine the necessary command-line +options for the compiler and linker, as well as determining installation +directories for filters, configuration files, and drivers. +

Options

+
+
--api-version +
+
+
Displays the current API version (major.minor). +
+
--build +
+
+
Displays a system-specific build number. +
+
--cflags +
+
+
Displays the necessary compiler options. +
+
--datadir +
+
+
Displays the default CUPS data directory. +
+
--help +
+
+
Displays the program usage message. +
+
--image +
+
+
When used with --libs, adds the CUPS imaging library to the +list of displayed libraries. +
+
--ldflags +
+
+
Displays the necessary linker options. +
+
--libs +
+
+
Displays the necessary librarys to link to. +
+
--serverbin +
+
+
Displays the default CUPS binary directory, +where filters and backends are stored. +
+
--serverroot +
+
+
Displays the default CUPS configuration file directory. +
+
--static +
+
+
When used with --libs, shows the static libraries instead +of the default (shared) libraries. +
+
--version +
+
+
Displays the full version number of the CUPS installation +(major.minor.patch). +
+
+

See Also

+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-deviced.html b/doc/help/man-cups-deviced.html new file mode 100644 index 000000000..a64b7a707 --- /dev/null +++ b/doc/help/man-cups-deviced.html @@ -0,0 +1,38 @@ + + + + + + cups-deviced(8) + + +

cups-deviced(8)

+

Name

+cups-deviced - cups device daemon +

Synopsis

+cups-deviced +request-id limit user-id options +

Description

+cups-deviced polls the backends in +/usr/libexec/cups/backend for a list of available devices. +It is run by cupsd(8) in response to a +CUPS-Get-Devices request. The output format is an IPP +response message. The request-id argument is the request ID +from the original IPP request, typically 1. The limit +argument is the limit value from the original IPP request - 0 +means no limit. The user-id argument is the +requesting-user-name value from the original IPP request. +Finally, the options argument is a space-delimited list of +attributes ("name=value name=value ...") that were passed in +with the request. Currently cups-deviced looks for the +requested-attributes attribute and tailors the output +accordingly. +

See Also

+backend(7), cupsd(8), cupsd.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-driverd.html b/doc/help/man-cups-driverd.html new file mode 100644 index 000000000..1fe857272 --- /dev/null +++ b/doc/help/man-cups-driverd.html @@ -0,0 +1,122 @@ + + + + + + cups-driverd(8) + + +

cups-driverd(8)

+

Name

+cups-driverd - cups driver daemon +

Synopsis

+cups-driverd +cat +ppd-name +
+cups-driverd +list +request_id limit options +

Description

+cups-driverd shows or lists PPD files. It is run in +response to CUPS-Add-Modify-Printer or CUPS-Get-Devices requests. +The first form ("cups-driverd cat ppd-name") writes the named PPD +file to stdout. The output format is an uncompressed PPD file. +

The second form lists the available manufacturers or PPD files to +stdout as indicated by the options argument. The output +format is an IPP response message. The request_id argument +is the request ID from the original IPP request, typically 1. The +limit argument is the limit value from the original IPP +request - 0 means no limit. Finally, the options argument +is a space-delimited list of attributes ("name=value name=value +...") that were passed in with the request. Currently +cups-driverd looks for the ppd-make and +requested-attributes attributes and tailors the output +accordingly. +

Drivers

+Drivers can be static PPD files under the +/usr/share/cups/model directory or programs under the +/usr/libexec/cups/driver directory. Static PPD files must +conform to the Adobe PPD File Format Specification version 4.3 +and may be compressed using the gzip(1) program. Driver +programs must implement the command-line interface shown in the +next section. +

Driver Programs

+Driver programs provide a interface to dynamically-generated PPD +files. The following arguments are currently defined: +
+
drivername list +
+
+
Lists the supported PPD files to stdout. +
+
drivername cat ppdname +
+
+
Writes the named PPD file to stdout. +
+
+

Driver programs MUST NOT query hardware or make other long-term operations that +would delay the return of a driver list. See the NOTES section below for +specific recommendations. +

Listing Files (drivername list)

+When run with the single argument "list", the program must list +the available PPD files it can generate to stdout using the +following format: +
+    "drivername:ppdname" language "make" "make and model"
+    "drivername:ppdname" language "make" "make and model" "1284 device id"
+    "drivername:ppdname" language "make" "make and model" "1284 device id" "(PPD product)"
+    "drivername:ppdname" language "make" "make and model" "1284 device id" "(PPD product)" "PostScript version"
+    "drivername:ppdname" language "make" "make and model" "1284 device id" "(PPD product)" "PostScript version" "type"
+
+

Drivername is the name of the driver program. Ppdname +is the name used to select the given driver. Language is +the locale associated with the default language of the PPD file, +typically "en". Make is the Manufacturer name from the PPD +file. Make and model is the NickName name from the PPD +file. 1284 device id is the 1284DeviceId from the PPD file, +if any. (PPD product) is the Product string as it would appear in the PPD +file or from a PostScript query. PostScript version is the PSVersion +string as it would appear in the PPD file or from a PostScript query. Type +is "postscript" for PostScript printers, "pdf" for PDF printers, "raster" for +raster printers, or "fax" for facsimile devices. +

Writing Files (drivername cat ppdname)

+When the driver program is run with the "cat ppdname" arguments, +it must write the named PPD file to stdout, uncompressed. If the +named PPD file does not exist, the driver program must not write +any output to stdout and report the error to stderr instead. +

Driver Error Messages

+Error messages can be relayed back to cupsd by writing them +to stderr. The following prefixes are recognized: +
+
DEBUG: [drivername] +
+
+
Debugging messages +
+
ERROR: [drivername] +
+
+
Error messages +
+
INFO: [drivername] +
+
+
Informational messages +
+
+

Notes

+Due to performance considerations, driver programs have been officially +deprecated and should not be used for new development. Currently only the +CUPS web interface and lpinfo(8) command will request lists from all +driver programs. +

See Also

+cupsd(8), cupsd.conf(5), cupstestppd(1), lpinfo(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html new file mode 100644 index 000000000..2d686e9e2 --- /dev/null +++ b/doc/help/man-cups-files.conf.html @@ -0,0 +1,169 @@ + + + + + + cups-files.conf(5) + + +

cups-files.conf(5)

+

Name

+cups-files.conf - file and directory configuration file for cups +

Description

+The cups-files.conf file configures the files and directories used by the +CUPS scheduler, cupsd(8). It is normally located in the +/private/etc/cups directory. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +

Directives

+The following directives are understood by cupsd(8). Consult the +on-line help for detailed descriptions: +
+
AccessLog filename +
+
+
AccessLog syslog +
+
+
Defines the access log filename. +
+
ConfigFilePerm mode +
+
+
Specifies the permissions for all configuration files that the scheduler +writes. +
+
DataDir path +
+
+
Specified the directory where data files can be found. +
+
DocumentRoot directory +
+
+
Specifies the root directory for the internal web server documents. +
+
ErrorLog filename +
+
+
ErrorLog syslog +
+
+
Specifies the error log filename. +
+
FatalErrors none +
+
+
FatalErrors all -kind [... -kind] +
+
+
FatalErrors kind [... kind] +
+
+
Specifies which errors are fatal, causing the scheduler to exit. "Kind" is +"browse", "config", "listen", "log", or "permissions". +
+
FileDevice Yes +
+
+
FileDevice No +
+
+
Specifies whether the file pseudo-device can be used for new +printer queues. +
+
FontPath directory[:directory:...] +
+
+
Specifies the search path for fonts. +
+
Group group-name-or-number +
+
+
Specifies the group name or ID that will be used when executing +external programs. +
+
LogFilePerm mode +
+
+
Specifies the permissions for all log files that the scheduler writes. +
+
PageLog filename +
+
+
PageLog syslog +
+
+
Specifies the page log filename. +
+
Printcap +
+
+
Printcap filename +
+
+
Specifies the filename for a printcap file that is updated +automatically with a list of available printers (needed for +legacy applications); specifying Printcap with no filename +disables printcap generation. +
+
RemoteRoot user-name +
+
+
Specifies the username that is associated with unauthenticated root +accesses. +
+
RequestRoot directory +
+
+
Specifies the directory to store print jobs and other HTTP request +data. +
+
ServerBin directory +
+
+
Specifies the directory where backends, CGIs, daemons, and filters may +be found. +
+
ServerCertificate filename +
+
+
Specifies the encryption certificate to use. +
+
ServerKey filename +
+
+
Specifies the encryption key to use. +
+
ServerRoot directory +
+
+
Specifies the directory where the server configuration files can be found. +
+
SystemGroup group-name [group-name ...] +
+
+
Specifies the group(s) to use for System class authentication. +
+
TempDir directory +
+
+
Specifies the directory where temporary files are stored. +
+
User user-name +
+
+
Specifies the user name or ID that is used when running external programs. +
+
+

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), mime.convs(5), +mime.types(5), printers.conf(5), +subscriptions.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html new file mode 100644 index 000000000..69f098db4 --- /dev/null +++ b/doc/help/man-cups-lpd.html @@ -0,0 +1,117 @@ + + + + + + cups-lpd(8) + + +

cups-lpd(8)

+

Name

+cups-lpd - receive print jobs and report printer status to lpd clients +

Synopsis

+cups-lpd +[ -h +hostname[:port] +] [ -n ] [ -o +option=value +] +

Description

+cups-lpd is the CUPS Line Printer Daemon ("LPD") +mini-server that supports legacy client systems that use the LPD +protocol. cups-lpd does not act as a standalone network +daemon but instead operates using the Internet "super-server" +inetd(8) or xinetd(8). If you are using inetd, +add the following line to the inetd.conf file to enable the +cups-lpd mini-server: +
+
+
+    printer stream tcp nowait lp /usr/libexec/cups/daemon/cups-lpd cups-lpd \
+        -o document-format=application/octet-stream
+
+

Note: If you are using Solaris 10 or higher, you must run +the inetdconv(1m) program to register the changes to the +inetd.conf file. +

If you are using the newer xinetd(8) daemon, create a file +named /etc/xinetd.d/cups containing the following lines: +
+

+
+    service printer
+    {
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = lp
+	group = sys
+	passenv =
+        server = /usr/libexec/cups/daemon/cups-lpd
+	server_args = -o document-format=application/octet-stream
+    }
+
+

Options

+
+
-h hostname[:port] +
+
+
Sets the CUPS server (and port) to use. +
+
-n +
+
+
Disables reverse address lookups; normally cups-lpd will +try to discover the hostname of the client via a reverse DNS +lookup. +
+
-o name=value +
+
+
Inserts options for all print queues. Most often this is used to +disable the "l" filter so that remote print jobs are filtered as +needed for printing; the examples in the previous section set the +"document-format" option to "application/octet-stream" which +forces autodetection of the print file format. +
+
+

Performance

+cups-lpd performs well with small numbers of clients and +printers. However, since a new process is created for each +connection and since each process must query the printing system +before each job submission, it does not scale to larger +configurations. We highly recommend that large configurations +use the native IPP support provided by CUPS instead. +

Security

+cups-lpd currently does not perform any access control +based on the settings in cupsd.conf(5) or in the +hosts.allow(5) or hosts.deny(5) files used by TCP +wrappers. Therefore, running cups-lpd on your server will +allow any computer on your network (and perhaps the entire +Internet) to print to your server. +

While xinetd has built-in access control support, you +should use the TCP wrappers package with inetd to limit +access to only those computers that should be able to print +through your server. +

cups-lpd is not enabled by the standard CUPS distribution. +Please consult with your operating system vendor to determine +whether it is enabled on your system. +

Compatibility

+cups-lpd does not enforce the restricted source port +number specified in RFC 1179, as using restricted ports does not +prevent users from submitting print jobs. While this behavior is +different than standard Berkeley LPD implementations, it should +not affect normal client operations. +

The output of the status requests follows RFC 2569, Mapping +between LPD and IPP Protocols. Since many LPD implementations +stray from this definition, remote status reporting to LPD +clients may be unreliable. +

See Also

+cups(1), cupsd(8), inetconv(1m), +inetd(8), xinetd(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html new file mode 100644 index 000000000..130ef3cf8 --- /dev/null +++ b/doc/help/man-cups-snmp.conf.html @@ -0,0 +1,82 @@ + + + + + + snmp.conf(5) + + +

snmp.conf(5)

+ +

Name

+snmp.conf - snmp configuration file for cups +

Description

+The snmp.conf file configures how the standard CUPS network backends +(http, https, ipp, ipps, lpd, snmp, and socket) access printer information using +SNMPv1 and is normally located in the /etc/cups directory. Each line in +the file can be a configuration directive, a blank line, or a comment. Comment +lines start with the # character. +

The Community and DebugLevel directives are used by all backends. The remainder +apply only to the SNMP backend (cups-snmp(8)). +

Directives

+The following directives are understood by the CUPS network backends. Consult +the on-line help for detailed descriptions: +
+
Address @IF(name) +
+
+
Address @LOCAL +
+
+
Address address +
+
+
Sends SNMP broadcast queries to the specified address(es). There is no default +for the broadcast address. +
+
Community name +
+
+
Specifies the community name to use. Only a single community name may be +specified. The default community name is "public". +
+
DebugLevel number +
+
+
Specifies the logging level from 0 (none) to 3 (everything). Typically only used +for debugging (thus the name). The default debug level is 0. +
+
DeviceURI "regular expression" device-uri [... device-uri] +
+
+
Specifies one or more device URIs that should be used for a given make and model +string. The regular expression is used to match the detected make and model, and +the device URI strings must be of the form "scheme://%s[:port]/[path]", where +"%s" represents the detected address or hostname. There are no default device +URI matching rules. +
+
HostNameLookups on +
+
+
HostNameLookups off +
+
+
Specifies whether the addresses of printers should be converted to hostnames or +left as numeric IP addresses. The default is "off". +
+
MaxRunTime seconds +
+
+
Specifies the maximum number of seconds that the SNMP backend will scan the +network for printers. The default is 120 seconds (2 minutes). +
+
+

See Also

+cups-snmp(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html new file mode 100644 index 000000000..c354a6206 --- /dev/null +++ b/doc/help/man-cups-snmp.html @@ -0,0 +1,52 @@ + + + + + + cups-snmp(8) + + +

cups-snmp(8)

+

Name

+snmp - cups snmp backend +

Synopsis

+/usr/libexec/cups/backend/snmp +ip-address-or-hostname +
+lpinfo -v --include-schemes snmp +

Description

+The CUPS SNMP backend provides legacy discovery and identification of network +printers using SNMPv1. When used for discovery through the scheduler, the +backend will list all printers that respond to a broadcast SNMPv1 query with the +"public" community name. Additional queries are then sent to printers that +respond in order to determine the correct device URI, make and model, and other +information needed for printing. +

In the first form, the SNMP backend is run directly by the user to look up the +device URI and other information when you have an IP address or hostname. This +can be used for programs that need to configure print queues where the user has +supplied an address but nothing else. +

In the second form, the SNMP backend is run indirectly using the lpinfo(8) +command. The output provides all printers detected via SNMP on the configured +broadcast addresses. Note: no broadcast addresses are configured by +default. +

Mibs

+The CUPS SNMP backend uses the information from the Host, Printer, and Port +Monitor MIBs along with some vendor private MIBs and intelligent port probes to +determine the correct device URI and make and model for each printer. +

Configuration

+The SNMP backend reads the /private/etc/cups/snmp.conf configuration file, if +present, to set the default broadcast address, community name, and logging +level. The configuration file is documented in cups-snmp.conf(5). The +DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL environment +variable and the MaxRunTime value can be overridden using the CUPS_MAX_RUN_TIME +environment variable. +

See Also

+backend(7), cups-snmp.conf(5), cupsd(8), cupsd.conf(5), +filter(7), lpinfo(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html new file mode 100644 index 000000000..6624bf979 --- /dev/null +++ b/doc/help/man-cupsaccept.html @@ -0,0 +1,77 @@ + + + + + + cupsaccept(8) + + +

cupsaccept(8)

+

Name

+cupsaccept/cupsreject - accept/reject jobs sent to a destination +

Synopsis

+cupsaccept +[ -E ] [ -U +username +] [ -h +hostname[:port] +] destination(s) +
+cupsreject +[ -E ] [ -U +username +] [ -h +hostname[:port] +] [ -r +reason +] destination(s) +

Description

+cupsaccept instructs the printing system to accept print jobs to the +specified destinations. +

cupsreject instructs the printing system to reject print jobs to the +specified destinations. The -r option sets the reason for rejecting +print jobs. If not specified the reason defaults to "Reason Unknown". +

Options

+The following options are supported by both cupsaccept and +cupsreject: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-U username +
+
+
Sets the username that is sent when connecting to the server. +
+
-h hostname[:port] +
+
+
Chooses an alternate server. +
+
-r "reason" +
+
+
Sets the reason string that is shown for a printer that is +rejecting jobs. +
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", or "#". +Also, printer and class names are not case-sensitive. +

The CUPS versions of accept and reject may ask the +user for an access password depending on the printing system +configuration. This differs from the System V versions which +require the root user to execute these commands. +

See Also

+cancel(1), cupsenable(8), lp(1), +lpadmin(8), lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html new file mode 100644 index 000000000..37349460e --- /dev/null +++ b/doc/help/man-cupsaddsmb.html @@ -0,0 +1,205 @@ + + + + + + cupsaddsmb(8) + + +

cupsaddsmb(8)

+

Name

+cupsaddsmb - export printers to samba for windows clients + +

Synopsis

+cupsaddsmb +[ -H +samba-server +] [ -U +samba-user[%samba-password] +] [ -h +cups-server[:port] +] [ -v ] -a +
+cupsaddsmb +[ -H +samba-server +] [ -U +samba-user[%samba-password] +] [ -h +cups-server[:port] +] [ -v ] printer [ ... printer ] + +

Description

+cupsaddsmb exports printers to the SAMBA software (version +2.2.0 or higher) for use with Windows clients. Depending on the +SAMBA configuration, you may need to provide a password to +export the printers. This program requires the Windows printer +driver files described below. + +

Options

+cupsaddsmb supports the following options: +
+
-H samba-server +
+
+
Specifies the SAMBA server which defaults to the CUPS server. +
+
-U samba-user[%samba-password] +
+
+
Specifies the SAMBA print admin username which defaults to your +current username. If the username contains a percent (%) +character, then the text following the percent is treated as the +SAMBA password to use. +
+
-a +
+
+
Exports all known printers. Otherwise only the named printers are +exported. +
+
-h cups-server[:port] +
+
+
Specifies a different CUPS server to use. +
+
-v +
+
+
Specifies that verbose information should be shown. This is +useful for debugging SAMBA configuration problems. + +
+
+

Samba Configuration

+cupsaddsmb uses the new RPC-based printing support in +SAMBA 2.2.x to provide printer drivers and PPD files to Windows +client machines. In order to use this functionality, you must +first configure the SAMBA smb.conf(5) file to support +printing through CUPS and provide a printer driver download +share, as follows: +
+
+    [global]
+	load printers = yes
+	printing = cups
+	printcap name = cups
+
+    [printers]
+	comment = All Printers
+	path = /var/spool/samba
+	browseable = no
+	public = yes
+	guest ok = yes
+	writable = no
+	printable = yes
+
+    [print$]
+	comment = Printer Drivers
+	path = /etc/samba/drivers
+	browseable = yes
+	guest ok = no
+	read only = yes
+	write list = root
+
+

This configuration assumes a FHS-compliant installation of +SAMBA; adjust the [printers] and [print$] share paths +accordingly on your system as needed. + +

Microsoft Postscript Drivers For Windows

+The base driver for Windows 2000 and higher is the Microsoft +PostScript driver, which is available on any system running +Windows 2000 or higher in the +%WINDIR%\SYSTEM32\SPOOL\DRIVERS\W32X86\3 folder for 32-bit +drivers and +%WINDIR%\SYSTEM32\SPOOL\DRIVERS\X64\3 folder for 64-bit +drivers. +

The CUPS printer driver is preferred over the Microsoft driver +since it supports the page-label, job-billing, and +job-hold-until options fully on all printers. However, currently +only Windows 2000 and higher is supported by the Microsoft +driver, so you will also need to get the Adobe driver to support +Windows 95, 98, and Me clients. The Adobe and Microsoft drivers +for Windows 2000 are identical. +

Once you have extracted the driver files, copy the 32-bit drivers +to the /usr/share/cups/drivers directory and the 64-bit +drivers to the /usr/share/cups/drivers/x64 directory exactly +as named below: +

+
+    [Windows 2000 and higher]
+    ps5ui.dll
+    pscript.hlp
+    pscript.ntf
+    pscript5.dll
+
+

Note: Unlike Windows, case is significant - make sure that +you use the lowercase filenames shown above, otherwise +cupsaddsmb will fail to export the drivers. + +

Cups Postscript Drivers For Windows

+cupsaddsmb can use the CUPS v6 PostScript printer driver +for Windows, which is available for download from the CUPS web +site. +

The CUPS printer driver is preferred over the Adobe and +Microsoft drivers since it supports the page-label, job-billing, +and job-hold-until options fully on all printers. However, +currently only Windows 2000 and higher is supported by the CUPS +driver, so you will also need to get the Adobe driver to support +Windows 95, 98, and Me clients. +

Once you have extracted the driver files, copy the 32-bit drivers +to the /usr/share/cups/drivers directory and the 64-bit +drivers to the /usr/share/cups/drivers/x64 directory exactly +as named below: +

+
+    [Windows 2000 and higher]
+    cups6.inf (from www.cups.org)
+    cups6.ini (from www.cups.org)
+    cupsps6.dll (from www.cups.org)
+    cupsui6.dll (from www.cups.org)
+    ps5ui.dll (from your Windows system)
+    pscript.hlp (from your Windows system)
+    pscript.ntf (from your Windows system)
+    pscript5.dll (from your Windows system)
+
+

Note: Unlike Windows, case is significant - make sure that +you use the lowercase filenames shown above, otherwise +cupsaddsmb will fail to export the drivers. + +

Adobe Postscript Drivers For Windows 95, 98, And Me

+cupsaddsmb can use the Adobe PostScript printer driver for +Windows 95, 98, and ME, which are available for download from the +Adobe web site (http://www.adobe.com). +

The Adobe driver does not support the page-label, job-billing, or +job-hold-until options. +

Once you have installed the driver on a Windows system, copy the +following files to the /usr/share/cups/drivers directory +exactly as named below: +

+
+    [Windows 95, 98, and Me]
+    ADFONTS.MFM
+    ADOBEPS4.DRV
+    ADOBEPS4.HLP
+    ICONLIB.DLL
+    PSMON.DLL
+
+

Note: Unlike Windows, case is significant - make sure that +you use the UPPERCASE filenames shown above, otherwise +cupsaddsmb will fail to export the drivers. + +

Known Issues

+Getting the full set of Windows driver files should be easier. + +

See Also

+smbd(8), smb.conf(5), +http://localhost:631/help +
+http://www.cups.org/windows/ + +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html new file mode 100644 index 000000000..1434321bf --- /dev/null +++ b/doc/help/man-cupsctl.html @@ -0,0 +1,98 @@ + + + + + + cupsctl(8) + + +

cupsctl(8)

+

Name

+cupsctl - configure cupsd.conf options +

Synopsis

+cupsctl +[ -E ] [-U +username +] [ -h +server[:port] +] [ --[no-]debug-logging ] [ --[no-]remote-admin ] [ --[no-]remote-any ] +[ --[no-]share-printers ] [ --[no-]user-cancel-any ] +[ +name=value +] +

Description

+cupsctl updates or queries the cupsd.conf file for a server. When +no changes are requested, the current configuration values are written to the +standard output in the format "name=value", one per line. +

Options

+The following options are recognized: +
+
-E +
+
+
Enables encryption on the connection to the scheduler. +
+
-U username +
+
+
Specifies an alternate username to use when authenticating with the scheduler. +
+
-h server[:port] +
+
+
Specifies the server address. +
+
--[no-]debug-logging +
+
+
Enables or disables debug logging in the error_log file. +
+
--[no-]remote-admin +
+
+
Enables or disables remote administration. +
+
--[no-]remote-any +
+
+
Enables or disables printing from any address, e.g. the Internet. +
+
--[no-]share-printers +
+
+
Enables or disables sharing of local printers with other computers. +
+
--[no-]user-cancel-any +
+
+
Allows or prevents users from canceling jobs owned by others. +
+
+

Examples

+Display the current settings: +
+    cupsctl
+
+

Enable debug logging: +

+    cupsctl --debug-logging
+
+

Get the current debug logging state: +

+    cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
+
+

Disable printer sharing: +

+    cupsctl --no-share-printers
+
+

Known Issues

+You cannot set the Listen or Port directives using cupsctl. +

See Also

+cupsd.conf(5), cupsd(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html new file mode 100644 index 000000000..032b8db87 --- /dev/null +++ b/doc/help/man-cupsd.conf.html @@ -0,0 +1,674 @@ + + + + + + cupsd.conf(5) + + +

cupsd.conf(5)

+

Name

+cupsd.conf - server configuration file for cups +

Description

+The cupsd.conf file configures the CUPS scheduler, cupsd(8). It +is normally located in the /private/etc/cups directory. Note: +File, directory, and user configuration directives that used to be allowed in +the cupsd.conf file are now stored in the cups-files.conf(5) instead +in order to prevent certain types of privilege escalation attacks. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. The +configuration directives are intentionally similar to those used by the +popular Apache web server software and are described below. +

Directives

+The following directives are understood by cupsd(8). Consult the +on-line help for detailed descriptions: +
+
AccessLogLevel config +
+
+
AccessLogLevel actions +
+
+
AccessLogLevel all +
+
+
Specifies the logging level for the AccessLog file. +
+
Allow all +
+
+
Allow none +
+
+
Allow host.domain.com +
+
+
Allow *.domain.com +
+
+
Allow ip-address +
+
+
Allow ip-address/netmask +
+
+
Allow ip-address/mm +
+
+
Allow @IF(name) +
+
+
Allow @LOCAL +
+
+
Allows access from the named hosts or addresses. +
+
AuthType None +
+
+
AuthType Basic +
+
+
AuthType BasicDigest +
+
+
AuthType Digest +
+
+
AuthType Negotiate +
+
+
Specifies the authentication type (None, Basic, BasicDigest, Digest, Negotiate) +
+
AutoPurgeJobs Yes +
+
+
AutoPurgeJobs No +
+
+
Specifies whether to purge job history data automatically when +it is no longer required for quotas. +
+
BrowseLocalProtocols [All] [DNSSD] +
+
+
Specifies the protocols to use for local printer sharing. +
+
BrowseWebIF Yes +
+
+
BrowseWebIF No +
+
+
Specifies whether the CUPS web interface is advertised via DNS-SD. +
+
Browsing Yes +
+
+
Browsing No +
+
+
Specifies whether or not shared printers should be advertised. +
+
Classification banner +
+
+
Specifies the security classification of the server. +
+
ClassifyOverride Yes +
+
+
ClassifyOverride No +
+
+
Specifies whether to allow users to override the classification +of individual print jobs. +
+
DefaultAuthType Basic +
+
+
DefaultAuthType BasicDigest +
+
+
DefaultAuthType Digest +
+
+
DefaultAuthType Negotiate +
+
+
Specifies the default type of authentication to use. +
+
DefaultEncryption Never +
+
+
DefaultEncryption IfRequested +
+
+
DefaultEncryption Required +
+
+
Specifies the type of encryption to use for authenticated requests. +
+
DefaultLanguage locale +
+
+
Specifies the default language to use for text and web content. +
+
DefaultPaperSize Auto +
+
+
DefaultPaperSize None +
+
+
DefaultPaperSize sizename +
+
+
Specifies the default paper size for new print queues. "Auto" uses a locale- +specific default, while "None" specifies there is no default paper size. +
+
DefaultPolicy policy-name +
+
+
Specifies the default access policy to use. +
+
DefaultShared Yes +
+
+
DefaultShared No +
+
+
Specifies whether local printers are shared by default. +
+
Deny all +
+
+
Deny none +
+
+
Deny host.domain.com +
+
+
Deny *.domain.com +
+
+
Deny ip-address +
+
+
Deny ip-address/netmask +
+
+
Deny ip-address/mm +
+
+
Deny @IF(name) +
+
+
Deny @LOCAL +
+
+
Denies access to the named host or address. +
+
DirtyCleanInterval seconds +
+
+
Specifies the delay for updating of configuration and state files. A value of 0 +causes the update to happen as soon as possible, typically within a few +milliseconds. +
+
Encryption IfRequested +
+
+
Encryption Never +
+
+
Encryption Required +
+
+
Specifies the level of encryption that is required for a particular +location. +
+
FilterLimit limit +
+
+
Specifies the maximum cost of filters that are run concurrently. +
+
FilterNice nice-value +
+
+
Specifies the scheduling priority ("nice" value) of filters that +are run to print a job. +
+
GSSServiceName name +
+
+
Specifies the service name when using Kerberos authentication. The default +service name is "host". +
+
HostNameLookups On +
+
+
HostNameLookups Off +
+
+
HostNameLookups Double +
+
+
Specifies whether or not to do reverse lookups on client addresses. +
+
Include filename +
+
+
Includes the named file. +
+
JobKillDelay seconds +
+
+
Specifies the number of seconds to wait before killing the filters and backend +associated with a canceled or held job. +
+
JobPrivateAccess all +
+
+
JobPrivateAccess default +
+
+
JobPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+ +
+
+
Specifies an access list for a job's private values. The "default" access list +is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed +or requesting-user-name-denied values. +
+
JobPrivateValues all +
+
+
JobPrivateValues default +
+
+
JobPrivateValues none +
+
+
JobPrivateValues attribute-name-1 [ ... attribute-name-N ] +
+
Specifies the list of job values to make private. The "default" values are +"job-name", "job-originating-host-name", and "job-originating-user-name". +
+
JobRetryInterval seconds +
+
+
Specifies the interval between retries of jobs in seconds. +
+
JobRetryLimit count +
+
+
Specifies the number of retries that are done for jobs. +
+
KeepAlive Yes +
+
+
KeepAlive No +
+
+
Specifies whether to support HTTP keep-alive connections. +
+
KeepAliveTimeout seconds +
+
+
Specifies the amount of time that connections are kept alive. +
+
<Limit operations> ... </Limit> +
+
+
Specifies the IPP operations that are being limited inside a policy. +
+
<Limit methods> ... </Limit> +
+
+
<LimitExcept methods> ... </LimitExcept> +
+
+
Specifies the HTTP methods that are being limited inside a location. +
+
LimitRequestBody +
+
+
Specifies the maximum size of any print job request. +
+
Listen ip-address:port +
+
+
Listen *:port +
+
+
Listen /path/to/domain/socket +
+
+
Listens to the specified address and port or domain socket path. +
+
<Location /path> ... </Location> +
+
+
Specifies access control for the named location. +
+
LogDebugHistory #-messages +
+
+
Specifies the number of debugging messages that are logged when an error +occurs in a print job. +
+
LogLevel alert +
+
+
LogLevel crit +
+
+
LogLevel debug2 +
+
+
LogLevel debug +
+
+
LogLevel emerg +
+
+
LogLevel error +
+
+
LogLevel info +
+
+
LogLevel none +
+
+
LogLevel notice +
+
+
LogLevel warn +
+
+
Specifies the logging level for the ErrorLog file. +
+
LogTimeFormat standard +
+
+
LogTimeFormat usecs +
+
+
Specifies the format of the date and time in the log files. +
+
MaxClients number +
+
+
Specifies the maximum number of simultaneous clients to support. +
+
MaxClientsPerHost number +
+
+
Specifies the maximum number of simultaneous clients to support from a +single address. +
+
MaxCopies number +
+
+
Specifies the maximum number of copies that a user can print of each job. +
+
MaxHoldTime seconds +
+
+
Specifies the maximum time a job may remain in the "indefinite" hold state +before it is canceled. Set to 0 to disable cancellation of held jobs. +
+
MaxJobs number +
+
+
Specifies the maximum number of simultaneous jobs to support. +
+
MaxJobsPerPrinter number +
+
+
Specifies the maximum number of simultaneous jobs per printer to support. +
+
MaxJobsPerUser number +
+
+
Specifies the maximum number of simultaneous jobs per user to support. +
+
MaxJobTime seconds +
+
+
Specifies the maximum time a job may take to print before it is canceled. The +default is 10800 seconds (3 hours). Set to 0 to disable cancellation of "stuck" +jobs. +
+
MaxLogSize number-bytes +
+
+
Specifies the maximum size of the log files before they are +rotated (0 to disable rotation) +
+
MaxRequestSize number-bytes +
+
+
Specifies the maximum request/file size in bytes (0 for no limit) +
+
MultipleOperationTimeout seconds +
+
+
Specifies the maximum amount of time to allow between files in a multiple file +print job. +
+
Order allow,deny +
+
+
Order deny,allow +
+
+
Specifies the order of HTTP access control (allow,deny or deny,allow) +
+
PageLogFormat format string +
+
+
Specifies the format of page log lines. +
+
PassEnv variable [... variable] +
+
+
Passes the specified environment variable(s) to child processes. +
+
<Policy name> ... </Policy> +
+
+
Specifies access control for the named policy. +
+
Port number +
+
+
Specifies a port number to listen to for HTTP requests. +
+
PreserveJobFiles Yes +
+
+
PreserveJobFiles No +
+
+
Specifies whether or not to preserve job files after they are printed. +
+
PreserveJobHistory Yes +
+
+
PreserveJobHistory No +
+
+
Specifies whether or not to preserve the job history after they are +printed. +
+
PrintcapFormat bsd +
+
+
PrintcapFormat plist +
+
+
PrintcapFormat solaris +
+
+
Specifies the format of the printcap file. +
+
ReloadTimeout seconds +
+
+
Specifies the amount of time to wait for job completion before +restarting the scheduler. +
+
Require group group-name-list +
+
+
Require user user-name-list +
+
+
Require valid-user +
+
+
Specifies that user or group authentication is required. +
+
RIPCache bytes +
+
+
Specifies the maximum amount of memory to use when converting images +and PostScript files to bitmaps for a printer. +
+
Satisfy all +
+
+
Satisfy any +
+
+
Specifies whether all or any limits set for a Location must be +satisfied to allow access. +
+
ServerAdmin user@domain.com +
+
+
Specifies the email address of the server administrator. +
+
ServerAlias hostname [... hostname] +
+
+
ServerAlias * +
+
+
Specifies an alternate name that the server is known by. The special name "*" +allows any name to be used. +
+
ServerName hostname-or-ip-address +
+
+
Specifies the fully-qualified hostname of the server. +
+
ServerTokens Full +
+
+
ServerTokens Major +
+
+
ServerTokens Minimal +
+
+
ServerTokens Minor +
+
+
ServerTokens None +
+
+
ServerTokens OS +
+
+
ServerTokens ProductOnly +
+
+
Specifies what information is included in the Server header of HTTP +responses. +
+
SetEnv variable value +
+
+
Set the specified environment variable to be passed to child processes. +
+
SSLListen +
+
+
Listens on the specified address and port for encrypted connections. +
+
SSLOptions None +
+
+
SSLOptions NoEmptyFragments +
+
+
Sets SSL/TLS protocol options for encrypted connections. +
+
SSLPort +
+
+
Listens on the specified port for encrypted connections. +
+
StrictConformance Yes +
+
+
StrictConformance No +
+
+
Specifies whether the scheduler requires clients to strictly adhere to the IPP +specifications. The default is No. +
+
SubscriptionPrivateAccess all +
+
+
SubscriptionPrivateAccess default +
+
+
SubscriptionPrivateAccess {user|@group|@ACL|@OWNER|@SYSTEM}+ +
+
+
Specifies an access list for a subscription's private values. The "default" +access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's +requesting-user-name-allowed or requesting-user-name-denied values. +
+
SubscriptionPrivateValues all +
+
+
SubscriptionPrivateValues default +
+
+
SubscriptionPrivateValues none +
+
+
SubscriptionPrivateValues attribute-name-1 [ ... attribute-name-N ] +
+
Specifies the list of job values to make private. The "default" values are +"notify-events", "notify-pull-method", "notify-recipient-uri", +"notify-subscriber-user-name", and "notify-user-data". +
+
Timeout seconds +
+
+
Specifies the HTTP request timeout in seconds. +
+
WebInterface yes +
+
+
WebInterface no +
+
Specifies whether the web interface is enabled. +
+
+

See Also

+classes.conf(5), cups-files.conf(5), cupsd(8), +mime.convs(5), mime.types(5), printers.conf(5), +subscriptions.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html new file mode 100644 index 000000000..6df5475fc --- /dev/null +++ b/doc/help/man-cupsd.html @@ -0,0 +1,74 @@ + + + + + + cupsd(8) + + +

cupsd(8)

+

Name

+cupsd - cups scheduler +

Synopsis

+cupsd +[ -c +config-file +] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ] +

Description

+cupsd is the scheduler for CUPS. It implements a printing system based +upon the Internet Printing Protocol, version 2.1. If no options are specified +on the command-line then the default configuration file +/private/etc/cups/cupsd.conf will be used. +

Options

+
+
-c config-file +
+
+
Uses the named configuration file. +
+
-f +
+
+
Run cupsd in the foreground; the default is to run in the +background as a "daemon". +
+
-F +
+
+
Run cupsd in the foreground but detach the process from the +controlling terminal and current directory. This is useful for +running cupsd from init(8). +
+
-h +
+
+
Shows the program usage. +
+
-l +
+
+
This option is passed to cupsd when it is run from +launchd(8). +
+
-t +
+
+
Test the configuration file for syntax errors. +
+
+

Compatibility

+cupsd implements all of the required IPP/2.1 attributes and +operations. It also implements several CUPS-specific administration +operations. +

See Also

+backend(7), classes.conf(5), cups-deviced(8), +cups-driverd(8), cups-lpd(8), cups-polld(8), +cupsd.conf(5), filter(7), launchd(8), +mime.convs(5), mime.types(5), printers.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html new file mode 100644 index 000000000..b0cf74bfe --- /dev/null +++ b/doc/help/man-cupsenable.html @@ -0,0 +1,93 @@ + + + + + + cupsenable(8) + + +

cupsenable(8)

+

Name

+cupsdisable, cupsenable - stop/start printers and classes +

Synopsis

+cupsdisable +[ -E ] [-U +username +] [ -c ] [ -h +server[:port] +] [ -r +reason +] [ --hold ] destination(s) +
+cupsenable +[ -E ] [-U +username +] [ -c ] [ -h +server[:port] +] [ --release ] destination(s) +

Description

+cupsenable starts the named printers or classes. +

cupsdisable stops the named printers or classes. The +following options may be used: +

+
-E +
+
+
Forces encryption of the connection to the server. +
+
-U username +
+
+
Uses the specified username when connecting to the server. +
+
-c +
+
+
Cancels all jobs on the named destination. +
+
-h server[:port] +
+
+
Uses the specified server and port. +
+
--hold +
+
+
Holds remaining jobs on the named printer. Useful for allowing the current +job to complete before performing maintenance. +
+
-r "reason" +
+
+
Sets the message associated with the stopped state. If no reason is specified +then the message is set to "Reason Unknown". +
+
--release +
+
+
Releases pending jobs for printing. Use after running cupsdisable with +the --hold option to resume printing. +
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", or "#". +Also, printer and class names are not case-sensitive. +

The System V versions of these commands are disable and +enable. They have been renamed to avoid conflicts with the +bash(1) build-in commands of the same name. +

The CUPS versions of disable and enable may ask the +user for an access password depending on the printing system +configuration. This differs from the System V versions which +require the root user to execute these commands. +

See Also

+cupsaccept(8), cupsreject(8), cancel(1), lp(1), +lpadmin(8), lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + + diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html new file mode 100644 index 000000000..07ac0ff77 --- /dev/null +++ b/doc/help/man-cupsfilter.html @@ -0,0 +1,119 @@ + + + + + + cupsfilter(8) + + +

cupsfilter(8)

+

Name

+cupsfilter - convert a file to another format using cups filters +

Synopsis

+cupsfilter +[ -D ] [ -U +user +] [ -c +config-file +] [ -d +printer +] [ -e ] [ -i +mime/type +] [ -j +job-id[,N] +] [ -m +mime/type +] [ -n +copies +] [ -o +name=value +] [ -p +filename.ppd +] [ -t +title +] [ -u ] +filename +

Description

+cupsfilter is a front-end to the CUPS filter subsystem which allows you +to convert a file to a specific format, just as if you had printed the file +through CUPS. By default, cupsfilter generates a PDF file. +

Options

+
+
-D +
+
+
Delete the input file after conversion. +
+
-U user +
+
+
Specifies the username passed to the filters. The default is the name of the current user. +
+
-c config-file +
+
+
Uses the named cupsd.conf configuration file. +
+
-d printer +
+
Uses information from the named printer. +
+
-e +
+
+
Use every filter from the PPD file. +
+
-i mime/type +
+
+
Specifies the source file type. The default file type is guessed using the +filename and contents of the file. +
+
-j job-id[,N] +
+
+
Converts document N from the specified job. If N is omitted, document 1 is +converted. +
+
-m mime/type +
+
+
Specifies the destination file type. The default file type is application/pdf. +Use printer/foo to convert to the printer format defined by the filters in the +PPD file. +
+
-n copies +
+
+
Specifies the number of copies to generate. +
+
-o name=value +
+
+
Specifies options to pass to the CUPS filters. +
+
-p filename.ppd +
+
+
Specifies the PPD file to use. +
+
-t title +
+
+
Specifies the document title. +
+
-u +
+
+
Delete the PPD file after conversion. +
+
+

See Also

+cupsd.conf(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupstestdsc.html b/doc/help/man-cupstestdsc.html new file mode 100644 index 000000000..aa83e00dd --- /dev/null +++ b/doc/help/man-cupstestdsc.html @@ -0,0 +1,44 @@ + + + + + + cupstestdsc(1) + + +

cupstestdsc(1)

+

Name

+cupstestdsc - test conformance of postscript files +

Synopsis

+cupstestdsc +[ -h ] filename.ps [ ... +filenameN.ps +] +
+cupstestdsc +[ -h ] - +

Description

+cupstestdsc tests the conformance of PostScript files to +the Adobe PostScript Language Document Structuring Conventions +Specification version 3.0. The results of testing and any other +output are sent to the standard output. The second form of the +command reads PostScript from the standard input. +

Limitations

+cupstestdsc only validates the DSC comments in a PostScript +file and does not attempt to validate the PostScript code itself. +Developers must ensure that the PostScript they generate follows +the rules defined by Adobe. Specifically, all pages must be +independent of each other, code outside page descriptions may not +affect the graphics state (current font, color, transform matrix, +etc.), and device-specific commands such as setpagedevice should +not be used. +

See Also

+http://localhost:631/help +
+Adobe PostScript Language Document Structuring Conventions +Specification, Version 3.0. +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html new file mode 100644 index 000000000..21e23570f --- /dev/null +++ b/doc/help/man-cupstestppd.html @@ -0,0 +1,181 @@ + + + + + + cupstestppd(1) + + +

cupstestppd(1)

+

Name

+cupstestppd - test conformance of ppd files +

Synopsis

+cupstestppd +[ -I +category +] [ -R +rootdir +] [ -W +category +] [ -q ] [-r] [ -v[v] ] filename.ppd[.gz] [ ... filenameN.ppd[.gz] ] +
+cupstestppd +[ -R +rootdir +] [ -W +category +] [ -q ] [-r] [ -v[v] ] - +

Description

+cupstestppd tests the conformance of PPD files to the +Adobe PostScript Printer Description file format specification +version 4.3. It can also be used to list the supported options +and available fonts in a PPD file. The results of testing and +any other output are sent to the standard output. +

The first form of cupstestppd tests one or more PPD files +on the command-line. The second form tests the PPD file provided +on the standard input. +

Options

+cupstestppd supports the following options: +
+
-I filename +
+
+
Ignores all PCFileName warnings. +
+
-I filters +
+
+
Ignores all filter errors. +
+
-I profiles +
+
+
Ignores all profile errors. +
+
-R rootdir +
+
+
Specifies an alternate root directory for the filter, pre-filter, +and other support file checks. +
+
-W constraints +
+
+
Report all UIConstraint errors as warnings. +
+
-W defaults +
+
+
Except for size-related options, report all default option errors as warnings. +
+
-W filters +
+
+
Report all filter errors as warnings. +
+
-W profiles +
+
+
Report all profile errors as warnings. +
+
-W sizes +
+
+
Report all media size errors as warnings. +
+
-W translations +
+
+
Report all translation errors as warnings. +
+
-W all +
+
+
Report all of the previous errors as warnings. +
+
-W none +
+
+
Report all of the previous errors as errors. +
+
-q +
+
+
Specifies that no information should be displayed. +
+
-r +
+
+
Relaxes the PPD conformance requirements so that common +whitespace, control character, and formatting problems are not +treated as hard errors. +
+
-v +
+
+
Specifies that detailed conformance testing results should be +displayed rather than the concise PASS/FAIL/ERROR status. +
+
-vv +
+
+
Specifies that all information in the PPD file should be +displayed in addition to the detailed conformance testing +results. +
+
+

The -q, -v, and -vv options are mutually exclusive. +

Exit Status

+cupstestppd returns zero on success and non-zero on error. The +error codes are as follows: +
+
1 +
+
+
Bad command-line arguments or missing PPD filename. +
+
2 +
+
+
Unable to open or read PPD file. +
+
3 +
+
+
The PPD file contains format errors that cannot be skipped. +
+
4 +
+
+
The PPD file does not conform to the Adobe PPD specification. +
+
+

Examples

+The following command will test all PPD files under the current +directory and print the names of each file that does not +conform: +
+
+    find . -name \*.ppd \! -exec cupstestppd -q '{}' \; -print
+
+
+The next command tests all PPD files under the current directory +and print detailed conformance testing results for the files +that do not conform: +
+
+    find . -name \*.ppd \! -exec cupstestppd -q '{}' \; \
+        -exec cupstestppd -v '{}' \;
+
+
+

See Also

+lpadmin(8), +
+http://localhost:631/help +
+Adobe PostScript Printer Description File Format Specification, Version 4.3. +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html new file mode 100644 index 000000000..b4ca60975 --- /dev/null +++ b/doc/help/man-filter.html @@ -0,0 +1,267 @@ + + + + + + filter(7) + + +

filter(7)

+

Name

+filter - cups file conversion filter interface +

Synopsis

+filter +job user title num-copies options [ +filename +] +

Description

+The CUPS filter interface provides a standard method for adding support for +new document types to CUPS. Each filter is capable of converting from one +or more input formats to another format that can either be printed directly +or piped into another filter to get it to a printable format. +

Filters must be capable of reading from a filename on the command-line +or from the standard input, copying the standard input to a temporary +file as required by the file format. All output must be sent to the +standard output. +

The command name (argv[0]) is set to the name of the destination printer but is +also available in the PRINTER environment variable. +

Warning

+CUPS filters are not meant to be run directly by the user. Aside from the legacy +System V interface issues (argv[0] is the printer name), CUPS filters also +expect specific environment variables and file descriptors, and typically run in +a user session that (on OS X) has additional restrictions that affect how it +runs. Unless you are a developer and know what you are doing, please do not run +filters directly. Instead, use the cupsfilter(8) program to use the +appropriate filters to do the conversions you need. +

Options

+Options passed on the command-line typically do not include the default choices +the printer's PPD file. In addition, some options may be specified in multiple +ways - "landscape" is a synonym for "orientation-requested=4", "media" is a +synonym for "PageSize", "PageRegion", "InputSlot", and "MediaType", and "sides" +is a synonym for the various "Duplex" options. Non-raster filters must +support both explicit and implicit specification of PPD options - use the +ppdMarkDefaults and cupsMarkOptions functions in the CUPS library to use the +correct mapping, and ppdFindMarkedChoice to get the user-selected choice. +

Raster filters should use option choices set through the raster page header, as +those reflect the options in effect for a given page. Options specified on the +command-line determine the default values for the entire job, which can be +overridden on a per-page basis. +

Log Messages

+Messages sent to stderr are generally logged to +printer-state-message attribute and the current ErrorLog. +Each line begins with a standard prefix: +
+
ALERT: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "alert" log level. +
+
ATTR: attribute=value [attribute=value] +
+
+
Sets the named job or printer attribute(s). The following job attributes can be +set: "job-media-progress". The following printer attributes can be set: +"auth-info-required", "marker-colors", "marker-high-levels", "marker-levels", +"marker-low-levels", "marker-message", "marker-names", "marker-types", +"printer-alert", and "printer-alert-description". +
+
CRIT: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "critical" log level. +
+
DEBUG: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "debug" log level. +
+
DEBUG2: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "debug2" log level. +
+
EMERG: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "emergency" log level. +
+
ERROR: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "error" log level. +
+
INFO: message +
+
+
Sets the printer-state-message attribute. If the current LogLevel +is set to "debug2", also adds the specified message to the +current ErrorLog using the "info" log level. +
+
NOTICE: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "notice" log level. +
+
PAGE: page-number #-copies +
+
+
PAGE: total #-pages +
+
+
Adds an entry to the current PageLog. The first form adds +#-copies to the job-media-sheets-completed attribute. The second +form sets the job-media-sheets-completed attribute to #-pages. +
+
PPD: Keyword=Value ... KeywordN=Value +
+
+
Sets the named keywords in the printer's PPD file. This is typically +used to update default option keywords such as DefaultPageSize and +the various installable options in the PPD file. +
+
STATE: printer-state-reason [printer-state-reason ...] +
+
+
STATE: + printer-state-reason [printer-state-reason ...] +
+
+
STATE: - printer-state-reason [printer-state-reason ...] +
+
+
Sets, adds, or removes printer-state-reason keywords to the +current queue. Typically this is used to indicate media, ink, and +toner conditions on a printer. +
+
WARNING: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "warning" log level. +
+
+

Environment Variables

+The following environment variables are defined by the CUPS +server when executing the filter: +
+
CHARSET +
+
+
The default text character set, typically utf-8. +
+
CLASS +
+
+
When a job is submitted to a printer class, contains the name of +the destination printer class. Otherwise this environment +variable will not be set. +
+
CONTENT_TYPE +
+
+
The MIME type associated with the file (e.g. +application/postscript). +
+
CUPS_CACHEDIR +
+
+
The directory for semi-persistent cache files can be found. +
+
CUPS_DATADIR +
+
+
The directory where data files can be found. +
+
CUPS_FILETYPE +
+
+
The type of file being printed: "job-sheet" for a banner page and "document" +for a regular print file. +
+
CUPS_MAX_MESSAGE +
+
+
The maximum size of a message sent to stderr, including any leading prefix and +the trailing newline. +
+
CUPS_SERVERROOT +
+
+
The root directory of the server. +
+
DEVICE_URI +
+
+
The device-uri associated with the printer. +
+
FINAL_CONTENT_TYPE +
+
+
The MIME type associated with the printer (e.g. +application/vnd.cups-postscript). +
+
LANG +
+
+
The default language locale (typically C or en). +
+
PATH +
+
+
The standard execution path for external programs that may be run by +the filter. +
+
PPD +
+
+
The full pathname of the PostScript Printer Description (PPD) +file for this printer. +
+
PRINTER +
+
+
The name of the printer. +
+
RIP_CACHE +
+
+
The recommended amount of memory to use for Raster Image +Processors (RIPs). +
+
SOFTWARE +
+
+
The name and version number of the server (typically CUPS/1.2). +
+
TZ +
+
+
The timezone of the server. +
+
USER +
+
+
The user executing the filter, typically "lp" or "root"; consult the +cupsd.conf(5) file for the current setting. +
+
+

Compatibility

+While the filter interface is compatible with System V interface +scripts, it will only work with the System V interface script as the +only filter. Typically the interface script will be provided via the +lpadmin(8) command using the -i option. +

See Also

+backend(7), cupsd(8), cupsfilter(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html new file mode 100644 index 000000000..aceb569e3 --- /dev/null +++ b/doc/help/man-lp.html @@ -0,0 +1,284 @@ + + + + + + lp(1) + + +

lp(1)

+

Name

+lp - print files +

Synopsis

+lp +[ -E ] [ -U +username +] [ -c ] [ -d +destination[/instance] +] [ -h +hostname[:port] +] [ -m ] [ -n +num-copies +] [ -o +option[=value] +] [ -q +priority +] [ -s ] [ -t +title +] [ -H +handling +] [ -P +page-list +] [ -- ] [ +file(s) +] +
+lp +[ -E ] [ -U +username +] [ -c ] [ -h +hostname[:port] +] [ -i +job-id +] [ -n +num-copies +] [ -o +option[=value] +] [ -q +priority +] [ -t +title +] [ -H +handling +] [ -P +page-list +] +

Description

+lp submits files for printing or alters a pending job. Use +a filename of "-" to force printing from the standard input. +

The Default Destination

+CUPS provides many ways to set the default destination. The "LPDEST" and +"PRINTER" environment variables are consulted first. If neither are set, +the current default set using the lpoptions(1) command is used, +followed by the default set using the lpadmin(8) command. +

Options

+The following options are recognized by lp: +
+
-- +
+
+
Marks the end of options; use this to print a file whose name +begins with a dash (-). +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-U username +
+
+
Specifies the username to use when connecting to the server. +
+
-c +
+
+
This option is provided for backwards-compatibility only. On +systems that support it, this option forces the print file to be +copied to the spool directory before printing. In CUPS, print +files are always sent to the scheduler via IPP which has the +same effect. +
+
-d destination +
+
+
Prints files to the named printer. +
+
-h hostname[:port] +
+
+
Chooses an alternate server. +
+
-i job-id +
+
+
Specifies an existing job to modify. +
+
-m +
+
+
Sends an email when the job is completed. +
+
-n copies +
+
+
Sets the number of copies to print from 1 to 100. +
+
-o "name=value [name=value ...]" +
+
+
Sets one or more job options. +
+
-q priority +
+
+
Sets the job priority from 1 (lowest) to 100 (highest). The +default priority is 50. +
+
-s +
+
+
Do not report the resulting job IDs (silent mode.) +
+
-t "name" +
+
+
Sets the job name. +
+
-H hh:mm +
+
+
-H hold +
+
+
-H immediate +
+
+
-H restart +
+
+
-H resume +
+
+
Specifies when the job should be printed. A value of immediate will print +the file immediately, a value of hold will hold the job indefinitely, and +a UTC time value (HH:MM) will hold the job until the specified UTC (not local) +time. Use a value of resume with the -i option to resume a held job. +Use a value of restart with the -i option to restart +a completed job. +
+
-P page-list +
+
+
Specifies which pages to print in the document. The list can +contain a list of numbers and ranges (#-#) separated by commas +(e.g. 1,3-5,16). The page numbers refer to the output pages and +not the document's original pages - options like "number-up" can +affect the numbering of the pages. +
+
+

Common Job Options

+Aside from the printer-specific options reported by the +lpoptions(1) command, the following generic options are +available: +
+
-o media=size +
+
+
Sets the page size to size. Most printers support at least +the size names "a4", "letter", and "legal". +
+
-o landscape +
+
+
-o orientation-requested=4 +
+
+
Prints the job in landscape (rotated 90 degrees). +
+
-o sides=one-sided +
+
+
-o sides=two-sided-long-edge +
+
+
-o sides=two-sided-short-edge +
+
+
Prints on one or two sides of the paper. The value +"two-sided-long-edge" is normally used when printing portrait +(unrotated) pages, while "two-sided-short-edge" is used for +landscape pages. +
+
-o fit-to-page +
+
+
Scales the print file to fit on the page. +
+
-o number-up=2 +
+
+
-o number-up=4 +
+
+
-o number-up=6 +
+
+
-o number-up=9 +
+
+
-o number-up=16 +
+
+
Prints multiple document pages on each output page. +
+
-o cpi=N +
+
+
Sets the number of characters per inch to use when printing a +text file. The default is 10. +
+
-o lpi=N +
+
+
Sets the number of lines per inch to use when printing a text +file. The default is 6. +
+
-o page-bottom=N +
+
+
-o page-left=N +
+
+
-o page-right=N +
+
+
-o page-top=N +
+
+
Sets the page margins when printing text files. The values are in +points - there are 72 points to the inch. +
+
+

Examples

+Print a double-sided legal document to a printer called "foo": +
+    lp -d foo -o media=legal -o sides=two-sided-long-edge filename
+
+

Print an image across 4 pages: +

+    lp -d bar -o scaling=200 filename
+
+

Print a text file with 12 characters per inch, 8 lines per inch, and +a 1 inch left margin: +

+    lp -d bar -o cpi=12 -o lpi=8 -o page-left=72 filename
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", or "#". +Also, printer and class names are not case-sensitive. +

The "q" option accepts a different range of values than the +Solaris lp command, matching the IPP job priority values (1-100, +100 is highest priority) instead of the Solaris values (0-39, 0 +is highest priority). +

See Also

+cancel(1), lpadmin(8), lpmove(8), lpoptions(1), +lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html new file mode 100644 index 000000000..236e71568 --- /dev/null +++ b/doc/help/man-lpadmin.html @@ -0,0 +1,248 @@ + + + + + + lpadmin(8) + + +

lpadmin(8)

+

Name

+lpadmin - configure cups printers and classes +

Synopsis

+lpadmin +[ -E ] [-U +username +] [ -h +server[:port] +] -d +destination +
+lpadmin +[ -E ] [-U +username +] [ -h +server[:port] +] -p +destination +[ -R +name-default +] +option(s) +
+lpadmin +[ -E ] [-U +username +] [ -h +server[:port] +] -x +destination +

Description

+lpadmin configures printer and class queues provided by +CUPS. It can also be used to set the server default printer or +class. +

When specified before the -d, -p, or -x +options, the -E option forces encryption when connecting to +the server. +

The first form of the command (-d) sets the default printer +or class to destination. Subsequent print jobs submitted +via the lp(1) or lpr(1) commands will use this +destination unless the user specifies otherwise with the +lpoptions(1) command. +

The second form of the command (-p) configures the named +printer or class. The additional options are described below. +

The third form of the command (-x) deletes the printer or +class destination. Any jobs that are pending for the +destination will be removed and any job that is currently printed +will be aborted. +

Configuration Options

+The following options are recognized when configuring a printer +queue: +
+
-c class +
+
+
Adds the named printer to class. If class does +not exist it is created automatically. +
+
-i interface +
+
+
Sets a System V style interface script for the printer. This +option cannot be specified with the -P option (PPD file) +and is intended for providing support for legacy printer drivers. +
+
-m model +
+
+
Sets a standard System V interface script or PPD file for the printer from the +model directory or using one of the driver interfaces. Use the -m +option with the lpinfo(8) command to get a list of supported models. +
+
-o cupsIPPSupplies=true +
+
+
-o cupsIPPSupplies=false +
+
+
Specifies whether IPP supply level values should be reported. +
+
-o cupsSNMPSupplies=true +
+
+
-o cupsSNMPSupplies=false +
+
+
Specifies whether SNMP supply level (RFC 3805) values should be reported. +
+
-o job-k-limit=value +
+
+
Sets the kilobyte limit for per-user quotas. The value is an +integer number of kilobytes; one kilobyte is 1024 bytes. +
+
-o job-page-limit=value +
+
+
Sets the page limit for per-user quotas. The value is the integer +number of pages that can be printed; double-sided pages are +counted as two pages. +
+
-o job-quota-period=value +
+
+
Sets the accounting period for per-user quotas. The value is an +integer number of seconds; 86,400 seconds are in one day. +
+
-o job-sheets-default=banner +
+
+
-o job-sheets-default=banner,banner +
+
+
Sets the default banner page(s) to use for print jobs. +
+
-o name=value +
+
+
Sets a PPD option for the printer. PPD options can be listed using the -l +option with the lpoptions(1) command. +
+
-o name-default=value +
+
+
Sets a default server-side option for the destination. Any print-time +option can be defaulted, e.g. "-o cpi-default=17" to set the default +"cpi" option value to 17. +
+
-o port-monitor=name +
+
+
Sets the binary communications program to use when printing, +"none", "bcp", or "tbcp". The default program is "none". The +specified port monitor must be listed in the printer's PPD file. +
+
-o printer-error-policy=name +
+
+
Sets the error policy to be used when the printer backend is +unable to send the job to the printer. The name must be one of +"abort-job", "retry-job", "retry-current-job", or "stop-printer". The default +error policy is "stop-printer" for printers and "retry-current-job" for +classes. +
+
-o printer-is-shared=true/false +
+
+
Sets the destination to shared/published or unshared/unpublished. +Shared/published destinations are publicly announced by the server +on the LAN based on the browsing configuration in +cupsd.conf, while unshared/unpublished destinations are not +announced. The default value is "true". +
+
-o printer-op-policy=name +
+
+
Sets the IPP operation policy associated with the destination. The +name must be defined in the cupsd.conf in a Policy section. +The default operation policy is "default". +
+
-R name-default +
+
+
Deletes the named option from printer. +
+
-r class +
+
+
Removes the named printer from class. If the +resulting class becomes empty it is removed. +
+
-u allow:user,user,@group +
+
+
-u deny:user,user,@group +
+
+
-u allow:all +
+
+
-u deny:none +
+
+
Sets user-level access control on a destination. Names starting with +"@" are interpreted as UNIX groups. The latter two forms turn +user-level access control off. +
+
-v "device-uri" +
+
+
Sets the device-uri attribute of the printer queue. Use the -v +option with the lpinfo(8) command to get a list of supported device URIs +and schemes. +
+
-D "info" +
+
+
Provides a textual description of the destination. +
+
-E +
+
+
Enables the destination and accepts jobs; this is the same as running the +cupsaccept(8) and cupsenable(8) programs on the destination. +
+
-L "location" +
+
+
Provides a textual location of the destination. +
+
-P ppd-file +
+
+
Specifies a PostScript Printer Description file to use with the +printer. If specified, this option overrides the -i option +(interface script). +
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", or "#". +Also, printer and class names are not case-sensitive. +Finally, the CUPS version of lpadmin may ask the user for +an access password depending on the printing system +configuration. This differs from the System V version which +requires the root user to execute this command. +

Limitations

+The CUPS version of lpadmin does not support all of the +System V or Solaris printing system configuration options. +

See Also

+cupsaccept(8), cupsenable(8), lpinfo(8), +lpoptions(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html new file mode 100644 index 000000000..c322c9566 --- /dev/null +++ b/doc/help/man-lpc.html @@ -0,0 +1,71 @@ + + + + + + lpc(8) + + +

lpc(8)

+

Name

+lpc - line printer control program +

Synopsis

+lpc +[ +command +[ +parameter(s) +] ] +

Description

+lpc provides limited control over printer and class queues +provided by CUPS. It can also be used to query the state of +queues. +

If no command is specified on the command-line, lpc will +display a prompt and accept commands from the standard input. +

Commands

+The lpc program accepts a subset of commands accepted by +the Berkeley lpc program of the same name: +
+
exit +
+
+
Exits the command interpreter. +
+
help [command] +
+
+
? [command] +
+
+
Displays a short help message. +
+
quit +
+
+
Exits the command interpreter. +
+
status [queue] +
+
+
Displays the status of one or more printer or class queues. +
+
+

Limitations

+Since lpc is geared towards the Berkeley printing system, +it is impossible to use lpc to configure printer or class +queues provided by CUPS. To configure printer or class queues +you must use the lpadmin(8) command or another +CUPS-compatible client with that functionality. +

Compatibility

+The CUPS version of lpc does not implement all of the +standard Berkeley or LPRng commands. +

See Also

+cancel(1), cupsaccept(8), cupsenable(8), +lp(1), lpr(1), lprm(1), lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html new file mode 100644 index 000000000..cfa4eb633 --- /dev/null +++ b/doc/help/man-lpinfo.html @@ -0,0 +1,122 @@ + + + + + + lpinfo(8) + + +

lpinfo(8)

+

Name

+lpinfo - show available devices or drivers +

Synopsis

+lpinfo +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -l ] [ --device-id +device-id-string +] [ --exclude-schemes +scheme-list +] [ --include-schemes +scheme-list +] [ --language +locale +] [ --make-and-model +name +] [ --product +name +] -m +
+lpinfo +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -l ] [ --exclude-schemes +scheme-list +] [ --include-schemes +scheme-list +] [ --timeout +seconds +] -v +

Description

+lpinfo lists the available devices or drivers known to the +CUPS server. The first form (-m) lists the available +drivers, while the second form (-v) lists the available +devices. +

Options

+lpinfo accepts the following options: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-U username +
+
+
Sets the username to use when connecting to the server. +
+
-h server[:port] +
+
+
Selects an alternate server. +
+
-l +
+
+
Shows a "long" listing of devices or drivers. +
+
--device-id device-id-string +
+
+
Specifies the IEEE-1284 device ID to match when listing drivers with the +-m option. +
+
--exclude-schemes scheme-list +
+
+
Specifies a comma-separated list of device or PPD schemes that should be +excluded from the results. Static PPD files use the "file" scheme. +
+
--include-schemes scheme-list +
+
+
Specifies a comma-separated list of device or PPD schemes that should be +included in the results. Static PPD files use the "file" scheme. +
+
--language locale +
+
+
Specifies the language to match when listing drivers with the -m option. +
+
--make-and-model name +
+
+
Specifies the make and model to match when listing drivers with the -m +option. +
+
--product name +
+
+
Specifies the product to match when listing drivers with the -m option. +
+
--timeout seconds +
+
+
Specifies the timeout when listing devices with the -v option. +
+
+

Compatibility

+The lpinfo command is unique to CUPS. +

See Also

+lpadmin(8), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html new file mode 100644 index 000000000..968424b29 --- /dev/null +++ b/doc/help/man-lpmove.html @@ -0,0 +1,65 @@ + + + + + + lpmove(8) + + +

lpmove(8)

+

Name

+lpmove - move a job or all jobs to a new destination +

Synopsis

+lpmove +[ -E ] [ -h +server[:port] +] [ -U +username +] +job destination +
+lpmove +[ -E ] [ -h +server[:port] +] [ -U +username +] +source destination +

Description

+lpmove moves the specified job or all jobs from +source to destination. job can be the job ID +number or the old destination and job ID: +
+
+
+     lpmove 123 newprinter
+     lpmove oldprinter-123 newprinter
+
+

Options

+The lpmove command supports the following options: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-U username +
+
+
Specifies an alternate username. +
+
-h server[:port] +
+
+
Specifies an alternate server. +
+
+

See Also

+cancel(1), lp(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html new file mode 100644 index 000000000..c342652cc --- /dev/null +++ b/doc/help/man-lpoptions.html @@ -0,0 +1,138 @@ + + + + + + lpoptions(1) + + +

lpoptions(1)

+

Name

+lpoptions - display or set printer options and defaults +

Synopsis

+lpoptions +[ -E ] [ -U +username +] [ -h +server[:port] +] -d +destination[/instance] +[ -o +option[=value] +] ... [ -o +option[=value] +] +
+lpoptions +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -p +destination[/instance] +] -l +
+lpoptions +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -o +option[=value] +] ... [ -o +option[=value] +] [ -p +destination[/instance] +] -r +option +
+lpoptions +[ -E ] [ -U +username +] [ -h +server[:port] +] -x +destination[/instance] +

Description

+lpoptions displays or sets printer options and defaults. +lpoptions shows the default printer options when run with no +arguments. Other options include: +
+
-E +
+
+
Enables encryption when communicating with the CUPS server. +
+
-U username +
+
+
Uses an alternate username. +
+
-d destination[/instance] +
+
+
Sets the user default printer to destination. If instance +is supplied then that particular instance is used. This option +overrides the system default printer for the current user. +
+
-h server[:port] +
+
+
Uses an alternate server. +
+
-l +
+
+
Lists the printer specific options and their current settings. +
+
-o option[=value] +
+
+
Specifies a new option for the named destination. +
+
-p destination[/instance] +
+
+
Sets the destination and instance, if specified, for any options +that follow. If the named instance does not exist then it is +created. +
+
-r option +
+
+
Removes the specified option for the named destination. +
+
-x destination[/instance] +
+
+
Removes the options for the named destination and instance, if +specified. If the named instance does not exist then this does +nothing. +
+
+

If no options are specified using the -o option, then the +current options for the named printer are reported on the +standard output. +

Options set with the lpoptions command are used by the +lp(1) and lpr(1) commands when submitting jobs. +

Root Account Options

+When run by the root user, lpoptions gets and sets default +options and instances for all users in the +/private/etc/cups/lpoptions file. +

Compatibility

+The lpoptions command is unique to CUPS. +

Files

+~/.cups/lpoptions - user defaults and instances created by non-root +users. +
+/private/etc/cups/lpoptions - system-wide defaults and instances +created by the root user. +

See Also

+cancel(1), lp(1), lpadmin(8), lpr(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lppasswd.html b/doc/help/man-lppasswd.html new file mode 100644 index 000000000..a24bd206b --- /dev/null +++ b/doc/help/man-lppasswd.html @@ -0,0 +1,64 @@ + + + + + + lppasswd(1) + + +

lppasswd(1)

+

Name

+lppasswd - add, change, or delete digest passwords. +

Synopsis

+lppasswd +[ +username +] +
+lppasswd +-a [ -g +groupname +] +username +
+lppasswd +-x +username +

Description

+lppasswd adds, changes, or deletes passwords in the CUPS +digest password file, passwd.md5. When run by a normal +user, lppasswd will prompt for the old and new passwords. +When run by the super-user, lppasswd can add new accounts +(-a username), change existing accounts (username), +or delete accounts (-x username) in the digest password +file. Digest usernames do not have to match local UNIX usernames. +

Options

+lppasswd supports the following options: +
+
-g groupname +
+
+
Specifies a group other than the default system group. +
+
+

Security Issues

+By default, the lppasswd program is not installed to allow ordinary +users to change their passwords. To enable this, the lppasswd command +must be made setuid to root with the command: +
+
+chmod u+s lppasswd
+
+

While every attempt has been made to make lppasswd secure against +exploits that could grant super-user privileges to unprivileged users, +paranoid system administrators may wish to use Basic authentication with +accounts managed by PAM instead. +

See Also

+lp(1), lpr(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html new file mode 100644 index 000000000..0d1c5b1cb --- /dev/null +++ b/doc/help/man-lpq.html @@ -0,0 +1,73 @@ + + + + + + lpq(1) + + +

lpq(1)

+

Name

+lpq - show printer queue status +

Synopsis

+lpq +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -P +destination[/instance] +] [ -a ] [ -l ] [ ++interval +] +

Description

+lpq shows the current print queue status on the named +printer. Jobs queued on the default destination will be shown if +no printer or class is specified on the command-line. +

The +interval option allows you to continuously report the +jobs in the queue until the queue is empty; the list of jobs is +shown once every interval seconds. +

Options

+lpq supports the following options: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-P destination[/instance] +
+
+
Specifies an alternate printer or class name. +
+
-U username +
+
+
Specifies an alternate username. +
+
-a +
+
+
Reports jobs on all printers. +
+
-h server[:port] +
+
+
Specifies an alternate server. +
+
-l +
+
+
Requests a more verbose (long) reporting format. +
+
+

See Also

+cancel(1), lp(1), lpr(1), lprm(1), +lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html new file mode 100644 index 000000000..f6051df79 --- /dev/null +++ b/doc/help/man-lpr.html @@ -0,0 +1,133 @@ + + + + + + lpr(1) + + +

lpr(1)

+

Name

+lpr - print files +

Synopsis

+lpr +[ -E ] [ -H +server[:port] +] [ -U +username +] [ -P +destination[/instance] +] [ -# +num-copies +[ -h ] [ -l ] [ -m ] [ -o +option[=value] +] [ -p] [ -q ] [ -r ] [ -C/J/T +title +] [ +file(s) +] +

Description

+lpr submits files for printing. Files named on the command +line are sent to the named printer (or the default destination if no +destination is specified). If no files are listed on the command-line, +lpr reads the print file from the standard input. +

The Default Destination

+CUPS provides many ways to set the default destination. The "LPDEST" and +"PRINTER" environment variables are consulted first. If neither are set, +the current default set using the lpoptions(1) command is used, +followed by the default set using the lpadmin(8) command. +

Options

+The following options are recognized by lpr: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-H server[:port] +
+
+
Specifies an alternate server. +
+
-C "name" +
+
+
-J "name" +
+
+
-T "name" +
+
+
Sets the job name. +
+
-P destination[/instance] +
+
+
Prints files to the named printer. +
+
-U username +
+
+
Specifies an alternate username. +
+
-# copies +
+
+
Sets the number of copies to print from 1 to 100. +
+
-h +
+
+
Disables banner printing. This option is equivalent to "-o +job-sheets=none". +
+
-l +
+
+
Specifies that the print file is already formatted for the +destination and should be sent without filtering. This option is +equivalent to "-o raw". +
+
-m +
+
+
Send an email on job completion. +
+
-o option[=value] +
+
+
Sets a job option. +
+
-p +
+
+
Specifies that the print file should be formatted with a shaded +header with the date, time, job name, and page number. This +option is equivalent to "-o prettyprint" and is only useful when +printing text files. +
+
-q +
+
+
Hold job for printing. +
+
-r +
+
+
Specifies that the named print files should be deleted after +printing them. +
+
+

Compatibility

+The "c", "d", "f", "g", "i", "n", "t", "v", and "w" options +are not supported by CUPS and produce a warning message if used. +

See Also

+cancel(1), lp(1), lpadmin(8), lpoptions(1), +lpq(1), lprm(1), lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html new file mode 100644 index 000000000..23ce4b01d --- /dev/null +++ b/doc/help/man-lprm.html @@ -0,0 +1,65 @@ + + + + + + lprm(1) + + +

lprm(1)

+

Name

+lprm - cancel print jobs +

Synopsis

+lprm +[ -E ] [ -U +username +] [ -h +server[:port] +] [ -P +destination[/instance] +] [ - ] [ +job ID(s) +] +

Description

+lprm cancels print jobs that have been queued for printing. +If no arguments are supplied, the current job on the default +destination is cancelled. You can specify one or more job ID +numbers to cancel those jobs or use the - option to cancel +all jobs. +

Options

+The lprm command supports the following options: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-P destination[/instance] +
+
+
Specifies the destination printer or class. +
+
-U username +
+
+
Specifies an alternate username. +
+
-h server[:port] +
+
+
Specifies an alternate server. +
+
+

Compatibility

+The CUPS version of lprm is compatible with the standard +Berkeley lprm command. +

See Also

+cancel(1), lp(1), lpq(1), lpr(1), +lpstat(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html new file mode 100644 index 000000000..9d4ed7a6a --- /dev/null +++ b/doc/help/man-lpstat.html @@ -0,0 +1,154 @@ + + + + + + lpstat(1) + + +

lpstat(1)

+

Name

+lpstat - print cups status information +

Synopsis

+lpstat +[ -E ] [ -H ] [ -U +username +] [ -h +hostname[:port] +] [ -l ] [ -W +which-jobs +] [ -a [ +destination(s) +] ] [ -c [ +class(es) +] ] [ -d ] [ -o [ +destination(s) +] ] [ -p [ +printer(s) +] ] [ -r ] [ -R ] [ -s ] [ -t ] [ -u [ +user(s) +] ] [ -v [ +printer(s) +] ] +

Description

+lpstat displays status information about the current +classes, jobs, and printers. When run with no arguments, +lpstat will list jobs queued by the current user. +

Options

+The lpstat command supports the following options: +
+
-E +
+
+
Forces encryption when connecting to the server. +
+
-H +
+
+
Shows the server hostname and port. +
+
-R +
+
+
Shows the ranking of print jobs. +
+
-U username +
+
+
Specifies an alternate username. +
+
-W which-jobs +
+
+
Specifies which jobs to show, completed or +not-completed (the default). This option must appear +before the -o option and/or any printer names, otherwise +the default (not-completed) value will be used in the request to +the scheduler. +
+
-a [printer(s)] +
+
+
Shows the accepting state of printer queues. If no printers are +specified then all printers are listed. +
+
-c [class(es)] +
+
+
Shows the printer classes and the printers that belong to them. +If no classes are specified then all classes are listed. +
+
-d +
+
+
Shows the current default destination. +
+
-h server[:port] +
+
+
Specifies an alternate server. +
+
-l +
+
+
Shows a long listing of printers, classes, or jobs. +
+
-o [destination(s)] +
+
+
Shows the jobs queue on the specified destinations. If no destinations are +specified all jobs are shown. +
+
-p [printer(s)] +
+
+
Shows the printers and whether or not they are enabled for printing. If +no printers are specified then all printers are listed. +
+
-r +
+
+
Shows whether the CUPS server is running. +
+
-s +
+
+
Shows a status summary, including the default destination, a +list of classes and their member printers, and a list of printers and +their associated devices. This is equivalent to using the "-d", "-c", +and "-v" options. +
+
-t +
+
+
Shows all status information. This is equivalent to using the "-r", +"-d", "-c", "-v", "-a", "-p", and "-o" options. +
+
-u [user(s)] +
+
+
Shows a list of print jobs queued by the specified users. If no users +are specified, lists the jobs queued by the current user. +
+
-v [printer(s)] +
+
+
Shows the printers and what device they are attached to. If no printers +are specified then all printers are listed. +
+
+

Compatibility

+Unlike the System V printing system, CUPS allows printer names to +contain any printable character except SPACE, TAB, "/", and "#". +Also, printer and class names are not case-sensitive. +

The "-h", "-E", "-U", and "-W" options are unique to CUPS. +

The Solaris "-f", "-P", and "-S" options are silently ignored. +

See Also

+cancel(1), lp(1), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html new file mode 100644 index 000000000..829048e55 --- /dev/null +++ b/doc/help/man-mailto.conf.html @@ -0,0 +1,60 @@ + + + + + + mailto.conf(5) + + +

mailto.conf(5)

+

Name

+mailto.conf - configuration file for cups email notifier +

Description

+The mailto.conf file defines the local mail server and +email notification preferences for CUPS. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +

Directives

+
+
Cc cc-address@domain.com +
+
+
Specifies an additional recipient for all email notifications. +
+
From from-address@domain.com +
+
+
Specifies the sender of email notifications. +
+
Sendmail sendmail command and options +
+
+
Specifies the sendmail command to use when sending email +notifications. Only one Sendmail or SMTPServer line +may be present in the mailto.conf file. If multiple lines +are present, only the last one is used. +
+
SMTPServer servername +
+
+
Specifies a SMTP server to send email notifications to. Only one +Sendmail or SMTPServer line may be present in the +mailto.conf file. If multiple lines are present, only the +last one is used. +
+
Subject subject-prefix +
+
+
Specifies a prefix string for the subject line of an email notification. +
+
+

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), +mime.convs(5), mime.types(5), printers.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html new file mode 100644 index 000000000..e4e39c0d3 --- /dev/null +++ b/doc/help/man-mime.convs.html @@ -0,0 +1,38 @@ + + + + + + mime.convs(5) + + +

mime.convs(5)

+

Name

+mime.convs - mime type conversion file for cups +

Description

+The mime.convs file defines the filters that are available +for converting files from one format to another. The standard +filters support text, PDF, PostScript, HP-GL/2, and many types of +image files. +

Additional filters can be added to the mime.convs file or +(preferably) to other files in the CUPS configuration directory. +

Each line in the mime.convs file is a comment, blank, or filter +line. Comment lines start with the # character. Filter lines specify +the source and destination MIME types along with a relative cost +associated with the filter and the filter to run: +
+

+
+super/type super/type cost filter
+application/postscript application/vnd.cups-raster 50 pstoraster
+
+

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), +mime.types(5), printers.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html new file mode 100644 index 000000000..55e5ed4f8 --- /dev/null +++ b/doc/help/man-mime.types.html @@ -0,0 +1,118 @@ + + + + + + mime.types(5) + + +

mime.types(5)

+

Name

+mime.types - mime type description file for cups +

Description

+The mime.types file defines the recognized file types. +

Additional file types can be added to mime.types or +(preferably) in additional files in the CUPS configuration +directory with the extension ".types". +

Each line in the mime.types file is a comment, blank, or +rule line. Comment lines start with the # character. Rule lines +start with the MIME type name and are optionally followed by a +series of file recognition rules that are used to automatically +identify print and web files: +
+

+
+    super/type rule [ ... ruleN]
+
+MIME type names are case-insensitive and are sorted in ascending alphanumeric +order for the purposes of matching. See the "TYPE MATCHING AND PRIORITY" +section for more information. +

The rules may be grouped using parenthesis, joined using "+" for a +logical AND and "," or whitespace for a logical OR, and negated using +"!". +

Rules

+Rules take two forms - a filename extension by itself and functions with test +values inside parenthesis. The following functions are available: +
+
match("pattern") +
+
+
Pattern match on filename +
+
ascii(offset,length) +
+
+
True if bytes are valid printable ASCII (CR, NL, TAB, BS, 32-126) +
+
printable(offset,length) +
+
+
True if bytes are printable 8-bit chars (CR, NL, TAB, BS, 32-126, 128-254) +
+
priority(number) +
+
+
Specifies the relative priority of this MIME type. The default priority is 100. +Larger values have higher priority while smaller values have lower priority. +
+
string(offset,"string") +
+
+
True if bytes are identical to string +
+
istring(offset,"string") +
+
+
True if a case-insensitive comparison of the bytes is identical +
+
char(offset,value) +
+
+
True if byte is identical +
+
short(offset,value) +
+
+
True if 16-bit integer is identical +
+
int(offset,value) +
+
+
True if 32-bit integer is identical +
+
locale("string") +
+
+
True if current locale matches string +
+
contains(offset,range,"string") +
+
+
True if the range contains the string +
+
+

String Constants

+String constants can be specified inside quotes ("") for strings +containing whitespace and angle brackets (<>) for hexadecimal +strings. +

Type Matching And Priority

+When CUPS needs to determine the MIME type of a given file, it checks every +MIME type defined in the .types files. When two types have the same matching +rules, the type chosen will depend on the type name and priority, with higher- +priority types being used over lower-priority ones. If the types have the same +priority, the type names are sorted alphanumerically in ascending order and the +first type is chosen. +

For example, if two types "text/bar" and "text/foo" are defined as matching the +extension "doc", normally the type "text/bar" will be chosen since its name is +alphanumerically smaller than "text/foo". However, if "text/foo" also defines a +higher priority than "text/bar", "text/foo" will be chosen instead. +

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), +mime.convs(5), printers.conf(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html new file mode 100644 index 000000000..fc9ae8283 --- /dev/null +++ b/doc/help/man-notifier.html @@ -0,0 +1,173 @@ + + + + + + notifier(7) + + +

notifier(7)

+

Name

+notifier - cups notification interface +

Synopsis

+notifier +recipient +[ +user-data +] +

Description

+The CUPS notifier interface provides a standard method for adding support for +new event notification methods to CUPS. Each notifier delivers one or more IPP +events from the standard input to the specified recipient. +

Notifiers must read IPP messages from the standard input using the +ippNew and ippReadFile functions and exit on error. Notifiers are encouraged to +exit after a suitable period of inactivity, however they may exit after reading +the first message or stay running until an error is seen. +

Log Messages

+Messages sent to stderr are generally logged to the current ErrorLog. +Each line begins with a standard prefix: + +
+
ALERT: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "alert" log level. + +
+
CRIT: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "critical" log level. + +
+
DEBUG: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "debug" log level. + +
+
DEBUG2: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "debug2" log level. + +
+
EMERG: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "emergency" log level. + +
+
ERROR: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "error" log level. + +
+
INFO: message +
+
+
Sets the printer-state-message attribute. If the current LogLevel +is set to "debug2", also adds the specified message to the +current ErrorLog using the "info" log level. + +
+
NOTICE: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "notice" log level. + +
+
WARNING: message +
+
+
Sets the printer-state-message attribute and adds the specified +message to the current ErrorLog using the "warning" log level. + +
+
+

Environment Variables

+The following environment variables are defined by the CUPS server when +executing the notifier: + +
+
CHARSET +
+
+
The default text character set, typically utf-8. + +
+
CUPS_CACHEDIR +
+
+
The directory for semi-persistent cache files can be found. + +
+
CUPS_DATADIR +
+
+
The directory where data files can be found. + +
+
CUPS_FILETYPE +
+
+
The type of file being printed: "job-sheet" for a banner page and "document" +for a regular print file. + +
+
CUPS_SERVERROOT +
+
+
The root directory of the server. + +
+
LANG +
+
+
The default language locale (typically C or en). + +
+
PATH +
+
+
The standard execution path for external programs that may be run by +the filter. + +
+
SOFTWARE +
+
+
The name and version number of the server (typically CUPS/1.2). + +
+
TZ +
+
+
The timezone of the server. + +
+
USER +
+
+
The user executing the filter, typically "lp"; consult the cupsd.conf(5) +file for the current setting. + +
+
+

See Also

+backend(7), cupsd(8), filter(7), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html new file mode 100644 index 000000000..15445954d --- /dev/null +++ b/doc/help/man-ppdc.html @@ -0,0 +1,65 @@ + + + + + + ppdc(1) + + +

ppdc(1)

+

Name

+ppdc - cups ppd compiler +

Synopsis

+ppdc +[ -D +name[=value] +] [ -I +include-directory +] [ -c +message-catalog +] [ -d +output-directory +] [ -l +language(s) +] [-m] [-t] [ -v ] [ -z ] [ --cr ] [ --crlf ] [ --lf ] +source-file +

Description

+ppdc compiles PPDC source files into one or more PPD +files. This program is deprecated and will be removed in a future release of +CUPS. +

The -D option sets the named variable for use in the +source file. It is equivalent to using the #define directive +in the source file. +

The -I option specifies an alternate include directory; +multiple -I options can be supplied to add additional +directories. +

The -c option specifies a single message catalog file in GNU +gettext source format (filename.po) to be used for localization. +

The -d option specifies the output directory for PPD +files. The default output directory is "ppd". +

The -l option specifies one or more languages to use when +localizing the PPD file(s). The default language is "en" +(English). Separate multiple languages with commas, for example +"de_DE,en_UK,es_ES,es_MX,es_US,fr_CA,fr_FR,it_IT" will create PPD +files with German, UK English, Spanish (Spain, Mexico, and US), +French (France and Canada), and Italian languages in each file. +

The -m option specifies that the output filename should be +based on the ModelName value instead of FileName or PCFilenName. +

The -t option specifies that PPD files should be tested instead +of generated. +

The -v option provides more verbose output, basically a +running status of which files are being loaded or written. +

The -z option generates compressed PPD files (filename.ppd.gz). +The default is to generate uncompressed PPD files. +

The --cr, --crlf, and --lf options specify the +line ending to use - carriage return, carriage return and line feed, +or line feed. The default is to use the line feed character alone. +

See Also

+ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html new file mode 100644 index 000000000..f412bec05 --- /dev/null +++ b/doc/help/man-ppdcfile.html @@ -0,0 +1,226 @@ + + + + + + ppdcfile(5) + + +

ppdcfile(5)

+

Name

+ppdcfile - cups ppd compiler source file format +

Description

+The CUPS PPD compiler reads meta files that contain descriptions +of one or more PPD files to be generated by ppdc. This man +page provides a quick reference to the supported keywords and +should be used in conjunction with the online help for CUPS. +

The source file format is plain ASCII text that can be edited +using your favorite text editor. Comments are supported using +the C (/* ... */) and C++ (// ...) comment mechanisms. +

Printer driver information can be grouped and shared using +curly braces ({ ... }); PPD files are written when a close +brace or end-of-file is seen and a PCFileName directive has been +defined. +

Directives may be placed anywhere on a line and are followed by +one or more values. The following is a list of the available +directives and the values they accept: +

+
#define name value +
+
+
#elif {name | value} +
+
+
#else +
+
+
#endif +
+
+
#font name encoding "version" charset status +
+
+
#if {name | value} +
+
+
#include <filename> +
+
+
#include "filename" +
+
+
#media name width length +
+
+
#media "name/text" width length +
+
+
#po locale "filename.po" +
+
+
Attribute name "" value +
+
+
Attribute name keyword value +
+
+
Attribute name "keyword/text" value +
+
+
Choice name "code" +
+
+
Choice "name/text" "code" +
+
+
ColorDevice boolean-value +
+
+
ColorModel name colorspace colororder compression +
+
+
ColorModel "name/text" colorspace colororder compression +
+
+
ColorProfile resolution/mediatype gamma density matrix +
+
+
Copyright "text" +
+
+
CustomMedia name width length left bottom right top "size-code" "region-code" +
+
+
CustomMedia "name/text" width length left bottom right top "size-code" "region-code" +
+
+
Cutter boolean-value +
+
+
Darkness temperature name +
+
+
Darkness temperature "name/text" +
+
+
DriverType type +
+
+
Duplex type +
+
+
Filter mime-type cost program +
+
+
Finishing name +
+
+
Finishing "name/text" +
+
+
Font * +
+
+
Font name encoding "version" charset status +
+
+
Group name +
+
+
Group "name/text" +
+
+
HWMargins left bottom right top +
+
+
InputSlot position name +
+
+
InputSlot position "name/text" +
+
+
Installable name +
+
+
Installable "name/text" +
+
+
LocAttribute name "keyword/text" value +
+
+
ManualCopies boolean-value +
+
+
Manufacturer "name" +
+
+
MaxSize width length +
+
+
MediaSize name +
+
+
MediaType type name +
+
+
MediaType type "name/text" +
+
+
MinSize width length +
+
+
ModelName "name" +
+
+
ModelNumber number +
+
+
Option name type section order +
+
+
Option "name/text" type section order +
+
+
PCFileName "filename.ppd" +
+
+
Resolution colorspace bits-per-color row-count row-feed row-step name +
+
+
Resolution colorspace bits-per-color row-count row-feed row-step "name/text" +
+
+
SimpleColorProfile resolution/mediatype density yellow-density red-density gamma red-adjust green-adjust blue-adjust +
+
+
Throughput pages-per-minute +
+
+
UIConstraints "*Option1 *Option2" +
+
+
UIConstraints "*Option1 Choice1 *Option2" +
+
+
UIConstraints "*Option1 *Option2 Choice2" +
+
+
UIConstraints "*Option1 Choice1 *Option2 Choice2" +
+
+
VariablePaperSize boolean-value +
+
+
Version number +
+
+
+

See Also

+ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html new file mode 100644 index 000000000..460f6ae6d --- /dev/null +++ b/doc/help/man-ppdhtml.html @@ -0,0 +1,38 @@ + + + + + + ppdhtml(1) + + +

ppdhtml(1)

+

Name

+ppdhtml - cups html summary generator +

Synopsis

+ppdhtml +[ -D +name[=value] +] [ -I +include-directory +] +source-file +

Description

+ppdhtml reads a driver information file and produces a +HTML summary page that lists all of the drivers in a file and +the supported options. +

The -D option sets the named variable for use in the +source file. It is equivalent to using the #define directive +in the source file. +

The -I option specifies an alternate include directory; +multiple -I options can be supplied to add additional +directories. +

See Also

+ppdc(1), ppdcfile(5), ppdi(1), ppdmerge(1), ppdpo(1) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html new file mode 100644 index 000000000..725617754 --- /dev/null +++ b/doc/help/man-ppdi.html @@ -0,0 +1,39 @@ + + + + + + ppdi(1) + + +

ppdi(1)

+

Name

+ppdi - import ppd files +

Synopsis

+ppdi +[ -I +include-directory +] [ -o +source-file +] +ppd-file +[ +ppd-file2 ... ppd-fileN +] +

Description

+ppdi imports one or more PPD files into a PPD compiler source file. +Multiple languages of the same PPD file are merged into a single printer +definition to facilitate accurate changes for all localizations. +

The -o option specifies the PPD source file to update. If the source +file does not exist, a new source file is created. Otherwise the existing +file is merged with the new PPD file(s) on the command-line. If no source +file is specified, the filename "ppdi.drv" is used. +

See Also

+ppdc(1), ppdhtml(1), ppdmerge(1), ppdpo(1), ppdcfile(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html new file mode 100644 index 000000000..fbf7f049e --- /dev/null +++ b/doc/help/man-ppdmerge.html @@ -0,0 +1,40 @@ + + + + + + ppdmerge(1) + + +

ppdmerge(1)

+

Name

+ppdmerge - merge ppd files +

Synopsis

+ppdmerge +[ -o +output-ppd-file +] +ppd-file +ppd-file2 +[ +... ppd-fileN +] +

Description

+ppdmerge merges two or more PPD files into a single, multi-language +PPD file. +

The -o option specifies the PPD file to create. If not specified, +the merged PPD file is written to the standard output. If the output file +already exists, the new +

Notes

+ppdmerge does not check whether the merged PPD files are for the +same device. Merging of different device PPDs will yield unpredictable +results. +

See Also

+cupsprofile(1), ppdc(1), ppdhtml(1), ppdi(1), ppdpo(1), ppdcfile(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html new file mode 100644 index 000000000..66ee0b6fc --- /dev/null +++ b/doc/help/man-ppdpo.html @@ -0,0 +1,43 @@ + + + + + + ppdpo(1) + + +

ppdpo(1)

+

Name

+ppdpo - ppd message catalog generator +

Synopsis

+ppdpo +[ -D +name[=value] +] [ -I +include-directory +] [ -o +output-file +] +source-file +

Description

+ppdpo extracts UI strings from PPDC source files and updates either +a GNU gettext or OS X strings format message catalog source file for +translation. +

The -D option sets the named variable for use in the +source file. It is equivalent to using the #define directive +in the source file. +

The -I option specifies an alternate include directory; +multiple -I options can be supplied to add additional +directories. +

The -o option specifies the output file. The supported extensions are +".po" or ".po.gz" for GNU gettext format message catalogs and ".strings" for +OS X strings files. +

See Also

+ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdcfile(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html new file mode 100644 index 000000000..958e4026f --- /dev/null +++ b/doc/help/man-printers.conf.html @@ -0,0 +1,144 @@ + + + + + + printers.conf(5) + + +

printers.conf(5)

+

Name

+printers.conf - printer configuration file for cups +

Description

+The printers.conf file defines the local printers that are +available. It is normally located in the /etc/cups directory and +is generated automatically by the cupsd(8) program when printers +are added or deleted. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +

Directives

+
+
<Printer name> ... </Printer> +
+
+
Defines a specific printer. +
+
<DefaultPrinter name> ... </Printer> +
+
+
Defines a default printer. +
+
Accepting Yes +
+
+
Accepting No +
+
+
Specifies whether the printer is accepting new jobs. +
+
AllowUser [ user @group ... ] +
+
+
Allows specific users and groups to print to the printer. +
+
DenyUser [ user @group ... ] +
+
+
Prevents specific users and groups from printing to the printer. +
+
DeviceURI uri +
+
+
Specifies the device URI for a printer. +
+
ErrorPolicy abort-job +
+
+
ErrorPolicy retry-current-job +
+
+
ErrorPolicy retry-job +
+
+
ErrorPolicy stop-printer +
+
+
Specifies the error policy for the printer. +
+
Info text +
+
+
Specifies human-readable text describing the printer. +
+
JobSheets banner banner +
+
+
Specifies the banner pages to use for the printer. +
+
KLimit number +
+
+
Specifies the job-k-limit value for the printer. +
+
Location text +
+
+
Specifies human-readable text describing the location of the printer. +
+
OpPolicy name +
+
+
Specifies the operation policy for the printer. +
+
PageLimit number +
+
+
Specifies the job-page-limit value for the printer. +
+
PortMonitor monitor +
+
+
Specifies the port monitor for a printer. +
+
QuotaPeriod seconds +
+
+
Specifies the job-quota-period value for the printer. +
+
Shared Yes +
+
+
Shared No +
+
+
Specifies whether the printer is shared. +
+
State idle +
+
+
State stopped +
+
+
Specifies the initial state of the printer (Idle or Stopped) +
+
StateMessage text +
+
+
Specifies the message associated with the state. +
+
StateTime seconds +
+
+
Specifies the date/time associated with the state. +
+
+

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), +mime.convs(5), mime.types(5), +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html new file mode 100644 index 000000000..94afd211d --- /dev/null +++ b/doc/help/man-subscriptions.conf.html @@ -0,0 +1,96 @@ + + + + + + subscriptions.conf(5) + + +

subscriptions.conf(5)

+

Name

+subscriptions.conf - subscriptions file for cups +

Description

+The subscriptions.conf file defines the local subscriptions +that are active. It is normally located in the /etc/cups +directory and is generated automatically by the cupsd(8) +program when subscriptions are created, renewed, or cancelled. +

Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +

Directives

+
+
<Subscription NNN> ... </Subscription> +
+
+
Defines a subscription. +
+
Events name [ ... name ] +
+
+
Specifies the events that are subscribed. +
+
ExpirationTime unix-time +
+
+
Specifies the expiration time of a subscription as a UNIX time +value in seconds since January 1st, 1970. +
+
Interval seconds +
+
+
Specifies the preferred time interval for event notifications in +seconds. +
+
JobId job-id +
+
+
Specifies the job ID associated with the subscription. +
+
LeaseDuration seconds +
+
+
Specifies the number of seconds that the subscription is valid +for. If 0, the subscription does not expire. +
+
NextEventId number +
+
+
Specifies the next notify-sequence-number to use for the +subscription. +
+
NextSubscriptionId number +
+
+
Specifies the next subscription-id to use. +
+
Owner username +
+
+
Specifies the user that owns the subscription. +
+
PrinterName printername +
+
+
Specifies the printer or class associated with the subscription. +
+
Recipient uri +
+
+
Specifies the notify-recipient-uri value for push-type notifications. +
+
UserData hex-escaped-data +
+
+
Specifies user data to be included in event notifications. This +is typically the "from" address in mailto: notifications. +
+
+

See Also

+classes.conf(5), cupsd(8), cupsd.conf(5), +mime.convs(5), mime.types(5), printers.conf(5) +
+http://localhost:631/help +

Copyright

+Copyright 2007-2013 by Apple Inc. + + + diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 4ff0a7ed6..1e5116923 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -135,7 +135,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /etc/cups %config(noreplace) /etc/cups/*.conf -/etc/cups/cups-files.conf.default /etc/cups/cupsd.conf.default %dir /etc/cups/interfaces %dir /etc/cups/ppd @@ -246,17 +245,29 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/doc/cups/ca /usr/share/doc/cups/ca/* +%dir /usr/share/doc/cups/cs +/usr/share/doc/cups/cs/* %dir /usr/share/doc/cups/es /usr/share/doc/cups/es/* +%dir /usr/share/doc/cups/fr +/usr/share/doc/cups/fr/* %dir /usr/share/doc/cups/ja /usr/share/doc/cups/ja/* +%dir /usr/share/doc/cups/ru +/usr/share/doc/cups/ru/* %dir /usr/share/locale/ca /usr/share/locale/ca/cups_ca.po +%dir /usr/share/locale/cs +/usr/share/locale/cs/cups_cs.po %dir /usr/share/locale/es /usr/share/locale/es/cups_es.po +%dir /usr/share/locale/fr +/usr/share/locale/fr/cups_fr.po %dir /usr/share/locale/ja /usr/share/locale/ja/cups_ja.po +%dir /usr/share/locale/ru +/usr/share/locale/ru/cups_ru.po %dir /usr/share/man/man1 /usr/share/man/man1/cancel.1.gz diff --git a/scheduler/client.c b/scheduler/client.c index 6cd00fc34..141079fab 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -2874,9 +2874,30 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */ if (con->response && con->response->state != IPP_DATA) { - ipp_state = ippWrite(HTTP(con), con->response); - bytes = ipp_state != IPP_ERROR && - (con->file >= 0 || ipp_state != IPP_DATA); + int wused = con->http.wused; /* Previous write buffer use */ + + do + { + /* + * Write a single attribute or the IPP message header... + */ + + ipp_state = ippWrite(HTTP(con), con->response); + + /* + * If the write buffer has been flushed, stop buffering up attributes... + */ + + if (con->http.wused <= wused) + break; + } + while (ipp_state != IPP_STATE_DATA && ipp_state != IPP_STATE_ERROR); + + if (con->http.wused > 0) + httpFlushWrite(HTTP(con)); + + bytes = ipp_state != IPP_STATE_ERROR && + (con->file >= 0 || ipp_state != IPP_STATE_DATA); } else if ((bytes = read(con->file, con->header + con->header_used, sizeof(con->header) - con->header_used)) > 0) diff --git a/scheduler/colorman.c b/scheduler/colorman.c index a5838503d..8aa5913f9 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -40,6 +40,25 @@ * * Contents: * + * cupsdRegisterColor() - Register vendor color profiles in a PPD + * file. + * cupsdStartColor() - Initialize color management. + * cupsdStopColor() - Shutdown color management. + * cupsdUnregisterColor() - Unregister vendor color profiles in a PPD + * file. + * apple_init_profile() - Initialize a color profile. + * apple_register_profiles() - Register color profiles for a printer. + * apple_unregister_profiles() - Remove color profiles for the specified + * printer. + * colord_create_device() - Create a device and register profiles. + * colord_create_profile() - Create a color profile for a printer. + * colord_delete_device() - Delete a device + * colord_device_add_profile() - Assign a profile to a device. + * colord_dict_add_strings() - Add two strings to a dictionary. + * colord_find_device() - Finds a device + * colord_get_qualifier_format() - Get the qualifier format. + * colord_register_printer() - Register profiles for a printer. + * colord_unregister_printer() - Unregister profiles for a printer. */ /* @@ -307,7 +326,7 @@ apple_init_profile( * Fill in the profile data... */ - if (iccfile) + if (iccfile && *iccfile) { url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)iccfile, @@ -497,7 +516,7 @@ apple_register_profiles( if (_cupsFileCheck(iccfile, _CUPS_FILE_CHECK_FILE, !RunUser, cupsdLogFCMessage, p)) - continue; + iccfile[0] = '\0'; cupsArraySave(ppd->sorted_attrs); diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 4cd065d96..3c18f01ab 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -9043,7 +9043,7 @@ save_auth_info( fchown(cupsFileNumber(fp), 0, 0); fchmod(cupsFileNumber(fp), 0400); - cupsFilePuts(fp, "CUPSD-AUTH-V2\n"); + cupsFilePuts(fp, "CUPSD-AUTH-V3\n"); for (i = 0; i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); @@ -9061,9 +9061,15 @@ save_auth_info( i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); i ++) { - httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text, - strlen(auth_info->values[i].string.text)); - cupsFilePutConf(fp, dest->auth_info_required[i], line); + if (strcmp(dest->auth_info_required[i], "negotiate")) + { + httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text, + strlen(auth_info->values[i].string.text)); + cupsFilePutConf(fp, dest->auth_info_required[i], line); + } + else + cupsFilePutConf(fp, dest->auth_info_required[i], + auth_info->values[i].string.text); if (!strcmp(dest->auth_info_required[i], "username")) cupsdSetStringf(job->auth_env + i, "AUTH_USERNAME=%s", diff --git a/scheduler/job.c b/scheduler/job.c index a2ef65f71..021d78f31 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1956,7 +1956,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ if (cupsFileGets(fp, line, sizeof(line)) && - !strcmp(line, "CUPSD-AUTH-V2")) + !strcmp(line, "CUPSD-AUTH-V3")) { i = 0; while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) @@ -1965,8 +1965,11 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ * Decode value... */ - bytes = sizeof(data); - httpDecode64_2(data, &bytes, value); + if (strcmp(line, "negotiate") && strcmp(line, "uid")) + { + bytes = sizeof(data); + httpDecode64_2(data, &bytes, value); + } /* * Assign environment variables... @@ -1987,7 +1990,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ else if (!strcmp(line, "password")) cupsdSetStringf(job->auth_env + i, "AUTH_PASSWORD=%s", data); else if (!strcmp(line, "negotiate")) - cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", data); + cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", value); else continue; diff --git a/scheduler/main.c b/scheduler/main.c index c68a0a666..a10025435 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -1285,7 +1285,7 @@ cupsdSetStringf(char **s, /* O - New string */ const char *f, /* I - Printf-style format string */ ...) /* I - Additional args as needed */ { - char v[4096]; /* Formatting string value */ + char v[65536 + 64]; /* Formatting string value */ va_list ap; /* Argument pointer */ char *olds; /* Old string */ diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 9973417c1..d266ffde5 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -3215,7 +3215,7 @@ check_sizes(ppd_file_t *ppd, /* I - PPD file */ length_2540ths = (size->length > size->width) ? PWG_FROM_POINTS(size->length) : PWG_FROM_POINTS(size->width); - pwg_media = _pwgMediaForSize(width_2540ths, length_2540ths); + pwg_media = pwgMediaForSize(width_2540ths, length_2540ths); if (pwg_media && (fabs(pwg_media->width - width_2540ths) > 34 || diff --git a/test/Makefile b/test/Makefile index 66b535378..74d7a5db8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ # # IPP test makefile for CUPS. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 1997-2006 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -42,6 +42,7 @@ TESTFILES = \ get-jobs.test \ get-notifications.test \ get-printer-attributes.test \ + get-subscriptions.test \ ipp-1.1.test \ ipp-2.0.test \ ipp-2.1.test \ diff --git a/test/create-job-format.test b/test/create-job-format.test index 87d94a5b6..60769a037 100644 --- a/test/create-job-format.test +++ b/test/create-job-format.test @@ -21,8 +21,8 @@ ATTR integer copies 1 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -51,6 +51,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/create-job-sheets.test b/test/create-job-sheets.test index d15bb7d4b..08861863b 100644 --- a/test/create-job-sheets.test +++ b/test/create-job-sheets.test @@ -21,8 +21,8 @@ ATTR name job-sheets standard # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -50,6 +50,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-devices.test b/test/get-devices.test index 76bb5ec76..c31a1b129 100644 --- a/test/get-devices.test +++ b/test/get-devices.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-job-attributes.test b/test/get-job-attributes.test index ba62bd7f3..c40e242ce 100644 --- a/test/get-job-attributes.test +++ b/test/get-job-attributes.test @@ -18,8 +18,8 @@ # ATTR keyword requested-attributes job-media-sheets-completed,job-state # What statuses are OK? - #STATUS ok - #STATUS ok-subst + #STATUS successful-ok + #STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-job-attributes2.test b/test/get-job-attributes2.test index 6a8673f88..d0891b56b 100644 --- a/test/get-job-attributes2.test +++ b/test/get-job-attributes2.test @@ -16,8 +16,8 @@ ATTR uri job-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-ppds-drv-only.test b/test/get-ppds-drv-only.test index ccb1828d0..e5c6de78f 100644 --- a/test/get-ppds-drv-only.test +++ b/test/get-ppds-drv-only.test @@ -17,8 +17,8 @@ ATTR name include-schemes drv # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes EXPECT ppd-name } diff --git a/test/get-ppds.test b/test/get-ppds.test index 90f59eb6e..a82daf89e 100644 --- a/test/get-ppds.test +++ b/test/get-ppds.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-subscriptions.test b/test/get-subscriptions.test index 686059dfa..09766ffda 100644 --- a/test/get-subscriptions.test +++ b/test/get-subscriptions.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/set-attrs-hold.test b/test/set-attrs-hold.test index 377819ae4..213bdd2e2 100644 --- a/test/set-attrs-hold.test +++ b/test/set-attrs-hold.test @@ -17,8 +17,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -45,8 +45,8 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -71,8 +71,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -101,8 +101,8 @@ ATTR name job-hold-until 00:30:00 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -123,8 +123,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -149,8 +149,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -171,8 +171,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state diff --git a/tools/makeipptoolpkg b/tools/makeipptoolpkg index 34926fa9a..df0b1d8c2 100644 --- a/tools/makeipptoolpkg +++ b/tools/makeipptoolpkg @@ -58,7 +58,9 @@ cp test/create-printer-subscription.test $pkgdir cp test/document-*.pdf $pkgdir cp test/document-*.ps $pkgdir cp test/get-completed-jobs.test test/get-jobs.test $pkgdir +cp test/get-notifications.test $pkgdir cp test/get-printer-attributes.test $pkgdir +cp test/get-subscriptions.test $pkgdir cp test/gray.jpg $pkgdir cp test/ipp-[12].*.test $pkgdir cp test/ipp-everywhere.test $pkgdir @@ -69,6 +71,7 @@ cp test/print-job.test $pkgdir cp test/print-job-deflate.test $pkgdir cp test/print-job-gzip.test $pkgdir cp test/testfile.* $pkgdir +cp test/validate-job.test $pkgdir if test `uname` = Darwin; then pkgfile="$pkgdir-macosx-universal.dmg" diff --git a/vcnet/README.txt b/vcnet/README.txt new file mode 100644 index 000000000..4637da3fb --- /dev/null +++ b/vcnet/README.txt @@ -0,0 +1,27 @@ +README - CUPS v1.7b1 - 2013-04-18 +--------------------------------- + +INTRODUCTION + + This package includes the cupstestppd and ipptool utilities, CUPS API + libraries libcups2.dll and libcupsimage2.dll, and the import libraries and + headers needed to develop Windows applications that use the CUPS API to + communicate with CUPS and other IPP services. + + See the file "IPPTOOL.txt" for instructions on using the ipptool utility. + + +LEGAL STUFF + + CUPS is Copyright 2007-2013 by Apple Inc. CUPS and the CUPS logo are + trademarks of Apple Inc. + + The MD5 Digest code is Copyright 1999 Aladdin Enterprises. + + This software is based in part on the work of the Independent JPEG Group. + + CUPS is provided under the terms of version 2 of the GNU General Public + License and GNU Library General Public License. This program is distributed + in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the "doc/help/license.html" or "LICENSE.txt" files for more information. diff --git a/vcnet/cups.sln b/vcnet/cups.sln index 5fede836a..2e674a6f6 100644 --- a/vcnet/cups.sln +++ b/vcnet/cups.sln @@ -36,7 +36,7 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "ipptoo EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", "{18950A1B-D37A-40C7-B2DF-C12986C0526E}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ipptool-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "libcups2-installer", "libcups2-installer.vdproj", "{03CF67C2-3FF5-44EA-B3AF-FB62D3BED961}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -104,7 +104,8 @@ Global {6AEA263B-92C0-426F-B5FF-F7F5917B704A}.Release|x64.Build.0 = Release {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.ActiveCfg = Debug|Win32 {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|Win32.Build.0 = Debug|Win32 - {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Debug|Win32 + {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.ActiveCfg = Release|x64 + {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Debug|x64.Build.0 = Release|x64 {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.ActiveCfg = Release|Win32 {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|Win32.Build.0 = Release|Win32 {18950A1B-D37A-40C7-B2DF-C12986C0526E}.Release|x64.ActiveCfg = Release|Win32 diff --git a/vcnet/ipptool-installer.vdproj b/vcnet/ipptool-installer.vdproj index 45f9084a2..9ea8f3966 100644 --- a/vcnet/ipptool-installer.vdproj +++ b/vcnet/ipptool-installer.vdproj @@ -27,12 +27,6 @@ } "Entry" { - "MsmKey" = "8:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE" - "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_1E4B2A9BD6A44926B719E0D7E8FC0952" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -81,6 +75,12 @@ } "Entry" { + "MsmKey" = "8:_604E80B396974DD68D1F4A11BB022F79" + "OwnerKey" = "8:_8B9B4769224046F5B6D692BA9E6FFBDD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_65CBD149C9DA448FBACE2B02766A6537" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -111,6 +111,12 @@ } "Entry" { + "MsmKey" = "8:_8B9B4769224046F5B6D692BA9E6FFBDD" + "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_8CC3562BCDED4676A672115D19D898B5" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -135,8 +141,14 @@ } "Entry" { - "MsmKey" = "8:_AB0BD66B57BF4C41BE53BCE573C254BC" - "OwnerKey" = "8:_F208E348BAE54EDEA200755E5C149F13" + "MsmKey" = "8:_A63C5C4108AB4B588878482B26876DC5" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A9CCE21DCF004D869F157B0065B32AA7" + "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -177,6 +189,12 @@ } "Entry" { + "MsmKey" = "8:_D20F7E9FAB8B4CF38D740C5E5655CC3E" + "OwnerKey" = "8:_A9CCE21DCF004D869F157B0065B32AA7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D4BEA026ABFB46DD960AD8EFCAE45E31" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -255,24 +273,6 @@ } "Entry" { - "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" - "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" - "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F208E348BAE54EDEA200755E5C149F13" - "OwnerKey" = "8:_E97571D3FBE048DABDC59B37762D800F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F22F5380A6E14A43A15A452C7C6F6C07" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -414,26 +414,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DBDCFABB8DF28E5F75E41EDAE4BF6BE" - { - "SourcePath" = "8:zlibwapi.dll" - "TargetName" = "8:zlibwapi.dll" - "Tag" = "8:" - "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1E4B2A9BD6A44926B719E0D7E8FC0952" { "SourcePath" = "8:..\\test\\get-printer-attributes.test" @@ -750,7 +730,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -770,10 +750,30 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A63C5C4108AB4B588878482B26876DC5" + { + "SourcePath" = "8:..\\test\\validate-job.test" + "TargetName" = "8:validate-job.test" + "Tag" = "8:" + "Folder" = "8:_EB00D0298C7E441EBD0257AC04FB3560" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF057921D20E4520A3C6420F0729A744" { "SourcePath" = "8:..\\IPPTOOL.txt" @@ -1192,14 +1192,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ipptool for Windows" - "ProductCode" = "8:{BADD3454-4180-4519-B1CA-5C255DAB0047}" - "PackageCode" = "8:{3C801C7B-F294-47ED-9146-D35C6B48C3B9}" + "ProductCode" = "8:{75CFE2B5-5105-4D7A-87CA-5D919126F3DA}" + "PackageCode" = "8:{85757D89-5057-4EE1-9852-763E1EEF2FC8}" "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:13.01.3100" + "ProductVersion" = "8:13.04.1800" "Manufacturer" = "8:Apple Inc." "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.cups.org/str.php" @@ -1758,11 +1758,39 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AB0BD66B57BF4C41BE53BCE573C254BC" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_604E80B396974DD68D1F4A11BB022F79" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8B9B4769224046F5B6D692BA9E6FFBDD" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A9CCE21DCF004D869F157B0065B32AA7" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm" "Properties" { } @@ -1772,11 +1800,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_F208E348BAE54EDEA200755E5C149F13" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_D20F7E9FAB8B4CF38D740C5E5655CC3E" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" + "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm" "Properties" { } @@ -1791,7 +1819,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8" { - "SourcePath" = "8:Win32\\Debug\\regex.dll" + "SourcePath" = "8:x64\\Release\\regex.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" @@ -1819,7 +1847,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E97571D3FBE048DABDC59B37762D800F" { - "SourcePath" = "8:Win32\\Debug\\ipptool.exe" + "SourcePath" = "8:x64\\Debug\\ipptool.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" @@ -1847,7 +1875,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A" { - "SourcePath" = "8:Win32\\Debug\\libcups2.dll" + "SourcePath" = "8:x64\\Debug\\libcups2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" diff --git a/vcnet/libcups2-installer.vdproj b/vcnet/libcups2-installer.vdproj index 75d6dd8cf..bae6a4c82 100644 --- a/vcnet/libcups2-installer.vdproj +++ b/vcnet/libcups2-installer.vdproj @@ -45,14 +45,20 @@ } "Entry" { - "MsmKey" = "8:_1AF767BD52F94DC08C2CBE11DA41E95A" + "MsmKey" = "8:_16CCCC95D1BE41A981EAA4CDAD772F32" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1859B81745C54E228CDCA94F130C8150" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1DFD9AECD1AD4B2291DD52028E866569" - "OwnerKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" + "MsmKey" = "8:_1AF767BD52F94DC08C2CBE11DA41E95A" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -69,12 +75,24 @@ } "Entry" { + "MsmKey" = "8:_232E0EB837A04A5B90312D947F1A7905" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_24E7DBA1F5964574A8251258BCDC935D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_253C714B01974C9BB1A698DD449F588D" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_260594D75E4B4764BBAFE25C15E4F273" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -93,6 +111,30 @@ } "Entry" { + "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E" + "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E" + "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2B4CDFC508564D57A5C27766923D822E" + "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2F26FF10F81046A9A863995A1D5F449E" + "OwnerKey" = "8:_B77819C33E084E13AC78EAF9234C67E1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_340E6094BE6F4BCF8350280DC8B37900" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -117,56 +159,92 @@ } "Entry" { + "MsmKey" = "8:_3CBB55F3EBEA4645BE6CEC8A0F251B80" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_3CFC5A9B09ED4916A350B88FEF4662CC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_3CFD2A1A9D824E2491CC2BAC1334BA13" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3F5E38826D0C441897F43747FFA7491A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_4879AF80C19D4ED9A3758DCC412190FB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_574EE5A852D3434987B58E3B8118C1C2" + "MsmKey" = "8:_4A46F690254944ECBF1539E2C2F86A59" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF" + "MsmKey" = "8:_51381771E03E40DEA842E785C9B7A31B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" - "OwnerKey" = "8:_0299839A2CCC4F908C5D3A8F465F3FFE" + "MsmKey" = "8:_52B5F2EDEDEC48B5A1188F780C67DE9B" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_574EE5A852D3434987B58E3B8118C1C2" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" - "OwnerKey" = "8:_B20638175CCB42398417E0683A12469C" + "MsmKey" = "8:_5BBA58EFC5A9495BBEF1752E15F4A077" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" - "OwnerKey" = "8:_364DCCAFF25145BCBE75FFEEDCC75B3A" + "MsmKey" = "8:_5ED87BAE980C4992A4C74AEAEC4A57CF" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" + "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6" "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_62CA00B1E5E4460CA93EE7E2B8FE878B" - "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" + "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6" + "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6" + "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_64CCFE4D849E75157BBA3DD0A981DEE6" + "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -177,6 +255,12 @@ } "Entry" { + "MsmKey" = "8:_666BC59DB1514D61AE06860A2894BE4C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6BD69E32EE9A4D2B9ECC40558A68FCD8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -189,6 +273,12 @@ } "Entry" { + "MsmKey" = "8:_7014E39650EC41979A77C81B8C8636C5" + "OwnerKey" = "8:_2B4CDFC508564D57A5C27766923D822E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_72A7EBE64092496AA67AB2DD00C0804B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -201,38 +291,74 @@ } "Entry" { - "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4" + "MsmKey" = "8:_7A478A9B37C44B22BD4F926913C9A5B7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A" + "OwnerKey" = "8:_D3197C67CBAC46DE854CF283CDBC677E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443" + "MsmKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A" + "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7FC58520B0F44E3E95A207905CABFED4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9967519E7058965D4C7DEF47EB39CC50" + "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030" "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA" + "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030" + "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030" + "OwnerKey" = "8:_3F5E38826D0C441897F43747FFA7491A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8400394709ED174EDB995EE7D2002030" + "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_860678A628E34D219950C2E2B1BE6A89" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9FBF78D7B89EEA843380D5F10E1954D7" - "OwnerKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" + "MsmKey" = "8:_8CCA95F5402D439B9B9CAC6F0FC1A443" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_933D37C7FEBF4B8AAF9E6CE01A605039" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_9D69B0FC2413407BA24D88B73EF456AA" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -255,12 +381,60 @@ } "Entry" { + "MsmKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300" + "OwnerKey" = "8:_BAEADCCB6AD74F36AE08401229354D79" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B20638175CCB42398417E0683A12469C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_B38E399C93724A9BB5F429DABBA6301F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1" + "OwnerKey" = "8:_C17DC336766E4B1BBC8DD24D686C440A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B77819C33E084E13AC78EAF9234C67E1" + "OwnerKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B820F65C4D844938881581933D156B34" + "OwnerKey" = "8:_B1520DB5B1CE4CA392FF0EB614535300" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BAEADCCB6AD74F36AE08401229354D79" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_BF7DFB3EEB1A6396025E468768AC5AB1" + "OwnerKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C17DC336766E4B1BBC8DD24D686C440A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_C1FCE2FAE4714A719B7B430E2BE93CBB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -291,12 +465,24 @@ } "Entry" { + "MsmKey" = "8:_CE2A836CE5AF4404B8672B100A9FC9ED" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D02EB13951314EFD9C539150EF8E53B8" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_D3197C67CBAC46DE854CF283CDBC677E" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D3B3B266E0FC45DD9B7EEBCC3AC52965" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -327,6 +513,18 @@ } "Entry" { + "MsmKey" = "8:_E4DC6765AD3348C28401914D2B7BC71A" + "OwnerKey" = "8:_7E5E5AB3D3C0409AB04A160380C1B03A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E9925AF9A2D343D6BFE5BDAE33481292" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EA282F32A10B4ED1A81AA6133B997C6A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -351,6 +549,12 @@ } "Entry" { + "MsmKey" = "8:_F7FBD6E1C73B45EA813FB1D5E6050650" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FA604C5C4FDD4D7B8110AFC6B603FBAF" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -532,6 +736,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1859B81745C54E228CDCA94F130C8150" + { + "SourcePath" = "8:..\\test\\get-notifications.test" + "TargetName" = "8:get-notifications.test" + "Tag" = "8:" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF767BD52F94DC08C2CBE11DA41E95A" { "SourcePath" = "8:..\\doc\\images\\raster.png" @@ -577,7 +801,27 @@ "SourcePath" = "8:..\\cups\\adminutil.h" "TargetName" = "8:adminutil.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_232E0EB837A04A5B90312D947F1A7905" + { + "SourcePath" = "8:..\\doc\\help\\man-ipptool.html" + "TargetName" = "8:man-ipptool.html" + "Tag" = "8:" + "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -597,7 +841,27 @@ "SourcePath" = "8:..\\cups\\http.h" "TargetName" = "8:http.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_253C714B01974C9BB1A698DD449F588D" + { + "SourcePath" = "8:..\\test\\validate-job.test" + "TargetName" = "8:validate-job.test" + "Tag" = "8:" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -657,7 +921,7 @@ "SourcePath" = "8:..\\cups\\ipp.h" "TargetName" = "8:ipp.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -717,7 +981,7 @@ "SourcePath" = "8:Win32\\Release\\libcups2.lib" "TargetName" = "8:libcups2.lib" "Tag" = "8:" - "Folder" = "8:_2927DAE23F604CF9B8B4D1EC01A6F158" + "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -737,7 +1001,7 @@ "SourcePath" = "8:..\\cups\\transcode.h" "TargetName" = "8:transcode.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -752,12 +1016,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4879AF80C19D4ED9A3758DCC412190FB" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3CFD2A1A9D824E2491CC2BAC1334BA13" { - "SourcePath" = "8:..\\cups\\raster.h" - "TargetName" = "8:raster.h" + "SourcePath" = "8:..\\test\\get-subscriptions.test" + "TargetName" = "8:get-subscriptions.test" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -772,12 +1036,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_574EE5A852D3434987B58E3B8118C1C2" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4879AF80C19D4ED9A3758DCC412190FB" { - "SourcePath" = "8:..\\cups\\array.h" - "TargetName" = "8:array.h" + "SourcePath" = "8:..\\cups\\raster.h" + "TargetName" = "8:raster.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -792,12 +1056,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5ED87BAE980C4992A4C74AEAEC4A57CF" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4A46F690254944ECBF1539E2C2F86A59" { - "SourcePath" = "8:..\\cups\\ppd.h" - "TargetName" = "8:ppd.h" + "SourcePath" = "8:..\\doc\\help\\man-ipptoolfile.html" + "TargetName" = "8:man-ipptoolfile.html" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -812,12 +1076,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65560B58BEBF468C9D06493456A17DEC" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_51381771E03E40DEA842E785C9B7A31B" { - "SourcePath" = "8:..\\cups\\language.h" - "TargetName" = "8:language.h" + "SourcePath" = "8:..\\test\\print-job-gzip.test" + "TargetName" = "8:print-job-gzip.test" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -832,12 +1096,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6BD69E32EE9A4D2B9ECC40558A68FCD8" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_574EE5A852D3434987B58E3B8118C1C2" { - "SourcePath" = "8:Win32\\Release\\libcupsimage2.lib" - "TargetName" = "8:libcupsimage2.lib" + "SourcePath" = "8:..\\cups\\array.h" + "TargetName" = "8:array.h" "Tag" = "8:" - "Folder" = "8:_2927DAE23F604CF9B8B4D1EC01A6F158" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -852,9 +1116,129 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6E847FCD9C014B7E81FB859A0D2D2590" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5BBA58EFC5A9495BBEF1752E15F4A077" { - "SourcePath" = "8:..\\test\\ipp-2.2.test" + "SourcePath" = "8:README.txt" + "TargetName" = "8:README.txt" + "Tag" = "8:" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5ED87BAE980C4992A4C74AEAEC4A57CF" + { + "SourcePath" = "8:..\\cups\\ppd.h" + "TargetName" = "8:ppd.h" + "Tag" = "8:" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_64CCFE4D849E75157BBA3DD0A981DEE6" + { + "SourcePath" = "8:CRYPT32.dll" + "TargetName" = "8:CRYPT32.dll" + "Tag" = "8:" + "Folder" = "8:_C8D931ADC425446B916E9711B929659F" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65560B58BEBF468C9D06493456A17DEC" + { + "SourcePath" = "8:..\\cups\\language.h" + "TargetName" = "8:language.h" + "Tag" = "8:" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_666BC59DB1514D61AE06860A2894BE4C" + { + "SourcePath" = "8:..\\doc\\help\\man-cupstestppd.html" + "TargetName" = "8:man-cupstestppd.html" + "Tag" = "8:" + "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6BD69E32EE9A4D2B9ECC40558A68FCD8" + { + "SourcePath" = "8:Win32\\Release\\libcupsimage2.lib" + "TargetName" = "8:libcupsimage2.lib" + "Tag" = "8:" + "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6E847FCD9C014B7E81FB859A0D2D2590" + { + "SourcePath" = "8:..\\test\\ipp-2.2.test" "TargetName" = "8:ipp-2.2.test" "Tag" = "8:" "Folder" = "8:_9DFBB4777E594B0F8884792467931241" @@ -877,7 +1261,7 @@ "SourcePath" = "8:..\\cups\\versioning.h" "TargetName" = "8:versioning.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -897,7 +1281,27 @@ "SourcePath" = "8:..\\cups\\dir.h" "TargetName" = "8:dir.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A478A9B37C44B22BD4F926913C9A5B7" + { + "SourcePath" = "8:..\\test\\get-jobs.test" + "TargetName" = "8:get-jobs.test" + "Tag" = "8:" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -932,6 +1336,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8400394709ED174EDB995EE7D2002030" + { + "SourcePath" = "8:Secur32.dll" + "TargetName" = "8:Secur32.dll" + "Tag" = "8:" + "Folder" = "8:_C8D931ADC425446B916E9711B929659F" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_860678A628E34D219950C2E2B1BE6A89" { "SourcePath" = "8:..\\doc\\help\\api-raster.html" @@ -972,12 +1396,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9967519E7058965D4C7DEF47EB39CC50" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_933D37C7FEBF4B8AAF9E6CE01A605039" { - "SourcePath" = "8:CRYPT32.dll" - "TargetName" = "8:CRYPT32.dll" + "SourcePath" = "8:..\\test\\ipp-everywhere.test" + "TargetName" = "8:ipp-everywhere.test" "Tag" = "8:" - "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -988,8 +1412,8 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9D69B0FC2413407BA24D88B73EF456AA" @@ -1012,12 +1436,12 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9FBF78D7B89EEA843380D5F10E1954D7" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A271CCE042C14DDF8F0F1A1B16584F17" { - "SourcePath" = "8:Secur32.dll" - "TargetName" = "8:Secur32.dll" + "SourcePath" = "8:..\\doc\\help\\api-filedir.html" + "TargetName" = "8:api-filedir.html" "Tag" = "8:" - "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1028,16 +1452,16 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A271CCE042C14DDF8F0F1A1B16584F17" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A513FBE6CC6247C19AF06829E5470D01" { - "SourcePath" = "8:..\\doc\\help\\api-filedir.html" - "TargetName" = "8:api-filedir.html" + "SourcePath" = "8:..\\test\\document-a4.pdf" + "TargetName" = "8:document-a4.pdf" "Tag" = "8:" - "Folder" = "8:_24DE31CE70694FD2977B5FB38F24D77F" + "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1052,10 +1476,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A513FBE6CC6247C19AF06829E5470D01" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A833908023464B61A160E0323C8E9606" { - "SourcePath" = "8:..\\test\\document-a4.pdf" - "TargetName" = "8:document-a4.pdf" + "SourcePath" = "8:..\\test\\document-letter.pdf" + "TargetName" = "8:document-letter.pdf" "Tag" = "8:" "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" @@ -1072,10 +1496,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A833908023464B61A160E0323C8E9606" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B38E399C93724A9BB5F429DABBA6301F" { - "SourcePath" = "8:..\\test\\document-letter.pdf" - "TargetName" = "8:document-letter.pdf" + "SourcePath" = "8:..\\test\\print-job-deflate.test" + "TargetName" = "8:print-job-deflate.test" "Tag" = "8:" "Folder" = "8:_9DFBB4777E594B0F8884792467931241" "Condition" = "8:" @@ -1092,6 +1516,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF7DFB3EEB1A6396025E468768AC5AB1" + { + "SourcePath" = "8:zlibwapi.dll" + "TargetName" = "8:zlibwapi.dll" + "Tag" = "8:" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1FCE2FAE4714A719B7B430E2BE93CBB" { "SourcePath" = "8:..\\test\\testfile.ps" @@ -1192,6 +1636,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CE2A836CE5AF4404B8672B100A9FC9ED" + { + "SourcePath" = "8:..\\IPPTOOL.txt" + "TargetName" = "8:IPPTOOL.txt" + "Tag" = "8:" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D3B3B266E0FC45DD9B7EEBCC3AC52965" { "SourcePath" = "8:..\\test\\get-printer-attributes.test" @@ -1277,7 +1741,7 @@ "SourcePath" = "8:..\\cups\\cups.h" "TargetName" = "8:cups.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1317,7 +1781,7 @@ "SourcePath" = "8:..\\cups\\file.h" "TargetName" = "8:file.h" "Tag" = "8:" - "Folder" = "8:_121A70CA434045EDB010E7480AFCEF18" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -1352,6 +1816,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F7FBD6E1C73B45EA813FB1D5E6050650" + { + "SourcePath" = "8:..\\cups\\pwg.h" + "TargetName" = "8:pwg.h" + "Tag" = "8:" + "Folder" = "8:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FA604C5C4FDD4D7B8110AFC6B603FBAF" { "SourcePath" = "8:..\\test\\onepage-letter.ps" @@ -1430,6 +1914,17 @@ "Property" = "8:_23D8BBBA9DEE4C8E88C9D1624DEAFB81" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_8EF6B1AA25034DB9BCC44F5A3CCFF9F0" + { + "Name" = "8:cups" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_61254DF68D8F4039997C263F7B45ABB8" + "Folders" + { + } + } } } "{9EF0B969-E518-4E46-987F-47570745A589}:_24DE31CE70694FD2977B5FB38F24D77F" @@ -1463,22 +1958,66 @@ "Property" = "8:_927C9760A02446EBB2AEDE6BCCFDE29F" "Folders" { - } - } - "{9EF0B969-E518-4E46-987F-47570745A589}:_9DFBB4777E594B0F8884792467931241" - { - "Name" = "8:ipptool" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:_77AF2E5323304714AF58A3F662F6051B" - "Folders" - { - } - } - } - } - } + "{9EF0B969-E518-4E46-987F-47570745A589}:_ABA133175ABB48058F633A1599B418BC" + { + "Name" = "8:ReleaseX64" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_B4A5B4451AA146D4AA06FDF59FF36FCD" + "Folders" + { + } + } + "{9EF0B969-E518-4E46-987F-47570745A589}:_BC1E27FED70845D1BA482FB1D96972F5" + { + "Name" = "8:ReleaseWin32" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_83BECF9B63434282B61BAA7043D96AB1" + "Folders" + { + } + } + "{9EF0B969-E518-4E46-987F-47570745A589}:_E6A941208712461FAD0B4FB291EDDD56" + { + "Name" = "8:DebugWin32" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_808CB654DBF7446FB4C3706759D6326C" + "Folders" + { + } + } + "{9EF0B969-E518-4E46-987F-47570745A589}:_EB4E176E122E4686A21902DD986EC361" + { + "Name" = "8:DebugX64" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_704A12AF60B74B92A12505146FD2CA2E" + "Folders" + { + } + } + } + } + "{9EF0B969-E518-4E46-987F-47570745A589}:_9DFBB4777E594B0F8884792467931241" + { + "Name" = "8:ipptool" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_77AF2E5323304714AF58A3F662F6051B" + "Folders" + { + } + } + } + } + } "LaunchCondition" { } @@ -1494,14 +2033,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:CUPS SDK for Windows" - "ProductCode" = "8:{4E0D1662-B032-4CAD-8DBD-5302ADCE1C6F}" - "PackageCode" = "8:{00298F12-01DD-4785-9402-7A1E694F9577}" + "ProductCode" = "8:{FE657BEF-0C7A-4175-9EAE-D482789E7AD5}" + "PackageCode" = "8:{2AE9BB2F-C4FC-4BB7-9A4D-77F83E55EA55}" "UpgradeCode" = "8:{BAB6EBBB-515D-4155-9FEF-D98DA76814CA}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:12.03.2600" + "ProductVersion" = "8:13.04.1800" "Manufacturer" = "8:Apple Inc." "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:http://www.cups.org/str.php" @@ -2018,11 +2557,53 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1DFD9AECD1AD4B2291DD52028E866569" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2B4CDFC508564D57A5C27766923D822E" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_2F26FF10F81046A9A863995A1D5F449E" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_crt_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7014E39650EC41979A77C81B8C8636C5" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7E5E5AB3D3C0409AB04A160380C1B03A" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_DebugCRT_x86.msm" "Properties" { } @@ -2032,7 +2613,7 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_62CA00B1E5E4460CA93EE7E2B8FE878B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B1520DB5B1CE4CA392FF0EB614535300" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -2046,15 +2627,57 @@ "Feature" = "8:" "IsolateTo" = "8:" } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B77819C33E084E13AC78EAF9234C67E1" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:policy_9_0_Microsoft_VC90_CRT_x86_x64.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_B820F65C4D844938881581933D156B34" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_crt_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E4DC6765AD3348C28401914D2B7BC71A" + { + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:TRUE" + "SourcePath" = "8:microsoft_vc90_debugcrt_x86.msm" + "Properties" + { + } + "LanguageId" = "3:0" + "Exclude" = "11:FALSE" + "Folder" = "8:" + "Feature" = "8:" + "IsolateTo" = "8:" + } } "ProjectOutput" { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0299839A2CCC4F908C5D3A8F465F3FFE" { - "SourcePath" = "8:Win32\\Release\\libcupsimage2.dll" + "SourcePath" = "8:x64\\Debug\\libcupsimage2.dll" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_C8D931ADC425446B916E9711B929659F" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2077,9 +2700,37 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_16CCCC95D1BE41A981EAA4CDAD772F32" + { + "SourcePath" = "8:x64\\Debug\\regex.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_EB4E176E122E4686A21902DD986EC361" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Debug|x64" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_364DCCAFF25145BCBE75FFEEDCC75B3A" { - "SourcePath" = "8:Win32\\Release\\cupstestppd.exe" + "SourcePath" = "8:x64\\Debug\\cupstestppd.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" @@ -2105,9 +2756,93 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3CBB55F3EBEA4645BE6CEC8A0F251B80" + { + "SourcePath" = "8:x64\\Release\\libcups2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_ABA133175ABB48058F633A1599B418BC" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Release|x64" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3F5E38826D0C441897F43747FFA7491A" + { + "SourcePath" = "8:x64\\Debug\\libcups2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_EB4E176E122E4686A21902DD986EC361" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Debug|x64" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_52B5F2EDEDEC48B5A1188F780C67DE9B" + { + "SourcePath" = "8:Win32\\Release\\regex.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Release|Win32" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B20638175CCB42398417E0683A12469C" { - "SourcePath" = "8:Win32\\Release\\ipptool.exe" + "SourcePath" = "8:x64\\Debug\\ipptool.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" @@ -2133,12 +2868,68 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BAEADCCB6AD74F36AE08401229354D79" + { + "SourcePath" = "8:Win32\\Release\\libcups2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_BC1E27FED70845D1BA482FB1D96972F5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Release|Win32" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C17DC336766E4B1BBC8DD24D686C440A" + { + "SourcePath" = "8:x64\\Release\\regex.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_ABA133175ABB48058F633A1599B418BC" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Release|x64" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D02EB13951314EFD9C539150EF8E53B8" { - "SourcePath" = "8:Win32\\Release\\regex.dll" + "SourcePath" = "8:x64\\Release\\regex.dll" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_C8D931ADC425446B916E9711B929659F" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" @@ -2161,12 +2952,68 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D3197C67CBAC46DE854CF283CDBC677E" + { + "SourcePath" = "8:Win32\\Debug\\regex.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_E6A941208712461FAD0B4FB291EDDD56" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Debug|Win32" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{18950A1B-D37A-40C7-B2DF-C12986C0526E}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E9925AF9A2D343D6BFE5BDAE33481292" + { + "SourcePath" = "8:Win32\\Debug\\libcups2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_E6A941208712461FAD0B4FB291EDDD56" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:Debug|Win32" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EA282F32A10B4ED1A81AA6133B997C6A" { - "SourcePath" = "8:Win32\\Release\\libcups2.dll" + "SourcePath" = "8:x64\\Debug\\libcups2.dll" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_C8D931ADC425446B916E9711B929659F" + "Folder" = "8:_FFAEDEA1D38D4088A03FDD6F17E2CA5D" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj index b20812256..fcb94ea88 100644 --- a/vcnet/libcups2.vcproj +++ b/vcnet/libcups2.vcproj @@ -4,6 +4,7 @@ Version="9.00" Name="libcups2" ProjectGUID="{CB4AA6F2-3E84-45BE-B505-95CD375E8BE3}" + RootNamespace="libcups2" Keyword="Win32Proj" TargetFrameworkVersion="131072" > @@ -483,6 +484,18 @@ RelativePath="..\cups\debug.c" > + + + + + + diff --git a/vcnet/regex.vcproj b/vcnet/regex.vcproj index 8b13f6fd4..fbc9fdfdd 100644 --- a/vcnet/regex.vcproj +++ b/vcnet/regex.vcproj @@ -12,6 +12,9 @@ + @@ -165,6 +168,157 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.2