From: Michael R Sweet Date: Wed, 10 Mar 2021 21:12:03 +0000 (-0500) Subject: Deprecate cups-config (Issue #97) X-Git-Tag: v2.4b1~188^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87f6532ba1656e73ce7538ab7f098e08128e8b56;p=thirdparty%2Fcups.git Deprecate cups-config (Issue #97) --- diff --git a/CHANGES.md b/CHANGES.md index eadccfe235..0a04a1a1ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,12 +14,15 @@ CUPS v2.4rc1 (Pending) by default (Issue #85) - The `cupsfilter` command now shows error messages when options are used incorrectly (Issue #88) -- Documentation fixes (Issue #92) -- Kerberos (`AuthType Negotiate`) authentication is now deprecated (Issue #98) - The PPD functions now treat boolean values as case-insensitive (Issue #106) - Temporary queue names no longer end with an underscore (Issue #110) - The USB backend now runs as root (Issue #121) +- Added pkg-config file for libcups (Issue #122) - Fixed a PPD memory leak caused by emulator definitions (Issue #124) +- Documentation fixes (Issue #92) +- Localization updates (Issue #123) +- Deprecated cups-config (Issue #97) +- Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98) - Removed support for the (long deprecated and unused) `FontPath`, `LPDConfigFile`, `RIPCache`, and `SMBConfigFile` directives in `cupsd.conf` and `cups-files.conf`. diff --git a/cups-config.in b/cups-config.in index 0e60b49487..f6221b6d74 100755 --- a/cups-config.in +++ b/cups-config.in @@ -11,7 +11,7 @@ # VERSION="@CUPS_VERSION@" -APIVERSION="2.3" +APIVERSION="2.4" BUILD="@CUPS_BUILD@" prefix=@prefix@ @@ -50,7 +50,7 @@ else fi -usage () +usage() { echo "Usage: cups-config --api-version" echo " cups-config --build" @@ -62,6 +62,9 @@ usage () echo " cups-config --serverbin" echo " cups-config --serverroot" echo " cups-config --version" + echo "" + echo "Note: The cups-config utility is deprecated and will be removed in a future" + echo " version of CUPS. Use the pkg-config utility instead." exit $1 } diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html index 563a7e7c55..71b441c631 100644 --- a/doc/help/man-cups-config.html +++ b/doc/help/man-cups-config.html @@ -8,7 +8,7 @@

cups-config(1)

Name

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

Synopsis

cups-config --api-version @@ -48,6 +48,11 @@ cups-config - get cups api, compiler, directory, and link information.

Description

The cups-config command allows application developers to determine the necessary command-line options for the compiler and linker, as well as the installation directories for filters, configuration files, and drivers. All values are reported to the standard output. +Note: +This command is deprecated and will be removed in a future version of CUPS. +The +pkg-config(1) +command should be used instead.

Options

The cups-config command accepts the following command-line options:

@@ -95,6 +100,7 @@ The following options are deprecated but continue to work for backwards compatib

Copyright

Copyright © 2021 by OpenPrinting. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 4d653c90f2..d66f67e55b 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -58,7 +58,6 @@ The default is "No". Specifies whether shared printers are advertised. The default is "No".

DefaultAuthType Basic -

DefaultAuthType Negotiate

Specifies the default type of authentication to use. The default is "Basic". @@ -111,9 +110,6 @@ The default limit is "0". value) of filters that are run to print a job. The nice value ranges from 0, the highest priority, to 19, the lowest priority. The default is 0. -

GSSServiceName name -

Specifies the service name when using Kerberos authentication. -The default service name is "http."

HostNameLookups On

HostNameLookups Off

HostNameLookups Double @@ -464,7 +460,6 @@ The Order directive controls whether Allow lines are evaluated before or after D

AuthType None

AuthType Basic

AuthType Default -

AuthType Negotiate

Specifies the type of authentication required. The value "Default" corresponds to the DefaultAuthType value.

Deny all @@ -547,6 +542,8 @@ The "default" values are "notify-events", "notify-pull-method", "notify-recipien

Deprecated Directives

The following directives are deprecated and will be removed in a future release of CUPS:

AuthType Negotiate +: Specifies Kerberos authentication is required.
Classification banner: Specifies the security classification of the server. @@ -557,6 +554,11 @@ 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". +
DefaultAuthType Negotiate +: Specifies that Kerberos authentication is required by default. +
GSSServiceName name +: Specifies the service name when using Kerberos authentication. +The default service name is "http."
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. diff --git a/man/cups-config.1 b/man/cups-config.1 index 531ed47278..eb6de8123c 100644 --- a/man/cups-config.1 +++ b/man/cups-config.1 @@ -8,9 +8,9 @@ .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH cups-config 1 "CUPS" "2021-02-28" "OpenPrinting" +.TH cups-config 1 "CUPS" "2021-03-10" "OpenPrinting" .SH NAME -cups\-config \- get cups api, compiler, directory, and link information. +cups\-config \- get cups api, compiler, directory, and link information (deprecated). .SH SYNOPSIS .B cups\-config .I \-\-api\-version @@ -50,6 +50,11 @@ cups\-config \- get cups api, compiler, directory, and link information. .SH DESCRIPTION The \fBcups-config\fR command allows application developers to determine the necessary command-line options for the compiler and linker, as well as the installation directories for filters, configuration files, and drivers. All values are reported to the standard output. +.B Note: +This command is deprecated and will be removed in a future version of CUPS. +The +.BR pkg-config (1) +command should be used instead. .SH OPTIONS The \fBcups-config\fR command accepts the following command-line options: .TP 5 @@ -105,6 +110,7 @@ The following options are deprecated but continue to work for backwards compatib Formerly used to add the CUPS imaging library to the list of libraries. .SH SEE ALSO .BR cups (1), +.BR pkg-config (1), CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2021 by OpenPrinting.