From 27d73f8d4628853c5a8a245dd83916ce7bc800c7 Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Sat, 11 Sep 2021 14:23:30 -0400 Subject: [PATCH 01/16] scheduler/log.c: Use [Job N] even for syslog Cherry picked from https://github.com/OpenPrinting/cups/pull/154 --- scheduler/log.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scheduler/log.c b/scheduler/log.c index 2bd1952f7..efc16ad9d 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -569,11 +569,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ * Format and write the log message... */ -#ifdef HAVE_SYSTEMD_SD_JOURNAL_H - if (job && strcmp(ErrorLog, "syslog")) -#else if (job) -#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ snprintf(jobmsg, sizeof(jobmsg), "[Job %d] %s", job->id, message); else strlcpy(jobmsg, message, sizeof(jobmsg)); -- 2.39.2 From a3053a003891348937fc357f1528acb80441bc28 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 13 Sep 2021 08:20:44 -0400 Subject: [PATCH 02/16] Add a pointer to OpenPrinting CUPS and clarify that Apple CUPS is what is shipped with macOS and iOS. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c97cf2597..a470ecd06 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ -README - CUPS v2.3.5 - 2021-04-26 -================================= +README - Apple CUPS v2.3.5 - 2021-09-13 +======================================= + +> Note: Apple CUPS is the version of CUPS that is shipped with macOS and iOS. +> For the current version of CUPS that is used on other operating systems, see +> for details. + INTRODUCTION ------------ -- 2.39.2 From 7a767e0b3ea685f6c0b0beac97c8ae7060dd9595 Mon Sep 17 00:00:00 2001 From: Alfonso Gregory <83477269+AtariDreams@users.noreply.github.com> Date: Wed, 15 Sep 2021 13:28:13 -0400 Subject: [PATCH 03/16] Fix swapped arguments --- ppdc/ppdc-source.cxx | 4 ++-- ppdc/ppdc.cxx | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index a42449765..aec291314 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -537,7 +537,7 @@ ppdcSource::get_color_profile( for (i = 0; i < 9; i ++) m[i] = get_float(fp); - return (new ppdcProfile(resolution, media_type, g, d, m)); + return (new ppdcProfile(resolution, media_type, d, g, m)); } @@ -1880,7 +1880,7 @@ ppdcSource::get_simple_profile(ppdcFile *fp) } // Return the new profile... - return (new ppdcProfile(resolution, media_type, g, kd, m)); + return (new ppdcProfile(resolution, media_type, kd, g, m)); } diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 304649174..385f45641 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -229,7 +229,6 @@ main(int argc, // I - Number of command-line arguments default : // Unknown usage(); - break; } } else @@ -393,7 +392,7 @@ main(int argc, // I - Number of command-line arguments return (1); } - if (templocales != locales) + if (templocales && templocales != locales) templocales->release(); cupsFileClose(fp); -- 2.39.2 From a27ee6ecdafc0c4ae060f17354183179d3a4c969 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 15 Sep 2021 16:04:31 -0400 Subject: [PATCH 04/16] Return kDNSServiceErr_ServiceNotRunning when Bonjour for Windows not installed. --- vcnet/dns_sd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vcnet/dns_sd.c b/vcnet/dns_sd.c index 25131dd6c..952367928 100644 --- a/vcnet/dns_sd.c +++ b/vcnet/dns_sd.c @@ -102,7 +102,7 @@ DNSServiceErrorType DNSSD_API DNSServiceAddRecord if (dnssd_add_record) return (*dnssd_add_record)(sdRef, RecordRef, flags, rrtype, rdlen, rdata, ttl); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -124,7 +124,7 @@ DNSServiceErrorType DNSSD_API DNSServiceBrowse if (dnssd_browse) return (*dnssd_browse)(sdRef, flags, interfaceIndex, regtype, domain, callBack, context); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -156,7 +156,7 @@ DNSServiceErrorType DNSSD_API DNSServiceCreateConnection(DNSServiceRef *sdRef) if (dnssd_create_connection) return (*dnssd_create_connection)(sdRef); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -169,7 +169,7 @@ DNSServiceErrorType DNSSD_API DNSServiceProcessResult(DNSServiceRef sdRef) if (dnssd_process_result) return (*dnssd_process_result)(sdRef); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -192,7 +192,7 @@ DNSServiceErrorType DNSSD_API DNSServiceQueryRecord if (dnssd_query_record) return (*dnssd_query_record)(sdRef, flags, interfaceIndex, fullname, rrtype, rrclass, callBack, context); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -216,7 +216,7 @@ int DNSSD_API DNSServiceRefSockFD(DNSServiceRef sdRef) if (dnssd_sock_fd) return (*dnssd_sock_fd)(sdRef); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -243,7 +243,7 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister if (dnssd_register) return (*dnssd_register)(sdRef, flags, interfaceIndex, name, regtype, domain, host, port, txtLen, txtRecord, callBack, context); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -261,7 +261,7 @@ DNSServiceErrorType DNSSD_API DNSServiceRemoveRecord if (dnssd_remove_record) return (*dnssd_remove_record)(sdRef, RecordRef, flags); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -284,7 +284,7 @@ DNSServiceErrorType DNSSD_API DNSServiceResolve if (dnssd_resolve) return (*dnssd_resolve)(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } @@ -305,7 +305,7 @@ DNSServiceErrorType DNSSD_API DNSServiceUpdateRecord if (dnssd_update_record) return (*dnssd_update_record)(sdRef, RecordRef, flags, rdlen, rdata, ttl); else - return (-1); + return (kDNSServiceErr_ServiceNotRunning); } -- 2.39.2 From 1390d9d63aacea226686cfca5da9841850db1562 Mon Sep 17 00:00:00 2001 From: Alfonso Gregory <83477269+AtariDreams@users.noreply.github.com> Date: Wed, 15 Sep 2021 16:38:00 -0400 Subject: [PATCH 05/16] Fix missing comma --- tools/ippeveprinter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c index b38a7b0f6..15caa69d8 100644 --- a/tools/ippeveprinter.c +++ b/tools/ippeveprinter.c @@ -4321,7 +4321,7 @@ load_legacy_attributes( "oe_photo-l_3.5x5in", /* Photo L */ "na_index-4x6_4x6in", /* Photo 4x6 */ "iso_a6_105x148mm", /* A6 */ - "na_5x7_5x7in" /* Photo 5x7 aka 2L */ + "na_5x7_5x7in", /* Photo 5x7 aka 2L */ "iso_a5_148x210mm", /* A5 */ }; static const char * const media_ready[] = -- 2.39.2 From 819aaba77e9b6b5340c9d7799d26e8347f0ac212 Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Fri, 17 Sep 2021 10:34:00 -0400 Subject: [PATCH 06/16] Don't use comma after last enum --- cups/http.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cups/http.h b/cups/http.h index 01a0321df..45761a7ca 100644 --- a/cups/http.h +++ b/cups/http.h @@ -346,7 +346,7 @@ typedef enum http_trust_e /**** Level of trust for credentials @since CUPS 2.0/ HTTP_TRUST_CHANGED, /* Credentials have changed */ HTTP_TRUST_EXPIRED, /* Credentials are expired */ HTTP_TRUST_RENEWED, /* Credentials have been renewed */ - HTTP_TRUST_UNKNOWN, /* Credentials are unknown/new */ + HTTP_TRUST_UNKNOWN /* Credentials are unknown/new */ } http_trust_t; typedef enum http_uri_status_e /**** URI separation status @since CUPS 1.2@ ****/ -- 2.39.2 From 14a3c78b912afddc0b0157c68cbd44d8268420ef Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Fri, 17 Sep 2021 12:12:21 -0400 Subject: [PATCH 07/16] Use correct parameter name for delete_message --- notifier/rss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notifier/rss.c b/notifier/rss.c index 44d368c70..516b61545 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -46,7 +46,7 @@ static char *rss_password; /* Password for remote RSS */ */ static int compare_rss(_cups_rss_t *a, _cups_rss_t *b); -static void delete_message(_cups_rss_t *rss); +static void delete_message(_cups_rss_t *msg); static void load_rss(cups_array_t *rss, const char *filename); static _cups_rss_t *new_message(int sequence_number, char *subject, char *text, char *link_url, -- 2.39.2 From 34db0206c14d6b000c54ab48eccb11cb31feff5f Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Mon, 27 Sep 2021 13:23:24 -0400 Subject: [PATCH 08/16] Change job state to IPP_JOB_HELD when job is restarted with appropriate job-held-until attribute. --- scheduler/ipp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 7d51bc5b5..2e7e57917 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -9372,11 +9372,10 @@ restart_job(cupsd_client_t *con, /* I - Client connection */ cupsdLogJob(job, CUPSD_LOG_DEBUG, "Restarted by \"%s\" with job-hold-until=%s.", username, attr->values[0].string.text); - cupsdSetJobHoldUntil(job, attr->values[0].string.text, 0); - - cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED | CUPSD_EVENT_JOB_STATE, - NULL, job, "Job restarted by user with job-hold-until=%s", - attr->values[0].string.text); + cupsdSetJobHoldUntil(job, attr->values[0].string.text, 1); + cupsdSetJobState(job, IPP_JOB_HELD, CUPSD_JOB_DEFAULT, + "Job restarted by user with job-hold-until=%s", + attr->values[0].string.text); } else { -- 2.39.2 From 6cf6e275ed939ba21c727af7ca315711f781ec13 Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Thu, 30 Sep 2021 13:03:58 -0400 Subject: [PATCH 09/16] Expand whitelist for use of "offline-report" Cherry picked from https://github.com/OpenPrinting/cups/commit/17ee0b4f9c5f312ae7099e7627aba2b5e6ed0c8d --- scheduler/job.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scheduler/job.c b/scheduler/job.c index cafdf5a46..351d43b11 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -3112,8 +3112,7 @@ finalize_job(cupsd_job_t *job, /* I - Job */ * rarely have current information for network devices... */ - if (strncmp(job->printer->device_uri, "usb:", 4) && - strncmp(job->printer->device_uri, "ippusb:", 7)) + if (!strstr(job->printer->device_uri, "usb:")) cupsdSetPrinterReasons(job->printer, "-offline-report"); /* -- 2.39.2 From 092c373ee72162836519f2232f19b136823dad8b Mon Sep 17 00:00:00 2001 From: Rose <83477269+AtariDreams@users.noreply.github.com> Date: Fri, 1 Oct 2021 10:41:58 -0400 Subject: [PATCH 10/16] Add buffer range check. --- cups/snprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cups/snprintf.c b/cups/snprintf.c index e4eb3e975..066252ee7 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -323,8 +323,8 @@ _cups_vsnprintf(char *buffer, /* O - Output buffer */ * Nul-terminate the string and return the number of characters needed. */ - if (bufptr) - *bufptr = '\0'; + if (bufptr && bufptr < bufend) + *bufptr = '\0'; return (bytes); } -- 2.39.2 From 0067573264fa0ed44d620ace5eda346d967dd4ec Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 1 Oct 2021 11:12:13 -0400 Subject: [PATCH 11/16] Merge relevant portion of _cupsGet1284Values changes in OpenPrinting (Issue #5972) --- cups/options.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cups/options.c b/cups/options.c index 11814c9af..e45858c2c 100644 --- a/cups/options.c +++ b/cups/options.c @@ -603,16 +603,15 @@ _cupsGet1284Values( if (ptr < (value + sizeof(value) - 1)) *ptr++ = *device_id; - if (!*device_id) - break; - while (ptr > value && _cups_isspace(ptr[-1])) ptr --; *ptr = '\0'; - device_id ++; - num_values = cupsAddOption(key, value, num_values, values); + + if (!*device_id) + break; + device_id ++; } return (num_values); -- 2.39.2 From 696f74ae67a56ccb9362cc9a1f63fbc197e89875 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 1 Oct 2021 11:21:53 -0400 Subject: [PATCH 12/16] Move ListenBackLog to the list of deprecated directives (Issue #5975) --- doc/help/man-backend.html | 2 +- doc/help/man-cancel.html | 4 ++-- doc/help/man-classes.conf.html | 6 ++--- doc/help/man-cups-files.conf.html | 8 +++---- doc/help/man-cups-lpd.html | 2 +- doc/help/man-cups-snmp.conf.html | 4 ++-- doc/help/man-cups-snmp.html | 2 +- doc/help/man-cups.html | 6 ++--- doc/help/man-cupsctl.html | 4 ++-- doc/help/man-cupsd-helper.html | 6 ++--- doc/help/man-cupsd-logs.html | 16 ++++++------- doc/help/man-cupsd.conf.html | 36 +++++++++++++--------------- doc/help/man-cupsd.html | 6 ++--- doc/help/man-cupsfilter.html | 2 +- doc/help/man-filter.html | 4 ++-- doc/help/man-lp.html | 6 ++--- doc/help/man-lpadmin.html | 6 ++--- doc/help/man-lpr.html | 6 ++--- doc/help/man-mailto.conf.html | 2 +- doc/help/man-mime.convs.html | 6 ++--- doc/help/man-mime.types.html | 6 ++--- doc/help/man-notifier.html | 2 +- doc/help/man-printers.conf.html | 8 +++---- doc/help/man-subscriptions.conf.html | 8 +++---- man/cupsd.conf.5 | 18 +++++++------- 25 files changed, 86 insertions(+), 90 deletions(-) diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index b1a0385d5..953a26789 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -178,7 +178,7 @@ programs to send print jobs or lpinfo(8) to query for available printers using the backend. The one exception is the SNMP backend - see -cups-snmp(8) +cups-snmp(8) for more information.

Notes

CUPS printer drivers and backends are deprecated and will no longer be supported in a future feature release of CUPS. diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html index ef6f3f45d..c02f6f1ef 100644 --- a/doc/help/man-cancel.html +++ b/doc/help/man-cancel.html @@ -75,9 +75,9 @@ Cancel all jobs:

Notes

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

See Also

-cupsd.conf(5), +cupsd.conf(5), lp(1), lpmove(8), lpstat(1), diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html index da5126d60..f30ec909e 100644 --- a/doc/help/man-classes.conf.html +++ b/doc/help/man-classes.conf.html @@ -12,14 +12,14 @@ 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 maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

-cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 27a1b60da..c567cbba7 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -11,7 +11,7 @@ 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). +cupsd(8). It is normally located in the /etc/cups directory.

Each line in the file can be a configuration directive, a blank line, or a comment. Configuration directives typically consist of a name and zero or more values separated by whitespace. @@ -19,7 +19,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Directives

The following directives are understood by -cupsd(8): +cupsd(8):
AccessLog
AccessLog filename @@ -201,8 +201,8 @@ command is used instead.

See Also

classes.conf(5), cups(1), -cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index 7283d7563..ad0e68ed0 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -103,7 +103,7 @@ Simply enable the service using the corresponding control program.

See Also

cups(1), -cupsd(8), +cupsd(8), inetconv(1m), inetd(8), launchd(8), diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html index fbd2dc4eb..d61d8340f 100644 --- a/doc/help/man-cups-snmp.conf.html +++ b/doc/help/man-cups-snmp.conf.html @@ -15,7 +15,7 @@ The 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). +cups-snmp(8).

Directives

The following directives are understood by the CUPS network backends:
@@ -51,7 +51,7 @@ CUPS backends are deprecated and will no longer be supported in a future feature Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

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

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html index 9ff2b9aef..c7c17f7f4 100644 --- a/doc/help/man-cups-snmp.html +++ b/doc/help/man-cups-snmp.html @@ -47,7 +47,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni

See Also

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

Copyright

diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html index 769ffe64c..d75ddc5b0 100644 --- a/doc/help/man-cups.html +++ b/doc/help/man-cups.html @@ -102,13 +102,13 @@ Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

cancel(1), -client.conf(7), +client.conf(7), cupsctl(8), -cupsd(8), +cupsd(8), lp(1), lpadmin(8), lpinfo(8), -lpoptions(1), +lpoptions(1), lpr(1), lprm(1), lpq(1), diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html index 897b0541e..c52125fc7 100644 --- a/doc/help/man-cupsctl.html +++ b/doc/help/man-cupsctl.html @@ -83,8 +83,8 @@ Disable printer sharing:

Known Issues

You cannot set the Listen or Port directives using cupsctl.

See Also

-cupsd.conf(5), -cupsd(8), +cupsd.conf(5), +cupsd(8),
CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html index 308a3a236..e701445d6 100644 --- a/doc/help/man-cupsd-helper.html +++ b/doc/help/man-cupsd-helper.html @@ -44,7 +44,7 @@ cupsd-helper - cupsd helper programs (deprecated) argvN

Description

The cupsd-helper programs perform long-running operations on behalf of the scheduler, -cupsd(8). +cupsd(8). The cups-deviced helper program runs each CUPS backend(7) with no arguments in order to discover the available printers. @@ -76,8 +76,8 @@ Printers that do not support IPP can be supported using applications such as

See Also

backend(7), cups(1), -cupsd(8), -cupsd.conf(5), +cupsd(8), +cupsd.conf(5), filter(7), ppdcfile(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html index 42d06faad..11aac7a76 100644 --- a/doc/help/man-cupsd-logs.html +++ b/doc/help/man-cupsd-logs.html @@ -10,12 +10,12 @@

Name

cupsd-logs - cupsd log files (access_log, error_log, and page_log)

Description

-cupsd(8) +cupsd(8) normally maintains three log files: access_log to track requests that are submitted to the scheduler, error_log to track progress and errors, and page_log to track pages that are printed. Configuration directives in -cupsd.conf(5) +cupsd.conf(5) and -cups-files.conf(5) +cups-files.conf(5) control what information is logged and where it is stored.

Access Log File Format

The access_log file lists each HTTP resource that is accessed by a web browser or client. @@ -93,7 +93,7 @@ For POST requests the bytes field contains the number of bytes of non-IPP data t

The ipp-status field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.

Error Log File Format

The error_log file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the -cupsd.conf(5) +cupsd.conf(5) file controls which messages are logged: 
 
@@ -158,7 +158,7 @@ For example the entry for a two page job called "myjob" might look like:
The PageLogFormat directive in the -cupsd.conf(5) +cupsd.conf(5) file can be used to change this information.

The printer field contains the name of the printer that printed the page. If you send a job to a printer class, this field will contain the name of the printer that was assigned the job. @@ -173,9 +173,9 @@ The format of this field is identical to the data-time field in the access_lo

The media field contains a copy of the media or media-col/media-size attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

The sides field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.

See Also

-cupsd(8), -cupsd.conf(5), -cups-files.conf(5), +cupsd(8), +cupsd.conf(5), +cups-files.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 6252546c5..70e00b5be 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -13,7 +13,7 @@ cupsd.conf - server configuration file for cups The cupsd.conf file configures the CUPS scheduler, -cupsd(8). +cupsd(8). It is normally located in the /etc/cups directory. @@ -23,7 +23,7 @@ The configuration directive name and values are case-insensitive. Comment lines start with the # character.

Top-level Directives

The following top-level directives are understood by -cupsd(8): +cupsd(8):
AccessLogLevel config
AccessLogLevel actions @@ -119,7 +119,7 @@ The default service name is "http."
HostNameLookups Double
Specifies whether to do reverse lookups on connecting clients. The "Double" setting causes -cupsd(8) +cupsd(8) to verify that the hostname resolved from the address matches one of the addresses returned for that hostname. Double lookups also prevent clients with unregistered addresses from connecting to your server. The default is "Off" to avoid the potential server performance problems with hostname lookups. @@ -128,7 +128,7 @@ Only set this option to "On" or "Double" if absolutely required.
Specifies the length of time to wait before shutting down due to inactivity. The default is "60" seconds. Note: Only applicable when -cupsd(8) +cupsd(8) is run on-demand (e.g., with -l).
JobKillDelay seconds
Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job. @@ -160,11 +160,6 @@ The default is "0" which disables the limit check.
Listens to the specified address and port or domain socket path for connections. Multiple Listen directives can be provided to listen on multiple addresses. The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks. -
ListenBackLog number -
Specifies the number of pending connections that will be allowed. -This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections. -When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones. -The default is the OS-defined default limit, typically either "5" for older operating systems or "128" for newer operating systems.
<Location /path> ... </Location>
Specifies access control for the named location. Paths are documented below in the section "LOCATION PATHS". @@ -304,7 +299,7 @@ The default is "No".

Http Method Names

The following HTTP methods are supported by -cupsd(8): +cupsd(8):
GET
Used by a client to download icons and other printer resources and to access the CUPS web interface. @@ -319,7 +314,7 @@ The following HTTP methods are supported by

Ipp Operation Names

The following IPP operations are supported by -cupsd(8): +cupsd(8):
CUPS-Accept-Jobs
Allows a printer to accept new jobs. @@ -412,7 +407,7 @@ The following IPP operations are supported by

Location Paths

The following paths are commonly used when configuring -cupsd(8): +cupsd(8):
/
The path for all get operations (get-printers, get-jobs, etc.) @@ -492,7 +487,7 @@ The default value is "IfRequested".
Require user {user-name|@group-name} ...
Specifies that an authenticated user must match one of the named users or be a member of one of the named groups. The group name "@SYSTEM" corresponds to the list of groups defined by the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file. The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job. Note: The 'root' user is not special and must be granted privileges like any other user account. @@ -515,7 +510,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
JobPrivateValues all
JobPrivateValues default @@ -531,7 +526,7 @@ The "default" access list is "@OWNER @SYSTEM". "@ACL" maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. "@OWNER" maps to the job's owner. "@SYSTEM" maps to the groups listed for the SystemGroup directive in the -cups-files.conf(5) +cups-files.conf(5) file.
SubscriptionPrivateValues all
SubscriptionPrivateValues default @@ -553,6 +548,9 @@ The default is no classification banner.

Specifies whether users may override the classification (cover page) of individual print jobs using the "job-sheets" option. The default is "No". +
ListenBackLog number +
Specified the number of pending connections that will be allowed. +The scheduler now uses the value "128" on all platforms.
PageLogFormat format-string
Specifies the format of PageLog lines. Sequences beginning with percent (%) characters are replaced with the corresponding information, while all other characters are copied literally. @@ -578,7 +576,7 @@ The default is "128m".

Notes

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) +cups-files.conf(5) file instead in order to prevent certain types of privilege escalation attacks.

The scheduler MUST be restarted manually after making changes to the cupsd.conf file. On Linux this is typically done using the @@ -613,15 +611,15 @@ Require authentication for accesses from outside the 10. network:

See Also

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

Copyright

-Copyright © 2007-2019 by Apple Inc. +Copyright © 2007-2021 by Apple Inc. diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html index d99136a1b..589207103 100644 --- a/doc/help/man-cupsd.html +++ b/doc/help/man-cupsd.html @@ -104,9 +104,9 @@ in the foreground with a test configuration file called backend(7), classes.conf(5), cups(1), -cups-files.conf(5), -cups-lpd(8), -cupsd.conf(5), +cups-files.conf(5), +cups-lpd(8), +cupsd.conf(5), cupsd-helper(8), cupsd-logs(8), filter(7), diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html index 6e9d81d89..bce2134db 100644 --- a/doc/help/man-cupsfilter.html +++ b/doc/help/man-cupsfilter.html @@ -117,7 +117,7 @@ The following command will generate a PDF preview of job 42 for a printer named

See Also

cups(1), -cupsd.conf(5), +cupsd.conf(5), filter(7), mime.convs(7), mime.types(7), diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html index c8070497b..65d896b57 100644 --- a/doc/help/man-filter.html +++ b/doc/help/man-filter.html @@ -177,8 +177,8 @@ program to use the appropriate filters to do the conversions you need.

See Also

backend(7), cups(1), -cups-files.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd(8), cupsfilter(8),
CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html index 09b921fb3..ba221270f 100644 --- a/doc/help/man-lp.html +++ b/doc/help/man-lp.html @@ -86,7 +86,7 @@ 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) +lpoptions(1) command is used, followed by the default set using the lpadmin(8) command. @@ -138,7 +138,7 @@ The page numbers refer to the output pages and not the document's original pages

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -190,7 +190,7 @@ Print a presentation document 2-up to a printer called "bar":

See Also

cancel(1), lpadmin(8), -lpoptions(1), +lpoptions(1), lpq(1), lpr(1), lprm(1), diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index 1ce68ab29..755bf2fd9 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -60,7 +60,7 @@ Subsequent print jobs submitted via the or lpr(1) commands will use this destination unless the user specifies otherwise with the -lpoptions(1) +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. @@ -99,7 +99,7 @@ The value is an integer number of seconds; 86,400 seconds are in one day.

-o name=value
Sets a PPD option for the printer. PPD options can be listed using the -l option with the -lpoptions(1) +lpoptions(1) command.
-o name-default=value
Sets a default server-side option for the destination. @@ -189,7 +189,7 @@ Create an IPP Everywhere print queue: cupsaccept(8), cupsenable(8), lpinfo(8), -lpoptions(1), +lpoptions(1), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html index 37970b408..c945ea9c8 100644 --- a/doc/help/man-lpr.html +++ b/doc/help/man-lpr.html @@ -56,7 +56,7 @@ If no files are listed on the command-line, lpr reads the print file from

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) +lpoptions(1) command is used, followed by the default set using the lpadmin(8) command. @@ -97,7 +97,7 @@ This option is equivalent to -o prettyprint and is only useful when print

Common Job Options

Aside from the printer-specific options reported by the -lpoptions(1) +lpoptions(1) command, the following generic options are available:
-o job-sheets=name @@ -148,7 +148,7 @@ Print a presentation document 2-up to a printer called "foo": cancel(1), lp(1), lpadmin(8), -lpoptions(1), +lpoptions(1), lpq(1), lprm(1), lpstat(1), diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html index 47dc7a455..8f5b87cbb 100644 --- a/doc/help/man-mailto.conf.html +++ b/doc/help/man-mailto.conf.html @@ -33,7 +33,7 @@ If multiple lines are present, only the last one is used.
Specifies a prefix string for the subject line of an email notification.

See Also

-cupsd(8), +cupsd(8), CUPS Online Help (http://localhost:631/help)

Copyright

Copyright © 2007-2019 by Apple Inc. diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index 6afbc71a3..e4d8813c8 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -46,9 +46,9 @@ CUPS filters are deprecated and will no longer be supported in a future feature Printers that do not support IPP can be supported using applications such as ippeveprinter(1).

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), cupsfilter(8), mime.types(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index 28d166cac..cc4393ef8 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -84,9 +84,9 @@ Define two MIME media types for raster data, with one being a subset with higher string(4,PwgRaster<00>) priority(150)

See Also

-cups-files.conf(5), -cupsd.conf(5), -cupsd(8), +cups-files.conf(5), +cupsd.conf(5), +cupsd(8), cupsfilter(8), mime.convs(5), CUPS Online Help (http://localhost:631/help) diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html index 27e051fdb..d8d96d36c 100644 --- a/doc/help/man-notifier.html +++ b/doc/help/man-notifier.html @@ -27,7 +27,7 @@ Notifiers are encouraged to exit after a suitable period of inactivity, however Notifiers inherit the environment and can use the logging mechanism documented in filter(7).

See Also

-cupsd(8), +cupsd(8), filter(7), CUPS Online Help (http://localhost:631/help)

Copyright

diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html index a2f8ba68e..4a3123ea5 100644 --- a/doc/help/man-printers.conf.html +++ b/doc/help/man-printers.conf.html @@ -11,15 +11,15 @@ 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 maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

classes.conf(5), -cups-files.conf(5), -cupsd(8), -cupsd.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), subscriptions.conf(5), diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html index fb7ec0287..325f2cd28 100644 --- a/doc/help/man-subscriptions.conf.html +++ b/doc/help/man-subscriptions.conf.html @@ -12,16 +12,16 @@ subscriptions.conf - subscription configuration file for cups

Description

The subscriptions.conf file defines the local event notification subscriptions that are active. It is normally located in the /etc/cups directory and is maintained by the -cupsd(8) +cupsd(8) program. This file is not intended to be edited or managed manually.

Notes

The name, location, and format of this file are an implementation detail that will change in future releases of CUPS.

See Also

classes.conf(5), -cups-files.conf(5), -cupsd(8), -cupsd.conf(5), +cups-files.conf(5), +cupsd(8), +cupsd.conf(5), mime.convs(5), mime.types(5), printers.conf(5), diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5 index 643651269..beeccc69a 100644 --- a/man/cupsd.conf.5 +++ b/man/cupsd.conf.5 @@ -1,13 +1,13 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright © 2007-2019 by Apple Inc. +.\" Copyright © 2007-2021 by Apple Inc. .\" Copyright © 1997-2006 by Easy Software Products. .\" .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cupsd.conf 5 "CUPS" "16 July 2019" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "1 October 2021" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -240,13 +240,6 @@ The default is "0" which disables the limit check. Listens to the specified address and port or domain socket path for connections. Multiple Listen directives can be provided to listen on multiple addresses. The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks. -.\"#ListenBackLog -.TP 5 -\fBListenBackLog \fInumber\fR -Specifies the number of pending connections that will be allowed. -This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections. -When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones. -The default is the OS-defined default limit, typically either "5" for older operating systems or "128" for newer operating systems. .\"#Location .TP 5 \fB \fR... \fB\fR @@ -824,6 +817,11 @@ The default is no classification banner. .br Specifies whether users may override the classification (cover page) of individual print jobs using the "job-sheets" option. The default is "No". +.\"#ListenBackLog +.TP 5 +\fBListenBackLog \fInumber\fR +Specified the number of pending connections that will be allowed. +The scheduler now uses the value "128" on all platforms. .\"#PageLogFormat .TP 5 \fBPageLogFormat \fIformat-string\fR @@ -897,4 +895,4 @@ Require authentication for accesses from outside the 10. network: .BR subscriptions.conf (5), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright \[co] 2007-2019 by Apple Inc. +Copyright \[co] 2007-2021 by Apple Inc. -- 2.39.2 From 0bc9dc4658c26920a3f66da7dd234be463ca572e Mon Sep 17 00:00:00 2001 From: Steve Algernon Date: Wed, 25 May 2022 11:36:12 -0700 Subject: [PATCH 13/16] CVE-2022-26691: An incorrect comparison in local admin authentication --- scheduler/cert.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scheduler/cert.c b/scheduler/cert.c index 258e8fc83..2a28b568f 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -434,5 +434,9 @@ ctcompare(const char *a, /* I - First string */ b ++; } + // either both *a and *b == '\0', or one points inside a string, + // so factor that in. + result |= (*a ^ *b); + return (result); } -- 2.39.2 From 859ea4481c85a2dd6157396a22b3c8b3b726e06b Mon Sep 17 00:00:00 2001 From: Steve Algernon Date: Wed, 25 May 2022 10:32:35 -0700 Subject: [PATCH 14/16] CUPS v2.3.6 for CVE-2022-26691 --- CHANGES.md | 4 ++++ INSTALL.md | 2 +- README.md | 2 +- config-scripts/cups-compiler.m4 | 4 ++-- configure | 24 ++++++++++++------------ configure.ac | 2 +- cups/cups.h | 6 +++--- cups/cupspm.md | 4 ++-- doc/help/cupspm.html | 4 ++-- locale/cups.pot | 2 +- scripts/makesrcdist | 2 +- vcnet/config.h | 6 +++--- xcode/config.h | 6 +++--- 13 files changed, 36 insertions(+), 32 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index efc6f4fa4..9da22c8e7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ Change History ============== +Changes in CUPS v2.3.6 +---------------------- +- CVE-2022-26691: An incorrect comparison in local admin authentication. + Changes in CUPS v2.3.5 ---------------------- diff --git a/INSTALL.md b/INSTALL.md index a9482fb75..f88dfedff 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -INSTALL - CUPS v2.3.4 - 2020-04-24 (IN PROGRESS) +INSTALL - CUPS v2.3.6 - 2022-05-25 ================================== This file describes how to compile and install CUPS from source code. For more diff --git a/README.md b/README.md index a470ecd06..f48de5367 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -README - Apple CUPS v2.3.5 - 2021-09-13 +README - Apple CUPS v2.3.6 - 2022-05-25 ======================================= > Note: Apple CUPS is the version of CUPS that is shipped with macOS and iOS. diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 2b619977c..604faf1b9 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -169,7 +169,7 @@ if test -n "$GCC"; then fi # Add useful warning options for tracking down problems... - WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion" + WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion -Wno-unused-but-set-variable -Wno-unused-variable" # Test GCC version for certain warning flags since -Werror # doesn't trigger... @@ -182,7 +182,7 @@ if test -n "$GCC"; then # Additional warning options for development testing... if test -d .git; then - WARNING_OPTIONS="-Werror -Wno-error=deprecated-declarations $WARNING_OPTIONS" + WARNING_OPTIONS="-Werror -Wno-error=deprecated-declarations -Wno-unknown-warning-option $WARNING_OPTIONS" fi else # Add vendor-specific compiler options... diff --git a/configure b/configure index 0abf8c1ad..642b3058d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.3.5. +# Generated by GNU Autoconf 2.69 for CUPS 2.3.6. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.3.5' -PACKAGE_STRING='CUPS 2.3.5' +PACKAGE_VERSION='2.3.6' +PACKAGE_STRING='CUPS 2.3.6' PACKAGE_BUGREPORT='https://github.com/apple/cups/issues' PACKAGE_URL='https://www.cups.org/' @@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures CUPS 2.3.5 to adapt to many kinds of systems. +\`configure' configures CUPS 2.3.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1532,7 +1532,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.3.5:";; + short | recursive ) echo "Configuration of CUPS 2.3.6:";; esac cat <<\_ACEOF @@ -1713,7 +1713,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.3.5 +CUPS configure 2.3.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2177,7 +2177,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by CUPS $as_me 2.3.5, which was +It was created by CUPS $as_me 2.3.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2694,7 +2694,7 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.3.5" +CUPS_VERSION="2.3.6" CUPS_REVISION="" CUPS_BUILD="cups-$CUPS_VERSION" @@ -6905,7 +6905,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi # Add useful warning options for tracking down problems... - WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion" + WARNING_OPTIONS="-Wall -Wno-format-y2k -Wunused -Wno-unused-result -Wsign-conversion -Wno-unused-but-set-variable -Wno-unused-variable" # Test GCC version for certain warning flags since -Werror # doesn't trigger... @@ -6918,7 +6918,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Additional warning options for development testing... if test -d .git; then - WARNING_OPTIONS="-Werror -Wno-error=deprecated-declarations $WARNING_OPTIONS" + WARNING_OPTIONS="-Werror -Wno-error=deprecated-declarations -Wno-unknown-warning-option $WARNING_OPTIONS" fi else # Add vendor-specific compiler options... @@ -10385,7 +10385,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by CUPS $as_me 2.3.5, which was +This file was extended by CUPS $as_me 2.3.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10448,7 +10448,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -CUPS config.status 2.3.5 +CUPS config.status 2.3.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5ba59dd3e..f8767969d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl We need at least autoconf 2.60... AC_PREREQ(2.60) dnl Package name and version... -AC_INIT([CUPS], [2.3.5], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) +AC_INIT([CUPS], [2.3.6], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/]) sinclude(config-scripts/cups-opsys.m4) sinclude(config-scripts/cups-common.m4) diff --git a/cups/cups.h b/cups/cups.h index 826e600bc..bdf9f7a18 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,7 +1,7 @@ /* * API definitions for CUPS. * - * Copyright © 2007-2021 by Apple Inc. + * Copyright © 2007-2022 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products. * * Licensed under Apache License v2.0. See the file "LICENSE" for more @@ -42,10 +42,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 2.0305 +# define CUPS_VERSION 2.0306 # define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MINOR 3 -# define CUPS_VERSION_PATCH 5 +# define CUPS_VERSION_PATCH 6 # define CUPS_BC_FD 3 /* Back-channel file descriptor for diff --git a/cups/cupspm.md b/cups/cupspm.md index f271c89d3..7e03c3d65 100644 --- a/cups/cupspm.md +++ b/cups/cupspm.md @@ -1,8 +1,8 @@ --- title: CUPS Programming Manual author: Michael R Sweet -copyright: Copyright © 2007-2020 by Apple Inc. All Rights Reserved. -version: 2.3.4 +copyright: Copyright © 2007-2022 by Apple Inc. All Rights Reserved. +version: 2.3.6 ... > Please [file issues on Github](https://github.com/apple/cups/issues) to diff --git a/doc/help/cupspm.html b/doc/help/cupspm.html index e9a80d9c3..677f2bc3c 100644 --- a/doc/help/cupspm.html +++ b/doc/help/cupspm.html @@ -7,8 +7,8 @@ - - + +