From 39ff2fe72b9fc06ae7acc909584f87874f3a71b8 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 9 Apr 2010 22:45:27 +0000 Subject: [PATCH] Merge changes from CUPS 1.5svn-r9098. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2056 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-1.4.txt | 4 + IPPTOOL.txt | 88 +++++ README.txt | 6 +- backend/ieee1284.c | 41 ++- backend/usb-libusb.c | 2 +- cups/file.h | 1 + cups/ipp-support.c | 2 +- cups/libcups2.def | 625 ++++++++++++++++++----------------- doc/de/index.html.in | 2 +- doc/es/index.html.in | 2 +- doc/eu/index.html.in | 2 +- doc/id/index.html.in | 2 +- doc/index.html.in | 2 +- doc/it/index.html.in | 2 +- doc/ja/index.html.in | 2 +- doc/pl/index.html.in | 2 +- doc/ru/index.html.in | 2 +- filter/pdftops.c | 1 + packaging/cups.spec.in | 2 + scheduler/network.c | 5 +- scheduler/printers.c | 2 +- systemv/lpstat.c | 4 +- templates/de/trailer.tmpl | 2 +- templates/es/trailer.tmpl | 2 +- templates/eu/trailer.tmpl | 2 +- templates/id/trailer.tmpl | 2 +- templates/it/trailer.tmpl | 2 +- templates/ja/trailer.tmpl | 2 +- templates/pl/trailer.tmpl | 2 +- templates/ru/trailer.tmpl | 2 +- templates/trailer.tmpl | 2 +- test/get-completed-jobs.test | 8 +- test/get-jobs.test | 5 +- tools/makeipptoolpkg | 83 +++++ tools/makesrcdist | 8 +- 35 files changed, 562 insertions(+), 361 deletions(-) create mode 100644 IPPTOOL.txt create mode 100644 tools/makeipptoolpkg diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt index c6eb7dd59..4f32dc5c5 100644 --- a/CHANGES-1.4.txt +++ b/CHANGES-1.4.txt @@ -4,6 +4,10 @@ CHANGES-1.4.txt CHANGES IN CUPS V1.4.4 - Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529) + - Added additional validation checks for the 1284 device ID (STR #3534) + - Fixed a problem with the RPM spec file (STR #3544) + - The lpstat command did not limit the job list to the specified + printers (STR #3541) - The cupsfilter command did not set the RIP_MAX_CACHE environment variable (STR #3531) - Fixed support for media-col and page size variants (STR #3394) diff --git a/IPPTOOL.txt b/IPPTOOL.txt new file mode 100644 index 000000000..c96822017 --- /dev/null +++ b/IPPTOOL.txt @@ -0,0 +1,88 @@ +IPPTOOL.txt - 2010-04-07 +------------------------ + + +INTRODUCTION + + Starting with CUPS 1.5, CUPS now installs a user program called + ipptool that can be used to send arbitrary IPP requests to a CUPS + server or IPP printer. This tool started life as part of the CUPS + automated test suite and has grown to support complex conformance + tests and a simple way to query printer, job, and subscription + attributes. + + +BASIC USAGE + + The ipptool command requires a printer URI and one or more "test" + files that describe the operations, attributes to display, and + expected status and attribute values. Several standard files are + included with CUPS, for example to show a list of pending print jobs + on a CUPS printer called "myprinter" you'd run: + + ipptool ipp://localhost/printers/myprinter get-jobs.test + + which would produce something like this: + + job-id job-state job-name job-originating-user-name + ------ ------------ ------------ ------------------------- + 72 pending testfile.pdf msweet + 73 pending testfile.ps msweet + 74 pending-held testfile.jpg msweet + 75 pending-held testfile.txt msweet + + To get output suitable for import into a spreadsheet, use the "-c" + (CSV) option: + + ipptool -c ipp://localhost/printers/myprinter get-jobs.test + + which would produce something like this: + + job-id,job-state,job-name,job-originating-user-name + 72,pending,testfile.pdf,msweet + 73,pending,testfile.ps,msweet + 74,pending-held,testfile.jpg,msweet + 75,pending-held,testfile.txt,msweet + + +CONFORMANCE TESTS + + We provide basic IPP conformance tests for IPP/1.1, IPP/2.0, and + IPP/2.1. For a given printer URI, the following commands perform + tests at each level: + + ipptool -t printer-uri ipp-1.1.test + ipptool -t -V 2.0 printer-uri ipp-2.0.test + ipptool -t -V 2.1 printer-uri ipp-2.1.test + + +READING THE DOCUMENTATION + + The command usage is described in the ipptest(1) man page, while the + file format is described in the ipptestfile(5) man page. + + +GETTING SUPPORT AND OTHER RESOURCES + + If you have problems, READ THE DOCUMENTATION FIRST! We also provide many + discussion forums which are available at: + + http://www.cups.org/newsgroups.php + + See the CUPS web site at "http://www.cups.org/" for other resources. + + +LEGAL STUFF + + CUPS is Copyright 2007-2010 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/README.txt b/README.txt index 138fc9287..d0a8957b5 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -README - CUPS v1.4.0 - 2009-06-26 ---------------------------------- +README - CUPS v1.5svn - 2010-04-07 +---------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... @@ -150,7 +150,7 @@ PRINTING FILES LEGAL STUFF - CUPS is Copyright 2007-2009 by Apple Inc. CUPS and the CUPS logo are + CUPS is Copyright 2007-2010 by Apple Inc. CUPS and the CUPS logo are trademarks of Apple Inc. The MD5 Digest code is Copyright 1999 Aladdin Enterprises. diff --git a/backend/ieee1284.c b/backend/ieee1284.c index b84776d09..bf994891c 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -186,18 +186,34 @@ backendGetDeviceID( /* * The length field counts the number of bytes in the string - * including the length field itself (2 bytes). + * including the length field itself (2 bytes). The minimum + * length for a valid/usable device ID is 14 bytes: + * + * MFG: ;MDL: ; + * 2 + 4 + 1 + 5 + 1 + 1 */ - length -= 2; + if (length < 14) + { + /* + * Can't use this device ID, so don't try to copy it... + */ - /* - * Copy the device ID text to the beginning of the buffer and - * nul-terminate. - */ + device_id[0] = '\0'; + got_id = 0; + } + else + { + /* + * Copy the device ID text to the beginning of the buffer and + * nul-terminate. + */ - memmove(device_id, device_id + 2, length); - device_id[length] = '\0'; + length -= 2; + + memmove(device_id, device_id + 2, length); + device_id[length] = '\0'; + } } # ifdef DEBUG else @@ -294,6 +310,9 @@ backendGetDeviceID( mfg = temp; } + if (!mdl) + mdl = ""; + if (!strncasecmp(mdl, mfg, strlen(mfg))) { mdl += strlen(mfg); @@ -385,7 +404,11 @@ backendGetMakeModel( char temp[1024]; /* Temporary make and model */ - snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); + if (mfg) + snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); + else + snprintf(temp, sizeof(temp), "%s", mdl); + _ppdNormalizeMakeAndModel(temp, make_model, make_model_size); } } diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index e46e6ea9d..7f4095179 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -31,7 +31,7 @@ #include #include -#include +#include /* diff --git a/cups/file.h b/cups/file.h index c8a2b4667..2aad7a2d3 100644 --- a/cups/file.h +++ b/cups/file.h @@ -27,6 +27,7 @@ */ # include "versioning.h" +# include # include # if defined(WIN32) && !defined(__CUPS_SSIZE_T_DEFINED) # define __CUPS_SSIZE_T_DEFINED diff --git a/cups/ipp-support.c b/cups/ipp-support.c index c549a6f89..05103dcdc 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -272,7 +272,7 @@ static const char * const job_states[] = "pending", "pending-held", "processing", - "processing-stopped" + "processing-stopped", "canceled", "aborted", "completed" diff --git a/cups/libcups2.def b/cups/libcups2.def index 83d33f382..825d12e68 100644 --- a/cups/libcups2.def +++ b/cups/libcups2.def @@ -1,312 +1,313 @@ -LIBRARY libcups2 -VERSION 2.8 -EXPORTS -_cupsCharmapFlush -_cupsCharmapFree -_cupsCharmapGet -_cupsEncodingName -_cupsGetPassword -_cupsGlobals -_cupsLangPrintf -_cupsLangPuts -_cupsLangString -_cupsMD5Append -_cupsMD5Finish -_cupsMD5Init -_cupsMessageFree -_cupsMessageLoad -_cupsMessageLookup -_cupsSetError -_cupsSetLocale -_cupsStrAlloc -_cupsStrFlush -_cupsStrFormatd -_cupsStrFree -_cupsStrScand -_cupsStrStatistics -_cups_strcpy -_cups_strlcat -_cups_strlcpy -_httpResolveURI -_ippAddAttr -_ippFindOption -_ippFreeAttr -_ppdFreeLanguages -_ppdGetEncoding -_ppdGetLanguages -_ppdHashName -_pwgCreateWithFile -_pwgDestroy -_pwgWriteFile -_pwgGenerateSize -_pwgInitSize -_pwgMediaForLegacy -_pwgMediaForPPD -_pwgMediaForPWG -_pwgMediaForSize -_pwgCreateWithPPD -_pwgGetInputSlot -_pwgGetMediaType -_pwgGetPageSize -_pwgGetSize -_pwgGetSource -_pwgGetType -_pwgInputSlotForSource -_pwgMediaTypeForType -_pwgPageSizeForMedia -cupsAddDest -cupsAddOption -cupsAdminCreateWindowsPPD -cupsAdminExportSamba -cupsArrayAdd -cupsArrayClear -cupsArrayCount -cupsArrayCurrent -cupsArrayDelete -cupsArrayDup -cupsArrayFind -cupsArrayFirst -cupsArrayIndex -cupsArrayInsert -cupsArrayLast -cupsArrayNew -cupsArrayNext -cupsArrayPrev -cupsArrayRemove -cupsArrayRestore -cupsArraySave -cupsArrayUserData -cupsCancelJob -cupsCharsetToUTF8 -cupsDirClose -cupsDirOpen -cupsDirRead -cupsDirRewind -cupsDoAuthentication -cupsDoFileRequest -cupsDoIORequest -cupsDoRequest -cupsEncodeOptions -cupsEncodeOptions2 -cupsEncryption -cupsFileClose -cupsFileCompression -cupsFileEOF -cupsFileFind -cupsFileFlush -cupsFileGetChar -cupsFileGetConf -cupsFileGetLine -cupsFileGets -cupsFileLock -cupsFileNumber -cupsFileOpen -cupsFileOpenFd -cupsFilePeekChar -cupsFilePrintf -cupsFilePutChar -cupsFilePuts -cupsFileRead -cupsFileRewind -cupsFileSeek -cupsFileStderr -cupsFileStdin -cupsFileStdout -cupsFileTell -cupsFileUnlock -cupsFileWrite -cupsFreeDests -cupsFreeJobs -cupsFreeOptions -cupsGetClasses -cupsGetDefault -cupsGetDefault2 -cupsGetDest -cupsGetDests -cupsGetDests2 -cupsGetFd -cupsGetFile -cupsGetJobs -cupsGetJobs2 -cupsGetOption -cupsGetPPD -cupsGetPPD2 -cupsGetPassword -cupsGetPrinters -cupsGetResponse -cupsLangDefault -cupsLangEncoding -cupsLangFlush -cupsLangFree -cupsLangGet -cupsLastError -cupsLastErrorString -cupsMarkOptions -cupsNotifySubject -cupsNotifyText -cupsParseOptions -cupsPrintFile -cupsPrintFile2 -cupsPrintFiles -cupsPrintFiles2 -cupsPutFd -cupsPutFile -cupsRemoveOption -cupsResolveConflicts -cupsSendRequest -cupsServer -cupsSetDests -cupsSetDests2 -cupsSetEncryption -cupsSetPasswordCB -cupsSetServer -cupsSetUser -cupsTempFd -cupsTempFile -cupsTempFile2 -cupsUTF32ToUTF8 -cupsUTF8ToCharset -cupsUTF8ToUTF32 -cupsUser -cupsWriteRequestData -httpAddrAny -httpAddrConnect -httpAddrEqual -httpAddrFreeList -httpAddrGetList -httpAddrLength -httpAddrLocalhost -httpAddrLookup -httpAddrString -httpAssembleURI -httpAssembleURIf -httpBlocking -httpCheck -httpClearCookie -httpClearFields -httpClose -httpConnect -httpConnectEncrypt -httpDecode64 -httpDecode64_2 -httpDelete -httpEncode64 -httpEncode64_2 -httpEncryption -httpError -httpFlush -httpFlushWrite -httpGet -httpGetBlocking -httpGetCookie -httpGetDateString -httpGetDateString2 -httpGetDateTime -httpGetFd -httpGetField -httpGetHostByName -httpGetHostname -httpGetLength -httpGetLength2 -httpGetStatus -httpGetSubField -httpGetSubField2 -httpGets -httpHead -httpInitialize -httpMD5 -httpMD5Final -httpMD5String -httpOptions -httpPost -httpPrintf -httpPut -httpRead -httpRead2 -httpReconnect -httpSeparate -httpSeparate2 -httpSeparateURI -httpSetCookie -httpSetExpect -httpSetField -httpSetLength -httpStatus -httpTrace -httpUpdate -httpWait -httpWrite -httpWrite2 -ippAddBoolean -ippAddBooleans -ippAddCollection -ippAddCollections -ippAddDate -ippAddInteger -ippAddIntegers -ippAddOctetString -ippAddRange -ippAddRanges -ippAddResolution -ippAddResolutions -ippAddSeparator -ippAddString -ippAddStrings -ippDateToTime -ippDelete -ippDeleteAttribute -ippErrorString -ippErrorValue -ippFindAttribute -ippFindNextAttribute -ippLength -ippNew -ippNewRequest -ippOpString -ippOpValue -ippPort -ippRead -ippReadFile -ippReadIO -ippSetPort -ippTagString -ippTagValue -ippTimeToDate -ippWrite -ippWriteFile -ippWriteIO -ppdClose -ppdCollect -ppdCollect2 -ppdConflicts -ppdEmit -ppdEmitAfterOrder -ppdEmitFd -ppdEmitJCL -ppdEmitJCLEnd -ppdEmitString -ppdErrorString -ppdFindAttr -ppdFindChoice -ppdFindCustomOption -ppdFindCustomParam -ppdFindMarkedChoice -ppdFindNextAttr -ppdFindOption -ppdFirstCustomParam -ppdFirstOption -ppdIsMarked -ppdLastError -ppdLocalize -ppdMarkDefaults -ppdMarkOption -ppdNextCustomParam -ppdNextOption -ppdOpen -ppdOpen2 -ppdOpenFd -ppdOpenFile -ppdPageLength -ppdPageSize -ppdPageWidth -ppdSetConformance +LIBRARY libcups2 +VERSION 2.8 +EXPORTS +_cupsCharmapFlush +_cupsCharmapFree +_cupsCharmapGet +_cupsEncodingName +_cupsGetPassword +_cupsGlobals +_cupsLangPrintf +_cupsLangPuts +_cupsLangString +_cupsMD5Append +_cupsMD5Finish +_cupsMD5Init +_cupsMessageFree +_cupsMessageLoad +_cupsMessageLookup +_cupsSetError +_cupsSetLocale +_cupsStrAlloc +_cupsStrFlush +_cupsStrFormatd +_cupsStrFree +_cupsStrScand +_cupsStrStatistics +_cups_strcpy +_cups_strlcat +_cups_strlcpy +_httpResolveURI +_ippAddAttr +_ippAttrString +_ippFindOption +_ippFreeAttr +_ppdFreeLanguages +_ppdGetEncoding +_ppdGetLanguages +_ppdHashName +_pwgCreateWithFile +_pwgDestroy +_pwgWriteFile +_pwgGenerateSize +_pwgInitSize +_pwgMediaForLegacy +_pwgMediaForPPD +_pwgMediaForPWG +_pwgMediaForSize +_pwgCreateWithPPD +_pwgGetInputSlot +_pwgGetMediaType +_pwgGetPageSize +_pwgGetSize +_pwgGetSource +_pwgGetType +_pwgInputSlotForSource +_pwgMediaTypeForType +_pwgPageSizeForMedia +cupsAddDest +cupsAddOption +cupsAdminCreateWindowsPPD +cupsAdminExportSamba +cupsArrayAdd +cupsArrayClear +cupsArrayCount +cupsArrayCurrent +cupsArrayDelete +cupsArrayDup +cupsArrayFind +cupsArrayFirst +cupsArrayIndex +cupsArrayInsert +cupsArrayLast +cupsArrayNew +cupsArrayNext +cupsArrayPrev +cupsArrayRemove +cupsArrayRestore +cupsArraySave +cupsArrayUserData +cupsCancelJob +cupsCharsetToUTF8 +cupsDirClose +cupsDirOpen +cupsDirRead +cupsDirRewind +cupsDoAuthentication +cupsDoFileRequest +cupsDoIORequest +cupsDoRequest +cupsEncodeOptions +cupsEncodeOptions2 +cupsEncryption +cupsFileClose +cupsFileCompression +cupsFileEOF +cupsFileFind +cupsFileFlush +cupsFileGetChar +cupsFileGetConf +cupsFileGetLine +cupsFileGets +cupsFileLock +cupsFileNumber +cupsFileOpen +cupsFileOpenFd +cupsFilePeekChar +cupsFilePrintf +cupsFilePutChar +cupsFilePuts +cupsFileRead +cupsFileRewind +cupsFileSeek +cupsFileStderr +cupsFileStdin +cupsFileStdout +cupsFileTell +cupsFileUnlock +cupsFileWrite +cupsFreeDests +cupsFreeJobs +cupsFreeOptions +cupsGetClasses +cupsGetDefault +cupsGetDefault2 +cupsGetDest +cupsGetDests +cupsGetDests2 +cupsGetFd +cupsGetFile +cupsGetJobs +cupsGetJobs2 +cupsGetOption +cupsGetPPD +cupsGetPPD2 +cupsGetPassword +cupsGetPrinters +cupsGetResponse +cupsLangDefault +cupsLangEncoding +cupsLangFlush +cupsLangFree +cupsLangGet +cupsLastError +cupsLastErrorString +cupsMarkOptions +cupsNotifySubject +cupsNotifyText +cupsParseOptions +cupsPrintFile +cupsPrintFile2 +cupsPrintFiles +cupsPrintFiles2 +cupsPutFd +cupsPutFile +cupsRemoveOption +cupsResolveConflicts +cupsSendRequest +cupsServer +cupsSetDests +cupsSetDests2 +cupsSetEncryption +cupsSetPasswordCB +cupsSetServer +cupsSetUser +cupsTempFd +cupsTempFile +cupsTempFile2 +cupsUTF32ToUTF8 +cupsUTF8ToCharset +cupsUTF8ToUTF32 +cupsUser +cupsWriteRequestData +httpAddrAny +httpAddrConnect +httpAddrEqual +httpAddrFreeList +httpAddrGetList +httpAddrLength +httpAddrLocalhost +httpAddrLookup +httpAddrString +httpAssembleURI +httpAssembleURIf +httpBlocking +httpCheck +httpClearCookie +httpClearFields +httpClose +httpConnect +httpConnectEncrypt +httpDecode64 +httpDecode64_2 +httpDelete +httpEncode64 +httpEncode64_2 +httpEncryption +httpError +httpFlush +httpFlushWrite +httpGet +httpGetBlocking +httpGetCookie +httpGetDateString +httpGetDateString2 +httpGetDateTime +httpGetFd +httpGetField +httpGetHostByName +httpGetHostname +httpGetLength +httpGetLength2 +httpGetStatus +httpGetSubField +httpGetSubField2 +httpGets +httpHead +httpInitialize +httpMD5 +httpMD5Final +httpMD5String +httpOptions +httpPost +httpPrintf +httpPut +httpRead +httpRead2 +httpReconnect +httpSeparate +httpSeparate2 +httpSeparateURI +httpSetCookie +httpSetExpect +httpSetField +httpSetLength +httpStatus +httpTrace +httpUpdate +httpWait +httpWrite +httpWrite2 +ippAddBoolean +ippAddBooleans +ippAddCollection +ippAddCollections +ippAddDate +ippAddInteger +ippAddIntegers +ippAddOctetString +ippAddRange +ippAddRanges +ippAddResolution +ippAddResolutions +ippAddSeparator +ippAddString +ippAddStrings +ippDateToTime +ippDelete +ippDeleteAttribute +ippErrorString +ippErrorValue +ippFindAttribute +ippFindNextAttribute +ippLength +ippNew +ippNewRequest +ippOpString +ippOpValue +ippPort +ippRead +ippReadFile +ippReadIO +ippSetPort +ippTagString +ippTagValue +ippTimeToDate +ippWrite +ippWriteFile +ippWriteIO +ppdClose +ppdCollect +ppdCollect2 +ppdConflicts +ppdEmit +ppdEmitAfterOrder +ppdEmitFd +ppdEmitJCL +ppdEmitJCLEnd +ppdEmitString +ppdErrorString +ppdFindAttr +ppdFindChoice +ppdFindCustomOption +ppdFindCustomParam +ppdFindMarkedChoice +ppdFindNextAttr +ppdFindOption +ppdFirstCustomParam +ppdFirstOption +ppdIsMarked +ppdLastError +ppdLocalize +ppdMarkDefaults +ppdMarkOption +ppdNextCustomParam +ppdNextOption +ppdOpen +ppdOpen2 +ppdOpenFd +ppdOpenFile +ppdPageLength +ppdPageSize +ppdPageWidth +ppdSetConformance diff --git a/doc/de/index.html.in b/doc/de/index.html.in index 80a421f53..85c66ab91 100644 --- a/doc/de/index.html.in +++ b/doc/de/index.html.in @@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS">   CUPS und das CUPS Logo sind eingetragene Warenzeichen der Apple Inc. -CUPS ist urheberrechtlich geschützt 2007-2009 von Apple Inc, alle Rechte vorbehalten. +CUPS ist urheberrechtlich geschützt 2007-2010 von Apple Inc, alle Rechte vorbehalten. diff --git a/doc/es/index.html.in b/doc/es/index.html.in index 23251add1..da71c5442 100644 --- a/doc/es/index.html.in +++ b/doc/es/index.html.in @@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS">   CUPS y el logo de CUPS son marcas registradas de Apple Inc. Los derechos -de copia de CUPS 2007-2009 son de Apple Inc. Todos los derechos reservados. +de copia de CUPS 2007-2010 son de Apple Inc. Todos los derechos reservados. diff --git a/doc/eu/index.html.in b/doc/eu/index.html.in index 21e557b2a..0408c3884 100644 --- a/doc/eu/index.html.in +++ b/doc/eu/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS eta CUPSen logotipoa Apple Inc.en marka erregistratuaj dira. -CUPSen copyright-a 2007-2009 Apple Inc. Eskubide guztiak gordeta. +CUPSen copyright-a 2007-2010 Apple Inc. Eskubide guztiak gordeta. diff --git a/doc/id/index.html.in b/doc/id/index.html.in index ac6af5eb8..764e7b70f 100644 --- a/doc/id/index.html.in +++ b/doc/id/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS dan logo CUPS logo adalah merek dagang dari -Apple Inc. Hak cipta CUPS pada 2007-2009 Apple +Apple Inc. Hak cipta CUPS pada 2007-2010 Apple Inc. Semua hak terpelihara. diff --git a/doc/index.html.in b/doc/index.html.in index 03aa76c20..05e5eb0f5 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS and the CUPS logo are trademarks of -Apple Inc. CUPS is copyright 2007-2009 Apple +Apple Inc. CUPS is copyright 2007-2010 Apple Inc. All rights reserved. diff --git a/doc/it/index.html.in b/doc/it/index.html.in index 14b0362a3..a15de9d99 100644 --- a/doc/it/index.html.in +++ b/doc/it/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS e il logo CUPS sono marchi di -Apple Inc. CUPS è un copyright 2007-2009 di Apple +Apple Inc. CUPS è un copyright 2007-2010 di Apple Inc. Tutti i diritti sono riservati. diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index 03cea0a4c..8919749c5 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -100,7 +100,7 @@ HEIGHT="128" ALT="CUPS">   CUPS and the CUPS logo are trademarks of -Apple Inc. CUPS is copyright 2007-2009 Apple +Apple Inc. CUPS is copyright 2007-2010 Apple Inc. All rights reserved. diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in index 9aadf0df0..d0555887e 100644 --- a/doc/pl/index.html.in +++ b/doc/pl/index.html.in @@ -101,7 +101,7 @@ HEIGHT="128" ALT="CUPS">   CUPS i logo CUPS są znakami handlowymi Apple Inc. CUPS -copyright 2007-2009 Apple Inc. Wszystkie prawa zastrzeżone. +copyright 2007-2010 Apple Inc. Wszystkie prawa zastrzeżone. diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index ce5c1d782..b0b6bbf9e 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -97,7 +97,7 @@ HEIGHT="128" ALT="CUPS">   -CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. +CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2010) компании Apple Inc. Все права защищены. diff --git a/filter/pdftops.c b/filter/pdftops.c index d72fcf0c7..67f0e9dc4 100644 --- a/filter/pdftops.c +++ b/filter/pdftops.c @@ -23,6 +23,7 @@ */ #include +#include #include #include #include diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index bd5411d7e..978f353f7 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -245,6 +245,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/cups/eu/* %dir /usr/share/doc/cups/id /usr/share/doc/cups/id/* +%dir /usr/share/doc/cups/it +/usr/share/doc/cups/it/* %dir /usr/share/doc/cups/ja /usr/share/doc/cups/ja/* %dir /usr/share/doc/cups/pl diff --git a/scheduler/network.c b/scheduler/network.c index e2f7d6ca8..2f0f563cc 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -1,10 +1,9 @@ /* * "$Id: network.c 7861 2008-08-26 03:15:14Z mike $" * - * Network interface functions for the Common UNIX Printing System - * (CUPS) scheduler. + * Network interface functions for the CUPS scheduler. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the diff --git a/scheduler/printers.c b/scheduler/printers.c index b4c625cd5..a2f4279ea 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -4524,7 +4524,7 @@ load_ppd(cupsd_printer_t *p) /* I - Printer */ * Just the DefaultResolution to report... */ - xdpi = (int)strtol(ppd_attr->value, (char **)&resptr, 10); + xdpi = ydpi = (int)strtol(ppd_attr->value, (char **)&resptr, 10); if (resptr > ppd_attr->value && xdpi > 0) { if (*resptr == 'x') diff --git a/systemv/lpstat.c b/systemv/lpstat.c index b21b36804..a1f4698f7 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -574,11 +574,11 @@ match_list(const char *list, /* I - List of names */ /* - * An empty list always matches... + * An empty list never matches... */ if (!list || !*list) - return (1); + return (0); while (*list) { diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl index bdf09f556..40f01c324 100644 --- a/templates/de/trailer.tmpl +++ b/templates/de/trailer.tmpl @@ -2,7 +2,7 @@   CUPS und das CUPS Logo sind eingetragene Warenzeichen der Apple Inc. CUPS -ist urheberrechtlich geschützt 2007-2009 von Apple Inc, alle Rechte vorbehalten. +ist urheberrechtlich geschützt 2007-2010 von Apple Inc, alle Rechte vorbehalten. diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl index 4e99fb61c..59f806800 100644 --- a/templates/es/trailer.tmpl +++ b/templates/es/trailer.tmpl @@ -2,7 +2,7 @@   CUPS y el logo de CUPS son marcas registradas de Apple, Inc. Los derechos de copia de CUPS -2007-2009 son de Apple Inc. Todos los derechos reservados. +2007-2010 son de Apple Inc. Todos los derechos reservados. diff --git a/templates/eu/trailer.tmpl b/templates/eu/trailer.tmpl index 74d8bfa54..2f4f3c8c5 100644 --- a/templates/eu/trailer.tmpl +++ b/templates/eu/trailer.tmpl @@ -1,7 +1,7 @@   CUPS eta CUPSen logotipoa Apple Inc.en -marka errejistratuak dira. CUPSen copyright-a: 2007-2009 Apple +marka errejistratuak dira. CUPSen copyright-a: 2007-2010 Apple Inc. eskubide guztiak gordeta. diff --git a/templates/id/trailer.tmpl b/templates/id/trailer.tmpl index 33262f989..b729e56a1 100644 --- a/templates/id/trailer.tmpl +++ b/templates/id/trailer.tmpl @@ -1,7 +1,7 @@   CUPS dan logo CUPS adalah merek dagang dari -Apple Inc. Hak Cipta CUPS adalah 2007-2009 Apple +Apple Inc. Hak Cipta CUPS adalah 2007-2010 Apple Inc. Semua hak terpelihara. diff --git a/templates/it/trailer.tmpl b/templates/it/trailer.tmpl index 16be40916..788a8967f 100644 --- a/templates/it/trailer.tmpl +++ b/templates/it/trailer.tmpl @@ -1,7 +1,7 @@   CUPS e il logo CUPS sono marchi di -Apple Inc. CUPS è un copyright 2007-2009 Apple +Apple Inc. CUPS è un copyright 2007-2010 Apple Inc. Tutti i diritti sono riservati. diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl index d46b6646c..62709b534 100644 --- a/templates/ja/trailer.tmpl +++ b/templates/ja/trailer.tmpl @@ -1,7 +1,7 @@   CUPS and the CUPS logo are trademarks of -Apple Inc. CUPS is copyright 2007-2009 Apple +Apple Inc. CUPS is copyright 2007-2010 Apple Inc. All rights reserved. diff --git a/templates/pl/trailer.tmpl b/templates/pl/trailer.tmpl index dc214e47f..60c72c7dd 100644 --- a/templates/pl/trailer.tmpl +++ b/templates/pl/trailer.tmpl @@ -2,7 +2,7 @@   CUPS i logo CUPS są znakami handlowymi Apple Inc. CUPS -copyright 2007-2009 Apple Inc. Wszystkie prawa zastrzeżone. +copyright 2007-2010 Apple Inc. Wszystkie prawa zastrzeżone. diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index 7bfc8b29d..52cde3503 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -1,6 +1,6 @@   -CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2009) компании Apple Inc. Все права защищены. +CUPS а также логотип CUPS являются зарегистрированными торговыми марками Apple Inc. Авторские права на CUPS принадлежат (2007-2010) компании Apple Inc. Все права защищены. diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl index d46b6646c..62709b534 100644 --- a/templates/trailer.tmpl +++ b/templates/trailer.tmpl @@ -1,7 +1,7 @@   CUPS and the CUPS logo are trademarks of -Apple Inc. CUPS is copyright 2007-2009 Apple +Apple Inc. CUPS is copyright 2007-2010 Apple Inc. All rights reserved. diff --git a/test/get-completed-jobs.test b/test/get-completed-jobs.test index 84ce9e6bc..9d8ebb40c 100644 --- a/test/get-completed-jobs.test +++ b/test/get-completed-jobs.test @@ -14,7 +14,7 @@ # # Usage: # -# ./ipptool printer-uri get-jobs.test +# ./ipptool printer-uri get-completed-jobs.test # @@ -32,17 +32,17 @@ ATTR uri printer-uri $uri ATTR keyword which-jobs completed ATTR keyword requested-attributes - job-id,job-name,document-format,job-media-sheets-completed,job-originating-user-name + job-id,job-state,job-name,job-originating-user-name,job-media-sheets-completed # What statuses are OK? STATUS successful-ok # What attributes to display DISPLAY job-id + DISPLAY job-state DISPLAY job-name - DISPLAY document-format - DISPLAY job-media-sheets-completed DISPLAY job-originating-user-name + DISPLAY job-media-sheets-completed } diff --git a/test/get-jobs.test b/test/get-jobs.test index 212b3fbc2..b40ea15d9 100644 --- a/test/get-jobs.test +++ b/test/get-jobs.test @@ -31,16 +31,15 @@ ATTR language attributes-natural-language en ATTR uri printer-uri $uri ATTR keyword requested-attributes - job-id,job-name,document-format,job-media-sheets-completed,job-originating-user-name + job-id,job-state,job-name,job-originating-user-name # What statuses are OK? STATUS successful-ok # What attributes to display DISPLAY job-id + DISPLAY job-state DISPLAY job-name - DISPLAY document-format - DISPLAY job-media-sheets-completed DISPLAY job-originating-user-name } diff --git a/tools/makeipptoolpkg b/tools/makeipptoolpkg new file mode 100644 index 000000000..62cd199f2 --- /dev/null +++ b/tools/makeipptoolpkg @@ -0,0 +1,83 @@ +#!/bin/sh +# +# "$Id$" +# +# Make an ipptool package for CUPS. +# +# Copyright 2007-2010 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. +# +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". +# + +# Make sure we are running in the right directory... +if test ! -f tools/makeipptoolpkg; then + echo "Run this script from the top-level CUPS source directory, e.g.:" + echo "" + echo " tools/makeipptoolpkg $*" + echo "" + exit 1 +fi + +if test $# = 0; then + echo Updating to get snapshot version... + svn up + rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'` + fileversion="1.5svn-r$rev" + version=snapshot +else + fileversion=$1 + version=$1 +fi + +if (svn st | grep -qv '^\?'); then + echo Local changes remain: + svn st | grep -v '^\?' + exit 1 +fi + +echo Creating package directory... +pkgdir="ipptool-$fileversion" + +test -d $pkgdir && rm -r $pkgdir +mkdir $pkgdir || exit 1 + +echo Copying package files +cp IPPTOOL.txt LICENSE.txt $pkgdir +cp doc/help/man-ipptool*.html $pkgdir +cp test/create-printer-subscription.test $pkgdir +cp test/get-completed-jobs.test test/get-jobs.test $pkgdir +cp test/ipp-[12].*.test $pkgdir +cp test/ipptool-static $pkgdir/ipptool +cp test/testfile.* $pkgdir + +if test `uname` = Darwin; then + echo Creating disk image... + pkgfile="$pkgdir-macosx-universal.dmg" + test -f $pkgfile && rm $pkgfile + hdiutil create -srcfolder $pkgdir $pkgfile + #sudo chown `whoami` $pkgfile +else + echo Creating archive... + pkgfile="$pkgdir-`uname`-`uname -m`.tar.gz" + tar czf $pkgfile $pkgdir || exit 1 +fi + +if test -x /usr/bin/md5sum; then + (md5sum $pkgfile | awk '{print $1, "'$fileversion' cups/'$version'/" $2}') +elif test -x /sbin/md5; then + (md5 $pkgfile | awk '{print $4, "'$fileversion' cups/'$version'/" substr($2, 2, length($2) - 2)}') +fi + +echo Removing temporary files... +rm -r $pkgdir + +echo "Done!" + +# +# End of "$Id$". +# diff --git a/tools/makesrcdist b/tools/makesrcdist index 9642409a5..7977d4b64 100755 --- a/tools/makesrcdist +++ b/tools/makesrcdist @@ -18,10 +18,10 @@ if test $# = 0; then echo Updating for snapshot... svn up rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'` - version="1.4svn" + version="1.5svn" revision="-r$rev" - fileversion="1.4svn-r$rev" - fileurl="ftp://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar." + fileversion="1.5svn-r$rev" + fileurl="http://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar." url="." else echo Creating tag for release... @@ -29,7 +29,7 @@ else version=$1 revision="" fileversion=$1 - fileurl="ftp://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar." + fileurl="http://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar." url="https://svn.easysw.com/public/cups/tags/release-$version" svn copy https://svn.easysw.com/public/cups/trunk "$url" \ -- 2.39.2