From a1a2e89ab0b611de7cd7dd97b5c5af24f9f4e309 Mon Sep 17 00:00:00 2001 From: mike Date: Thu, 12 May 2011 05:46:30 +0000 Subject: [PATCH] Update documentation and dependencies for 1.5b1. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9772 7a7537e8-13f0-0310-91df-b6672ffda945 --- INSTALL.txt | 2 +- IPPTOOL.txt | 4 +- LICENSE.txt | 4 +- README.txt | 4 +- backend/Dependencies | 2 +- config-scripts/cups-common.m4 | 8 +- cups/Dependencies | 9 +- cups/array.c | 2 +- cups/cups.h | 8 +- cups/http-private.h | 6 +- cups/http.c | 6 +- cups/http.h | 8 +- cups/ipp.h | 6 +- cups/ppd.h | 4 +- cups/raster.h | 2 +- cups/sidechannel.h | 2 +- cups/usersys.c | 6 +- doc/help/api-array.html | 6 +- doc/help/api-cups.html | 14 +-- doc/help/api-filedir.html | 4 +- doc/help/api-filter.html | 7 +- doc/help/api-httpipp.html | 20 ++-- doc/help/api-mime.html | 57 ++++++++--- doc/help/api-overview.html | 5 +- doc/help/api-ppd.html | 4 +- doc/help/api-raster.html | 2 +- doc/help/license.html | 6 +- scheduler/Dependencies | 179 ++++++++++++++++++---------------- 28 files changed, 213 insertions(+), 174 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index ec242f999..85757f0b7 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.5.0 - 2011-05-06 +INSTALL - CUPS v1.5b1 - 2011-05-11 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/IPPTOOL.txt b/IPPTOOL.txt index c13da01ae..f4e218a87 100644 --- a/IPPTOOL.txt +++ b/IPPTOOL.txt @@ -1,4 +1,4 @@ -IPPTOOL.txt - 2010-10-17 +IPPTOOL.txt - 2011-05-11 ------------------------ @@ -72,7 +72,7 @@ GETTING SUPPORT AND OTHER RESOURCES LEGAL STUFF - CUPS is Copyright 2007-2010 by Apple Inc. CUPS and the CUPS logo are + CUPS is Copyright 2007-2011 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/LICENSE.txt b/LICENSE.txt index 2c386e0f9..7d80518a3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ CUPS License Agreement - Copyright 2007-2010 by Apple Inc. + Copyright 2007-2011 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -129,7 +129,7 @@ redistribute it freely, subject to the following restrictions: software. 3. This notice may not be removed or altered from any source - distribution. + distribution. TRADEMARKS diff --git a/README.txt b/README.txt index 3e9c6d8b5..38875d9d1 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -README - CUPS v1.5svn - 2011-05-06 ----------------------------------- +README - CUPS v1.5b1 - 2011-05-11 +--------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/backend/Dependencies b/backend/Dependencies index b195e61e9..4f99c17ef 100644 --- a/backend/Dependencies +++ b/backend/Dependencies @@ -8,7 +8,7 @@ ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ipp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h -ipp.o: ../cups/sidechannel.h +ipp.o: ../cups/sidechannel.h ../cups/array-private.h lpd.o: ../cups/http-private.h ../config.h ../cups/http.h lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h lpd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 7ed55d579..5fd9143dc 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -20,11 +20,11 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION="1.5svn" +CUPS_VERSION="1.5b1" CUPS_REVISION="" -if test -z "$CUPS_REVISION" -a -d .svn; then - CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" -fi +#if test -z "$CUPS_REVISION" -a -d .svn; then +# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" +#fi CUPS_BUILD="cups-$CUPS_VERSION" AC_ARG_WITH(cups_build, [ --with-cups-build set "cups-config --build" string ], diff --git a/cups/Dependencies b/cups/Dependencies index 5b374f882..5e6359f7d 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -6,7 +6,8 @@ adminutil.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h adminutil.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.o: language-private.h ../cups/transcode.h thread-private.h adminutil.o: adminutil.h -array.o: string-private.h ../config.h debug-private.h array.h versioning.h +array.o: string-private.h ../config.h debug-private.h array-private.h array.h +array.o: versioning.h attr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.o: array.h language.h string-private.h ../config.h debug-private.h attr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h @@ -250,7 +251,8 @@ adminutil.32.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht adminutil.32.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.32.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h adminutil.32.o: adminutil.c adminutil.h -array.32.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +array.32.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h +array.32.o: array.c versioning.h attr.32.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.32.o: attr.c array.h language.h string-private.h ../config.h debug-private.h attr.32.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h @@ -494,7 +496,8 @@ adminutil.64.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht adminutil.64.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.64.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h adminutil.64.o: adminutil.c adminutil.h -array.64.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +array.64.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h +array.64.o: array.c versioning.h attr.64.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.64.o: attr.c array.h language.h string-private.h ../config.h debug-private.h attr.64.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h diff --git a/cups/array.c b/cups/array.c index 1ffe14236..71c161c7d 100644 --- a/cups/array.c +++ b/cups/array.c @@ -722,7 +722,7 @@ cupsArrayNew2(cups_array_func_t f, /* I - Comparison function or @code NULL@ fo * The free function ("cf") is used to automatically free/release elements when * removed or the array is deleted. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ cups_array_t * /* O - Array */ diff --git a/cups/cups.h b/cups/cups.h index 198e04a74..37619aa77 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -3,7 +3,7 @@ * * API definitions for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -170,13 +170,13 @@ typedef struct cups_job_s /**** Job ****/ } cups_job_t; typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls, - cups_array_t *distinguished_names, + cups_array_t *distinguished_names, void *user_data); - /**** Client credentials callback @since CUPS 1.5@ ****/ + /**** Client credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/ typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls, cups_array_t *certs, void *user_data); - /**** Server credentials callback @since CUPS 1.5@ ****/ + /**** Server credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/ /* diff --git a/cups/http-private.h b/cups/http-private.h index e40ba734c..c93807a61 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -296,9 +296,9 @@ struct _http_s /**** HTTP connection structure. ****/ # endif /* HAVE_AUTHORIZATION_H */ /**** New in CUPS 1.5 ****/ http_tls_credentials_t tls_credentials; - /* TLS credentials @since CUPS 1.5@ */ - _http_timeout_cb_t timeout_cb; /* Timeout callback @since CUPS 1.5@ */ - void *timeout_data; /* User data pointer @since CUPS 1.5@ */ + /* TLS credentials @since CUPS 1.5/Mac OS X 10.7@ */ + _http_timeout_cb_t timeout_cb; /* Timeout callback @since CUPS 1.5/Mac OS X 10.7@ */ + void *timeout_data; /* User data pointer @since CUPS 1.5/Mac OS X 10.7@ */ struct timeval timeout_value; /* Timeout in seconds */ # ifdef HAVE_GSSAPI char gsshost[256]; /* Hostname for Kerberos */ diff --git a/cups/http.c b/cups/http.c index 9e637ee09..c4e7718e1 100644 --- a/cups/http.c +++ b/cups/http.c @@ -259,7 +259,7 @@ static BIO_METHOD http_bio_methods = * * Use @code cupsArrayNew(NULL, NULL)@ to create a credentials array. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ int /* O - 0 on success, -1 on error */ @@ -492,7 +492,7 @@ httpConnectEncrypt( * 'httpCopyCredentials()' - Copy the credentials associated with an encrypted * connection. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ int /* O - Status of call (0 = success) */ @@ -2364,7 +2364,7 @@ httpSetAuthString(http_t *http, /* I - Connection to server */ * 'httpSetCredentials()' - Set the credentials associated with an encrypted * connection. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ int /* O - Status of call (0 = success) */ diff --git a/cups/http.h b/cups/http.h index 0ede1169d..8c4f93533 100644 --- a/cups/http.h +++ b/cups/http.h @@ -251,7 +251,7 @@ typedef enum http_status_e /**** HTTP status codes ****/ HTTP_NOT_SUPPORTED, /* HTTP version not supported */ HTTP_AUTHORIZATION_CANCELED = 1000, /* User canceled authorization @since CUPS 1.4@ */ - HTTP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5@ */ + HTTP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */ HTTP_WEBIF_DISABLED /* Web interface is disabled @private@ */ } http_status_t; @@ -318,7 +318,7 @@ typedef struct http_addrlist_s /**** Socket address list, which is typedef struct _http_s http_t; /**** HTTP connection type ****/ -typedef struct http_credential_s /**** Credential data @since CUPS 1.5@ ****/ +typedef struct http_credential_s /**** Credential data @since CUPS 1.5/Mac OS X 10.7@ ****/ { void *data; /* Pointer to credential data */ size_t datalen; /* Credential length */ @@ -451,8 +451,8 @@ extern void httpSetAuthString(http_t *http, const char *scheme, extern int httpAddCredential(cups_array_t *credentials, const void *data, size_t datalen) _CUPS_API_1_5; -extern int httpCopyCredentials(http_t *http, - cups_array_t **credentials) +extern int httpCopyCredentials(http_t *http, + cups_array_t **credentials) _CUPS_API_1_5; extern void httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5; extern int httpSetCredentials(http_t *http, cups_array_t *certs) diff --git a/cups/ipp.h b/cups/ipp.h index e72cf5ace..b3e9eb92e 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -3,7 +3,7 @@ * * Internet Printing Protocol definitions for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -313,8 +313,8 @@ typedef enum ipp_status_e /**** IPP status codes ****/ IPP_MULTIPLE_JOBS_NOT_SUPPORTED, /* server-error-multiple-document-jobs-not-supported */ IPP_PRINTER_IS_DEACTIVATED, /* server-error-printer-is-deactivated */ - IPP_AUTHENTICATION_CANCELED = 0x1000, /* Authentication canceled by user @since CUPS 1.5@ */ - IPP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5@ */ + IPP_AUTHENTICATION_CANCELED = 0x1000, /* Authentication canceled by user @since CUPS 1.5/Mac OS X 10.7@ */ + IPP_PKI_ERROR, /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */ IPP_UPGRADE_REQUIRED /* TLS upgrade required */ } ipp_status_t; #define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED diff --git a/cups/ppd.h b/cups/ppd.h index 32a2f1e4e..1aaa139bc 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -274,7 +274,7 @@ typedef struct ppd_coption_s /**** Custom Option @since CUPS 1.2/Mac OS X 10.5@ } ppd_coption_t; typedef struct _ppd_cache_s _ppd_cache_t; - /**** PPD cache and mapping data @since CUPS 1.5@ @private@ ****/ + /**** PPD cache and mapping data @since CUPS 1.5/Mac OS X 10.7@ @private@ ****/ typedef struct ppd_file_s /**** PPD File ****/ { @@ -340,7 +340,7 @@ typedef struct ppd_file_s /**** PPD File ****/ cups_array_t *cups_uiconstraints; /* cupsUIConstraints @since CUPS 1.4/Mac OS X 10.6@ @private@ */ /**** New in CUPS 1.5 ****/ - _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5@ @private@ */ + _ppd_cache_t *cache; /* PPD cache and mapping data @since CUPS 1.5/Mac OS X 10.7@ @private@ */ } ppd_file_t; diff --git a/cups/raster.h b/cups/raster.h index 4437accb5..1510df2d6 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -187,7 +187,7 @@ enum cups_mode_e /**** cupsRasterOpen modes ****/ CUPS_RASTER_READ = 0, /* Open stream for reading */ CUPS_RASTER_WRITE = 1, /* Open stream for writing */ CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/Mac OS X 10.5@ */ - CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5@ */ + CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/Mac OS X 10.7@ */ }; typedef enum cups_mode_e cups_mode_t; /**** cupsRasterOpen modes ****/ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index a16b330b6..ac91a5292 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -63,7 +63,7 @@ enum cups_sc_command_e /**** Request command codes ****/ CUPS_SC_CMD_GET_STATE = 5, /* Return the device state */ CUPS_SC_CMD_SNMP_GET = 6, /* Query an SNMP OID @since CUPS 1.4/Mac OS X 10.6@ */ CUPS_SC_CMD_SNMP_GET_NEXT = 7, /* Query the next SNMP OID @since CUPS 1.4/Mac OS X 10.6@ */ - CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5@ */ + CUPS_SC_CMD_GET_CONNECTED = 8, /* Return whether the backend is "connected" to the printer @since CUPS 1.5/Mac OS X 10.7@ */ CUPS_SC_CMD_MAX /* End of valid values @private@ */ }; typedef enum cups_sc_command_e cups_sc_command_t; diff --git a/cups/usersys.c b/cups/usersys.c index b925bea7d..c635ac9e6 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -185,7 +185,7 @@ cupsServer(void) * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ void @@ -209,7 +209,7 @@ cupsSetClientCertCB( * program. Multi-threaded programs that override the setting need to do so in * each thread for the same setting to be used. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ int /* O - Status of call (0 = success) */ @@ -376,7 +376,7 @@ cupsSetServer(const char *server) /* I - Server name */ * in a program. Multi-threaded programs that override the callback need to do * so in each thread for the same callback to be used. * - * @since CUPS 1.5@ + * @since CUPS 1.5/Mac OS X 10.7@ */ void diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 459f9c417..147251ebd 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -343,9 +343,9 @@ div.contents ul.subcontents li {