import cups-2.2.6-50.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
0ea1475b6d
commit
641c8711f2
899
SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch
Normal file
899
SOURCES/0001-Update-man-pages-for-h-option-Issue-357.patch
Normal file
@ -0,0 +1,899 @@
|
|||||||
|
From 4d6787bd98c2fac8dcc58f34125d299d82e622aa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael R Sweet <michael.r.sweet@gmail.com>
|
||||||
|
Date: Mon, 2 May 2022 15:35:20 -0400
|
||||||
|
Subject: [PATCH] Update man pages for -h option (Issue #357)
|
||||||
|
|
||||||
|
---
|
||||||
|
CHANGES.md | 1 +
|
||||||
|
doc/help/man-cancel.html | 7 ++++---
|
||||||
|
doc/help/man-cupsctl.html | 7 ++++---
|
||||||
|
doc/help/man-ipptool.html | 6 ++++++
|
||||||
|
doc/help/man-lp.html | 9 +++++----
|
||||||
|
doc/help/man-lpinfo.html | 9 +++++----
|
||||||
|
doc/help/man-lpmove.html | 9 +++++----
|
||||||
|
doc/help/man-lpoptions.html | 17 +++++++++--------
|
||||||
|
doc/help/man-lpq.html | 5 +++--
|
||||||
|
doc/help/man-lpr.html | 5 +++--
|
||||||
|
doc/help/man-lprm.html | 6 +++---
|
||||||
|
doc/help/man-lpstat.html | 5 +++--
|
||||||
|
man/cancel.1 | 9 +++++----
|
||||||
|
man/cupsctl.8 | 9 +++++----
|
||||||
|
man/lp.1 | 11 ++++++-----
|
||||||
|
man/lpinfo.8 | 11 ++++++-----
|
||||||
|
man/lpmove.8 | 11 ++++++-----
|
||||||
|
man/lpoptions.1 | 19 ++++++++++---------
|
||||||
|
man/lpq.1 | 7 ++++---
|
||||||
|
man/lpr.1 | 7 ++++---
|
||||||
|
man/lprm.1 | 8 ++++----
|
||||||
|
man/lpstat.1 | 11 ++++++-----
|
||||||
|
22 files changed, 107 insertions(+), 82 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
|
||||||
|
index d51bb2b91..a0b52369c 100644
|
||||||
|
--- a/doc/help/man-cancel.html
|
||||||
|
+++ b/doc/help/man-cancel.html
|
||||||
|
@@ -12,6 +12,9 @@ cancel - cancel jobs
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>cancel</b>
|
||||||
|
[
|
||||||
|
+<b>-h</b>
|
||||||
|
+<i>hostname[:port]</i>
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
@@ -19,9 +22,6 @@ cancel - cancel jobs
|
||||||
|
] [
|
||||||
|
<b>-a</b>
|
||||||
|
] [
|
||||||
|
-<b>-h</b>
|
||||||
|
-<i>hostname[:port]</i>
|
||||||
|
-] [
|
||||||
|
<b>-u</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
@@ -46,6 +46,7 @@ destinations if none is provided.
|
||||||
|
<dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
|
||||||
|
<dt><b>-h </b><i>hostname</i>[<i>:port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-U </b><i>username</i>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies the username to use when connecting to the server.
|
||||||
|
<dt><b>-u </b><i>username</i>
|
||||||
|
diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
|
||||||
|
index b3f892ef9..e5c98dccb 100644
|
||||||
|
--- a/doc/help/man-cupsctl.html
|
||||||
|
+++ b/doc/help/man-cupsctl.html
|
||||||
|
@@ -12,14 +12,14 @@ cupsctl - configure cupsd.conf options
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>cupsctl</b>
|
||||||
|
[
|
||||||
|
+<b>-h</b>
|
||||||
|
+<i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
-<b>-h</b>
|
||||||
|
-<i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
-] [
|
||||||
|
<b>--</b>[<b>no-</b>]<b>debug-logging</b>
|
||||||
|
] [
|
||||||
|
<b>--</b>[<b>no-</b>]<b>remote-admin</b>
|
||||||
|
@@ -45,6 +45,7 @@ The following options are recognized:
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate username to use when authenticating with the scheduler.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies the server address.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>--</b>[<b>no-</b>]<b>debug-logging</b>
|
||||||
|
<dd style="margin-left: 5.0em">Enables (disables) debug logging to the <i>error_log</i> file.
|
||||||
|
<dt><b>--</b>[<b>no-</b>]<b>remote-admin</b>
|
||||||
|
diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
|
||||||
|
index 81f67d77f..688454c69 100644
|
||||||
|
--- a/doc/help/man-ipptool.html
|
||||||
|
+++ b/doc/help/man-ipptool.html
|
||||||
|
@@ -59,6 +59,8 @@ ipptool - perform internet printing protocol requests
|
||||||
|
<b>-i</b>
|
||||||
|
<i>seconds</i>
|
||||||
|
] [
|
||||||
|
+<b>-j</b>
|
||||||
|
+] [
|
||||||
|
<b>-n</b>
|
||||||
|
<i>repeat-count</i>
|
||||||
|
] [
|
||||||
|
@@ -150,6 +152,10 @@ This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-
|
||||||
|
<i>testfile</i>
|
||||||
|
should be repeated at the specified interval.
|
||||||
|
This option is incompatible with the <b>-X</b> (XML plist output) option.
|
||||||
|
+<dt><b>-j</b>
|
||||||
|
+<dd style="margin-left: 5.0em">Specifies that
|
||||||
|
+<b>ipptool</b>
|
||||||
|
+will produce JSON output.
|
||||||
|
<dt><b>-l</b>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies that plain text output is desired.
|
||||||
|
<dt><b>-n</b><i> repeat-count</i>
|
||||||
|
diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
|
||||||
|
index f70c088d3..6442e900d 100644
|
||||||
|
--- a/doc/help/man-lp.html
|
||||||
|
+++ b/doc/help/man-lp.html
|
||||||
|
@@ -12,6 +12,8 @@ lp - print files
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lp</b>
|
||||||
|
[
|
||||||
|
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
@@ -21,8 +23,6 @@ lp - print files
|
||||||
|
] [
|
||||||
|
<b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
] [
|
||||||
|
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
-] [
|
||||||
|
<b>-m</b>
|
||||||
|
] [
|
||||||
|
<b>-n</b>
|
||||||
|
@@ -51,6 +51,8 @@ lp - print files
|
||||||
|
<br>
|
||||||
|
<b>lp</b>
|
||||||
|
[
|
||||||
|
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
@@ -58,8 +60,6 @@ lp - print files
|
||||||
|
] [
|
||||||
|
<b>-c</b>
|
||||||
|
] [
|
||||||
|
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
-] [
|
||||||
|
<b>-i</b>
|
||||||
|
<i>job-id</i>
|
||||||
|
] [
|
||||||
|
@@ -106,6 +106,7 @@ In CUPS, print files are always sent to the scheduler via IPP which has the same
|
||||||
|
<dd style="margin-left: 5.0em">Prints files to the named printer.
|
||||||
|
<dt><b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Chooses an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-i </b><i>job-id</i>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an existing job to modify.
|
||||||
|
<dt><b>-m</b>
|
||||||
|
diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
|
||||||
|
index a1aed9421..30df7691c 100644
|
||||||
|
--- a/doc/help/man-lpinfo.html
|
||||||
|
+++ b/doc/help/man-lpinfo.html
|
||||||
|
@@ -12,10 +12,10 @@ lpinfo - show available devices or drivers (deprecated)
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpinfo</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
<b>-l</b>
|
||||||
|
] [
|
||||||
|
<b>--device-id</b>
|
||||||
|
@@ -40,10 +40,10 @@ lpinfo - show available devices or drivers (deprecated)
|
||||||
|
<br>
|
||||||
|
<b>lpinfo</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
<b>-l</b>
|
||||||
|
] [
|
||||||
|
<b>--exclude-schemes</b>
|
||||||
|
@@ -66,6 +66,7 @@ The first form (<i>-m</i>) lists the available drivers, while the second form (<
|
||||||
|
<dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Selects an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-l</b>
|
||||||
|
<dd style="margin-left: 5.0em">Shows a "long" listing of devices or drivers.
|
||||||
|
<dt><b>--device-id </b><i>device-id-string</i>
|
||||||
|
diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
|
||||||
|
index d8019ee25..b0db753f9 100644
|
||||||
|
--- a/doc/help/man-lpmove.html
|
||||||
|
+++ b/doc/help/man-lpmove.html
|
||||||
|
@@ -12,10 +12,10 @@ lpmove - move a job or all jobs to a new destination
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpmove</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
]
|
||||||
|
@@ -24,10 +24,10 @@ lpmove - move a job or all jobs to a new destination
|
||||||
|
<br>
|
||||||
|
<b>lpmove</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
]
|
||||||
|
@@ -44,6 +44,7 @@ The <b>lpmove</b> command supports the following options:
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate username.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
</dl>
|
||||||
|
<h2 class="title"><a name="EXAMPLES">Examples</a></h2>
|
||||||
|
Move job 123 from "oldprinter" to "newprinter":
|
||||||
|
diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
|
||||||
|
index 6dda87f64..6af78290b 100644
|
||||||
|
--- a/doc/help/man-lpoptions.html
|
||||||
|
+++ b/doc/help/man-lpoptions.html
|
||||||
|
@@ -12,12 +12,12 @@
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpoptions</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
-<b>-U</b>
|
||||||
|
-<i>username</i>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
+<b>-U</b>
|
||||||
|
+<i>username</i>
|
||||||
|
]
|
||||||
|
<b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
[
|
||||||
|
@@ -26,26 +26,26 @@
|
||||||
|
<br>
|
||||||
|
<b>lpoptions</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
-<b>-U</b>
|
||||||
|
-<i>username</i>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
+<b>-U</b>
|
||||||
|
+<i>username</i>
|
||||||
|
+] [
|
||||||
|
<b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
]
|
||||||
|
<b>-o </b><i>option</i>[<b>=</b><i>value</i>] ...
|
||||||
|
<br>
|
||||||
|
<b>lpoptions</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
-<b>-U</b>
|
||||||
|
-<i>username</i>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
+<b>-U</b>
|
||||||
|
+<i>username</i>
|
||||||
|
+] [
|
||||||
|
<b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
]
|
||||||
|
<b>-r</b>
|
||||||
|
@@ -53,12 +53,12 @@
|
||||||
|
<br>
|
||||||
|
<b>lpoptions</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
-<b>-U</b>
|
||||||
|
-<i>username</i>
|
||||||
|
-] [
|
||||||
|
<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
+<b>-U</b>
|
||||||
|
+<i>username</i>
|
||||||
|
]
|
||||||
|
<b>-x </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
<h2 class="title"><a name="DESCRIPTION">Description</a></h2>
|
||||||
|
@@ -84,6 +84,7 @@
|
||||||
|
This option overrides the system default printer for the current user.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Uses an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-l</b>
|
||||||
|
<dd style="margin-left: 5.0em">Lists the printer specific options and their current settings.
|
||||||
|
<dt><b>-o </b><i>option</i>[<b>=</b><i>value</i>]
|
||||||
|
@@ -119,7 +120,7 @@
|
||||||
|
<a href="man-lprm.html?TOPIC=Man+Pages"><b>lprm</b>(1),</a>
|
||||||
|
CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
|
||||||
|
<h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
|
||||||
|
-Copyright © 2007-2017 by Apple Inc.
|
||||||
|
+Copyright © 2021-2022 by OpenPrinting.
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
|
||||||
|
index 1c9e704ff..19e536d3c 100644
|
||||||
|
--- a/doc/help/man-lpq.html
|
||||||
|
+++ b/doc/help/man-lpq.html
|
||||||
|
@@ -12,13 +12,13 @@ lpq - show printer queue status
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpq</b>
|
||||||
|
[
|
||||||
|
+<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
-<b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
-] [
|
||||||
|
<b>-P </b><i>destination</i>[<b>/</b><i>instance</i>]
|
||||||
|
] [
|
||||||
|
<b>-a</b>
|
||||||
|
@@ -44,6 +44,7 @@ Jobs queued on the default destination will be shown if no printer or class is s
|
||||||
|
<dd style="margin-left: 5.0em">Reports jobs on all printers.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-l</b>
|
||||||
|
<dd style="margin-left: 5.0em">Requests a more verbose (long) reporting format.
|
||||||
|
</dl>
|
||||||
|
diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
|
||||||
|
index d044ab1a8..f9b19e1fe 100644
|
||||||
|
--- a/doc/help/man-lpr.html
|
||||||
|
+++ b/doc/help/man-lpr.html
|
||||||
|
@@ -12,10 +12,10 @@ lpr - print files
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpr</b>
|
||||||
|
[
|
||||||
|
-<b>-E</b>
|
||||||
|
-] [
|
||||||
|
<b>-H </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
] [
|
||||||
|
+<b>-E</b>
|
||||||
|
+] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
@@ -67,6 +67,7 @@ The following options are recognized by <i>lpr</i>:
|
||||||
|
<dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
|
||||||
|
<dt><b>-H </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-C "</b><i>name</i><b>"</b>
|
||||||
|
<dd style="margin-left: 5.0em"><dt><b>-J "</b><i>name</i><b>"</b>
|
||||||
|
<dd style="margin-left: 5.0em"><dt><b>-T "</b><i>name</i><b>"</b>
|
||||||
|
diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
|
||||||
|
index 7410320a3..dbe7f20de 100644
|
||||||
|
--- a/doc/help/man-lprm.html
|
||||||
|
+++ b/doc/help/man-lprm.html
|
||||||
|
@@ -12,14 +12,13 @@ lprm - cancel print jobs
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lprm</b>
|
||||||
|
[
|
||||||
|
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
-<b>-h</b>
|
||||||
|
-<i>server</i>[<i>:port</i>]
|
||||||
|
-] [
|
||||||
|
<b>-P</b>
|
||||||
|
<i>destination</i>[<i>/instance</i>]
|
||||||
|
] [
|
||||||
|
@@ -45,6 +44,7 @@ command supports the following options:
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate username.
|
||||||
|
<dt><b>-h </b><i>server</i>[<i>:port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
</dl>
|
||||||
|
<h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
|
||||||
|
The CUPS version of
|
||||||
|
diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
|
||||||
|
index f23089bbe..2c5dedc7c 100644
|
||||||
|
--- a/doc/help/man-lpstat.html
|
||||||
|
+++ b/doc/help/man-lpstat.html
|
||||||
|
@@ -12,6 +12,8 @@ lpstat - print cups status information
|
||||||
|
<h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
|
||||||
|
<b>lpstat</b>
|
||||||
|
[
|
||||||
|
+<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
+] [
|
||||||
|
<b>-E</b>
|
||||||
|
] [
|
||||||
|
<b>-H</b>
|
||||||
|
@@ -19,8 +21,6 @@ lpstat - print cups status information
|
||||||
|
<b>-U</b>
|
||||||
|
<i>username</i>
|
||||||
|
] [
|
||||||
|
-<b>-h </b><i>hostname</i>[<b>:</b><i>port</i>]
|
||||||
|
-] [
|
||||||
|
<b>-l</b>
|
||||||
|
] [
|
||||||
|
<b>-W</b>
|
||||||
|
@@ -91,6 +91,7 @@ If no classes are specified then all classes are listed.
|
||||||
|
<dd style="margin-left: 5.0em">Shows all available destinations on the local network.
|
||||||
|
<dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
|
||||||
|
<dd style="margin-left: 5.0em">Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
<dt><b>-l</b>
|
||||||
|
<dd style="margin-left: 5.0em">Shows a long listing of printers, classes, or jobs.
|
||||||
|
<dt><b>-o </b>[<i>destination(s)</i>]
|
||||||
|
diff --git a/man/cancel.man b/man/cancel.man
|
||||||
|
index 34a5d9fc0..caea0ed69 100644
|
||||||
|
--- a/man/cancel.man
|
||||||
|
+++ b/man/cancel.man
|
||||||
|
@@ -10,12 +10,15 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH cancel 1 "CUPS" "15 April 2014" "Apple Inc."
|
||||||
|
+.TH cancel 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
cancel \- cancel jobs
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B cancel
|
||||||
|
[
|
||||||
|
+.B \-h
|
||||||
|
+.I hostname[:port]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
@@ -23,9 +26,6 @@
|
||||||
|
] [
|
||||||
|
.B \-a
|
||||||
|
] [
|
||||||
|
-.B \-h
|
||||||
|
-.I hostname[:port]
|
||||||
|
-] [
|
||||||
|
.B \-u
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
@@ -52,6 +52,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIhostname\fR[\fI:port\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
\fB\-U \fIusername\fR
|
||||||
|
Specifies the username to use when connecting to the server.
|
||||||
|
diff --git a/man/cupsctl.man b/man/cupsctl.man
|
||||||
|
index 1b1ff4183..7e50d07ac 100644
|
||||||
|
--- a/man/cupsctl.man
|
||||||
|
+++ b/man/cupsctl.man
|
||||||
|
@@ -10,20 +10,20 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc."
|
||||||
|
+.TH cupsctl 8 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
cupsctl \- configure cupsd.conf options
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B cupsctl
|
||||||
|
[
|
||||||
|
+.B \-h
|
||||||
|
+\fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-.B \-h
|
||||||
|
-\fIserver\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
\fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
|
||||||
|
] [
|
||||||
|
\fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
|
||||||
|
@@ -51,6 +51,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Specifies the server address.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
\fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
|
||||||
|
Enables (disables) debug logging to the \fIerror_log\fR file.
|
||||||
|
diff --git a/man/lp.man b/man/lp.man
|
||||||
|
index a54f904a5..4bdd2de7b 100644
|
||||||
|
--- a/man/lp.man
|
||||||
|
+++ b/man/lp.man
|
||||||
|
@@ -10,12 +10,14 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lp 1 "CUPS" "2 May 2016" "Apple Inc."
|
||||||
|
+.TH lp 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lp \- print files
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lp
|
||||||
|
[
|
||||||
|
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
@@ -25,8 +27,6 @@
|
||||||
|
] [
|
||||||
|
\fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
.B \-m
|
||||||
|
] [
|
||||||
|
.B \-n
|
||||||
|
@@ -55,6 +55,8 @@
|
||||||
|
.br
|
||||||
|
.B lp
|
||||||
|
[
|
||||||
|
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
@@ -62,8 +64,6 @@
|
||||||
|
] [
|
||||||
|
.B \-c
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
.B \-i
|
||||||
|
.I job-id
|
||||||
|
] [
|
||||||
|
@@ -115,6 +115,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
Chooses an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
\fB\-i \fIjob-id\fR
|
||||||
|
Specifies an existing job to modify.
|
||||||
|
diff --git a/man/lpinfo.man b/man/lpinfo.man
|
||||||
|
index d238f9a60..d44b568d2 100644
|
||||||
|
--- a/man/lpinfo.man
|
||||||
|
+++ b/man/lpinfo.man
|
||||||
|
@@ -10,16 +10,16 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpinfo 8 "CUPS" "12 June 2014" "Apple Inc."
|
||||||
|
+.TH lpinfo 8 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpinfo \- show available devices or drivers
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpinfo
|
||||||
|
[
|
||||||
|
-.B \-E
|
||||||
|
-] [
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
] [
|
||||||
|
+.B \-E
|
||||||
|
+] [
|
||||||
|
.B \-l
|
||||||
|
] [
|
||||||
|
.B \-\-device\-id
|
||||||
|
@@ -44,10 +44,10 @@
|
||||||
|
.br
|
||||||
|
.B lpinfo
|
||||||
|
[
|
||||||
|
-.B \-E
|
||||||
|
-] [
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
] [
|
||||||
|
+.B \-E
|
||||||
|
+] [
|
||||||
|
.B \-l
|
||||||
|
] [
|
||||||
|
.B \-\-exclude\-schemes
|
||||||
|
@@ -71,6 +71,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Selects an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
.B \-l
|
||||||
|
Shows a "long" listing of devices or drivers.
|
||||||
|
diff --git a/man/lpmove.man b/man/lpmove.man
|
||||||
|
index af3c6b63c..62adba654 100644
|
||||||
|
--- a/man/lpmove.man
|
||||||
|
+++ b/man/lpmove.man
|
||||||
|
@@ -10,16 +10,16 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpmove 8 "CUPS" "26 May 2016" "Apple Inc."
|
||||||
|
+.TH lpmove 8 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpmove \- move a job or all jobs to a new destination
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpmove
|
||||||
|
[
|
||||||
|
-.B \-E
|
||||||
|
-] [
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
] [
|
||||||
|
+.B \-E
|
||||||
|
+] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
]
|
||||||
|
@@ -28,10 +28,10 @@
|
||||||
|
.br
|
||||||
|
.B lpmove
|
||||||
|
[
|
||||||
|
-.B \-E
|
||||||
|
-] [
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
] [
|
||||||
|
+.B \-E
|
||||||
|
+] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
]
|
||||||
|
@@ -50,6 +50,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.SH EXAMPLES
|
||||||
|
Move job 123 from "oldprinter" to "newprinter":
|
||||||
|
.nf
|
||||||
|
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
|
||||||
|
index 372f46a37..2eb5b6010 100644
|
||||||
|
--- a/man/lpoptions.man.in
|
||||||
|
+++ b/man/lpoptions.man.in
|
||||||
|
@@ -10,18 +10,18 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpoptions 1 "CUPS" "12 June 2014" "Apple Inc."
|
||||||
|
+.TH lpoptions 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpoptions \- display or set printer options and defaults
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpoptions
|
||||||
|
[
|
||||||
|
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
-] [
|
||||||
|
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
]
|
||||||
|
\fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
[
|
||||||
|
@@ -30,13 +30,13 @@
|
||||||
|
.br
|
||||||
|
.B lpoptions
|
||||||
|
[
|
||||||
|
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
\fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
]
|
||||||
|
\fB\-o \fIoption\fR[\fB=\fIvalue\fR] ...
|
||||||
|
@@ -43,13 +43,13 @@
|
||||||
|
.br
|
||||||
|
.B lpoptions
|
||||||
|
[
|
||||||
|
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
\fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
]
|
||||||
|
.B \-r
|
||||||
|
@@ -57,12 +57,12 @@
|
||||||
|
.br
|
||||||
|
.B lpoptions
|
||||||
|
[
|
||||||
|
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
-] [
|
||||||
|
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
]
|
||||||
|
\fB\-x \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
.SH DESCRIPTION
|
||||||
|
@@ -96,6 +96,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Uses an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
.B \-l
|
||||||
|
Lists the printer specific options and their current settings.
|
||||||
|
diff --git a/man/lpq.man b/man/lpq.man
|
||||||
|
index ce23a6c81..a81633ecb 100644
|
||||||
|
--- a/man/lpq.man
|
||||||
|
+++ b/man/lpq.man
|
||||||
|
@@ -10,19 +10,19 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpq 1 "CUPS" "12 June 2014" "Apple Inc."
|
||||||
|
+.TH lpq 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpq \- show printer queue status
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpq
|
||||||
|
[
|
||||||
|
+\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
\fB\-P \fIdestination\fR[\fB/\fIinstance\fR]
|
||||||
|
] [
|
||||||
|
.B \-a
|
||||||
|
@@ -53,6 +53,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
.B \-l
|
||||||
|
Requests a more verbose (long) reporting format.
|
||||||
|
diff --git a/man/lpr.man b/man/lpr.man
|
||||||
|
index e5f9f9018..77a62b305 100644
|
||||||
|
--- a/man/lpr.man
|
||||||
|
+++ b/man/lpr.man
|
||||||
|
@@ -10,16 +10,16 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpr 1 "CUPS" "2 May 2016" "Apple Inc."
|
||||||
|
+.TH lpr 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpr \- print files
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpr
|
||||||
|
[
|
||||||
|
-.B \-E
|
||||||
|
-] [
|
||||||
|
\fB\-H \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
] [
|
||||||
|
+.B \-E
|
||||||
|
+] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
@@ -72,6 +72,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-H \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
\fB\-C "\fIname\fB"\fR
|
||||||
|
.TP 5
|
||||||
|
diff --git a/man/lprm.man b/man/lprm.man
|
||||||
|
index 094166539..0cf88ac51 100644
|
||||||
|
--- a/man/lprm.man
|
||||||
|
+++ b/man/lprm.man
|
||||||
|
@@ -10,20 +10,19 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lprm 1 "CUPS" "22 May 2014" "Apple Inc."
|
||||||
|
+.TH lprm 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lprm \- cancel print jobs
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lprm
|
||||||
|
[
|
||||||
|
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-.B \-h
|
||||||
|
-.IR server [ :port ]
|
||||||
|
-] [
|
||||||
|
.B \-P
|
||||||
|
.IR destination [ /instance ]
|
||||||
|
] [
|
||||||
|
@@ -52,6 +51,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fI:port\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.SH CONFORMING TO
|
||||||
|
The CUPS version of
|
||||||
|
.B lprm
|
||||||
|
diff --git a/man/lpstat.man b/man/lpstat.man
|
||||||
|
index 0a10cd9bc..88acff7b3 100644
|
||||||
|
--- a/man/lpstat.man
|
||||||
|
+++ b/man/lpstat.man
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
.\"
|
||||||
|
.\" lpstat man page for CUPS.
|
||||||
|
.\"
|
||||||
|
-.\" Copyright 2007-2017 by Apple Inc.
|
||||||
|
-.\" Copyright 1997-2006 by Easy Software Products.
|
||||||
|
+.\" Copyright © 2007-2019 by Apple Inc.
|
||||||
|
+.\" Copyright © 1997-2006 by Easy Software Products.
|
||||||
|
.\"
|
||||||
|
.\" These coded instructions, statements, and computer programs are the
|
||||||
|
.\" property of Apple Inc. and are protected by Federal copyright
|
||||||
|
@@ -10,12 +10,14 @@
|
||||||
|
.\" 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/".
|
||||||
|
.\"
|
||||||
|
-.TH lpstat 1 "CUPS" "26 May 2017" "Apple Inc."
|
||||||
|
+.TH lpstat 1 "CUPS" "2022-05-02" "OpenPrinting"
|
||||||
|
.SH NAME
|
||||||
|
lpstat \- print cups status information
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B lpstat
|
||||||
|
[
|
||||||
|
+\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
+] [
|
||||||
|
.B \-E
|
||||||
|
] [
|
||||||
|
.B \-H
|
||||||
|
@@ -23,8 +25,6 @@
|
||||||
|
.B \-U
|
||||||
|
.I username
|
||||||
|
] [
|
||||||
|
-\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||||
|
-] [
|
||||||
|
.B \-l
|
||||||
|
] [
|
||||||
|
.B \-W
|
||||||
|
@@ -104,6 +104,7 @@
|
||||||
|
.TP 5
|
||||||
|
\fB\-h \fIserver\fR[\fB:\fIport\fR]
|
||||||
|
Specifies an alternate server.
|
||||||
|
+Note: This option must occur before all others.
|
||||||
|
.TP 5
|
||||||
|
.B \-l
|
||||||
|
Shows a long listing of printers, classes, or jobs.
|
||||||
@ -0,0 +1,109 @@
|
|||||||
|
From 7271db11d27fe436f0c743bed3be8a5c6f93f2c2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael R Sweet <michael.r.sweet@gmail.com>
|
||||||
|
Date: Mon, 9 Apr 2018 09:50:19 -0400
|
||||||
|
Subject: [PATCH] Use cupsGetNamedDest for legacy printing APIs (Issue #5288)
|
||||||
|
|
||||||
|
---
|
||||||
|
cups/util.c | 59 +++++-----------------------
|
||||||
|
xcode/CUPS.xcodeproj/project.pbxproj | 6 ++-
|
||||||
|
2 files changed, 15 insertions(+), 50 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cups/util.c b/cups/util.c
|
||||||
|
index ebc54d3cf..b15963e9e 100644
|
||||||
|
--- a/cups/util.c
|
||||||
|
+++ b/cups/util.c
|
||||||
|
@@ -21,19 +22,6 @@
|
||||||
|
#endif /* WIN32 || __EMX__ */
|
||||||
|
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- * Enumeration data and callback...
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
-typedef struct _cups_createdata_s
|
||||||
|
-{
|
||||||
|
- const char *name; /* Destination name */
|
||||||
|
- cups_dest_t *dest; /* Matching destination */
|
||||||
|
-} _cups_createdata_t;
|
||||||
|
-
|
||||||
|
-static int cups_create_cb(_cups_createdata_t *data, unsigned flags, cups_dest_t *dest);
|
||||||
|
-
|
||||||
|
-
|
||||||
|
/*
|
||||||
|
* 'cupsCancelJob()' - Cancel a print job on the default server.
|
||||||
|
*
|
||||||
|
@@ -168,7 +156,7 @@ cupsCreateJob(
|
||||||
|
{
|
||||||
|
int job_id = 0; /* job-id value */
|
||||||
|
ipp_status_t status; /* Create-Job status */
|
||||||
|
- _cups_createdata_t data; /* Enumeration data */
|
||||||
|
+ cups_dest_t *dest; /* Destination */
|
||||||
|
cups_dinfo_t *info; /* Destination information */
|
||||||
|
|
||||||
|
|
||||||
|
@@ -188,12 +176,7 @@ cupsCreateJob(
|
||||||
|
* Lookup the destination...
|
||||||
|
*/
|
||||||
|
|
||||||
|
- data.name = name;
|
||||||
|
- data.dest = NULL;
|
||||||
|
-
|
||||||
|
- cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_create_cb, &data);
|
||||||
|
-
|
||||||
|
- if (!data.dest)
|
||||||
|
+ if ((dest = cupsGetNamedDest(http, name, NULL)) == NULL)
|
||||||
|
{
|
||||||
|
DEBUG_puts("1cupsCreateJob: Destination not found.");
|
||||||
|
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0);
|
||||||
|
@@ -205,18 +188,18 @@ cupsCreateJob(
|
||||||
|
*/
|
||||||
|
|
||||||
|
DEBUG_puts("1cupsCreateJob: Querying destination info.");
|
||||||
|
- if ((info = cupsCopyDestInfo(http, data.dest)) == NULL)
|
||||||
|
+ if ((info = cupsCopyDestInfo(http, dest)) == NULL)
|
||||||
|
{
|
||||||
|
DEBUG_puts("1cupsCreateJob: Query failed.");
|
||||||
|
- cupsFreeDests(1, data.dest);
|
||||||
|
+ cupsFreeDests(1, dest);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
- status = cupsCreateDestJob(http, data.dest, info, &job_id, title, num_options, options);
|
||||||
|
+ status = cupsCreateDestJob(http, dest, info, &job_id, title, num_options, options);
|
||||||
|
DEBUG_printf(("1cupsCreateJob: cupsCreateDestJob returned %04x (%s)", status, ippErrorString(status)));
|
||||||
|
|
||||||
|
cupsFreeDestInfo(info);
|
||||||
|
- cupsFreeDests(1, data.dest);
|
||||||
|
+ cupsFreeDests(1, dest);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Return the job...
|
||||||
|
@@ -968,25 +951,3 @@ cupsStartDocument(
|
||||||
|
return (status);
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
- * 'cups_create_cb()' - Find the destination for printing.
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
-static int /* O - 0 on match */
|
||||||
|
-cups_create_cb(
|
||||||
|
- _cups_createdata_t *data, /* I - Data from cupsCreateJob call */
|
||||||
|
- unsigned flags, /* I - Enumeration flags */
|
||||||
|
- cups_dest_t *dest) /* I - Destination */
|
||||||
|
-{
|
||||||
|
- DEBUG_printf(("2cups_create_cb(data=%p(%s), flags=%08x, dest=%p(%s))", (void *)data, data->name, flags, (void *)dest, dest->name));
|
||||||
|
-
|
||||||
|
- (void)flags;
|
||||||
|
-
|
||||||
|
- if (dest->instance || strcasecmp(data->name, dest->name))
|
||||||
|
- return (1);
|
||||||
|
-
|
||||||
|
- cupsCopyDest(dest, 0, &data->dest);
|
||||||
|
-
|
||||||
|
- return (0);
|
||||||
|
-}
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Wed, 6 Apr 2022 15:04:45 +0200
|
||||||
|
Subject: [PATCH] cups/tls-gnutls.c: Use always GNUTLS_SHUT_WR
|
||||||
|
|
||||||
|
The current mode for `gnutls_bye()` in client use cases strictly
|
||||||
|
follows TLS v1.2 standard, which in this particular part says:
|
||||||
|
|
||||||
|
```
|
||||||
|
Unless some other fatal alert has been transmitted, each party is
|
||||||
|
required to send a close_notify alert before closing the write
|
||||||
|
side of the connection. The other party MUST respond with a
|
||||||
|
close_notify alert of its own and close down the connection immediately,
|
||||||
|
discarding any pending writes. It is not required for the initiator
|
||||||
|
of the close to wait for the responding close_notify alert before
|
||||||
|
closing the read side of the connection.
|
||||||
|
```
|
||||||
|
|
||||||
|
and waits for the other side of TLS connection to confirm the close.
|
||||||
|
|
||||||
|
Unfortunately it can undesired for reasons:
|
||||||
|
- we support switching of TLS versions in CUPS, and this mode strictly
|
||||||
|
follows TLS v1.2 - so for older version this behavior is not expected
|
||||||
|
and can cause delays
|
||||||
|
- even some TLS v1.2 implementations (like Windows Server 2016) don't
|
||||||
|
comply TLS v1.2 behavior even if it says it does - in that case,
|
||||||
|
encrypted printing takes 30s till HTTP timeout is reached, because the
|
||||||
|
other side didn't send confirmation
|
||||||
|
- AFAIU openssl's SSL_shutdown() doesn't make this TLS v1.2 difference,
|
||||||
|
so we could end up with two TLS implementations in CUPS which will
|
||||||
|
behave differently
|
||||||
|
|
||||||
|
Since the standard defines that waiting for confirmation is not required
|
||||||
|
and due the problems above, I would propose using GNUTLS_SHUT_WR mode
|
||||||
|
regardless of HTTP mode.
|
||||||
|
---
|
||||||
|
cups/tls-gnutls.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
|
||||||
|
index c55995b2b..f87b4f4df 100644
|
||||||
|
--- a/cups/tls-gnutls.c
|
||||||
|
+++ b/cups/tls-gnutls.c
|
||||||
|
@@ -1667,7 +1667,7 @@ _httpTLSStop(http_t *http) /* I - Connection to server */
|
||||||
|
int error; /* Error code */
|
||||||
|
|
||||||
|
|
||||||
|
- error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR);
|
||||||
|
+ error = gnutls_bye(http->tls, GNUTLS_SHUT_WR);
|
||||||
|
if (error != GNUTLS_E_SUCCESS)
|
||||||
|
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From de4f8c196106033e4c372dce3e91b9d42b0b9444 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Thu, 26 May 2022 06:27:04 +0200
|
||||||
|
Subject: [PATCH] scheduler/cert.c: Fix string comparison (fixes
|
||||||
|
CVE-2022-26691)
|
||||||
|
|
||||||
|
The previous algorithm didn't expect the strings can have a different
|
||||||
|
length, so one string can be a substring of the other and such substring
|
||||||
|
was reported as equal to the longer string.
|
||||||
|
---
|
||||||
|
CHANGES.md | 1 +
|
||||||
|
scheduler/cert.c | 9 ++++++++-
|
||||||
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/scheduler/cert.c b/scheduler/cert.c
|
||||||
|
index b268bf1b2..9b65b96c9 100644
|
||||||
|
--- a/scheduler/cert.c
|
||||||
|
+++ b/scheduler/cert.c
|
||||||
|
@@ -444,5 +444,12 @@ ctcompare(const char *a, /* I - First string */
|
||||||
|
b ++;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return (result);
|
||||||
|
+ /*
|
||||||
|
+ * The while loop finishes when *a == '\0' or *b == '\0'
|
||||||
|
+ * so after the while loop either both *a and *b == '\0',
|
||||||
|
+ * or one points inside a string, so when we apply bitwise OR on *a,
|
||||||
|
+ * *b and result, we get a non-zero return value if the compared strings don't match.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ return (result | *a | *b);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.36.1
|
||||||
|
|
||||||
12
SOURCES/cups-cupsd-too-chatty.patch
Normal file
12
SOURCES/cups-cupsd-too-chatty.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -Napur cups-2.2.6-old/scheduler/job.c cups-2.2.6-new/scheduler/job.c
|
||||||
|
--- cups-2.2.6-old/scheduler/job.c 2022-04-12 17:32:00.635282080 -0700
|
||||||
|
+++ cups-2.2.6-new/scheduler/job.c 2022-04-12 17:33:34.349452614 -0700
|
||||||
|
@@ -474,7 +474,7 @@ cupsdCleanJobs(void)
|
||||||
|
cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing from history.");
|
||||||
|
cupsdDeleteJob(job, CUPSD_JOB_PURGE);
|
||||||
|
}
|
||||||
|
- else if (job->file_time && job->file_time <= curtime)
|
||||||
|
+ else if (job->file_time && job->file_time <= curtime && job->num_files > 0)
|
||||||
|
{
|
||||||
|
cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files.");
|
||||||
|
remove_job_files(job);
|
||||||
52
SOURCES/cups-retry-current-job-man.patch
Normal file
52
SOURCES/cups-retry-current-job-man.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
|
||||||
|
index 9082348..8ab1ce8 100644
|
||||||
|
--- a/doc/help/man-cupsd.conf.html
|
||||||
|
+++ b/doc/help/man-cupsd.conf.html
|
||||||
|
@@ -90,7 +90,7 @@ The default value is "30".
|
||||||
|
<dd style="margin-left: 5.0em">Specifies that a failed print job should be aborted (discarded) unless otherwise specified for the printer.
|
||||||
|
<dt><b>ErrorPolicy retry-job</b>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
|
||||||
|
-<dt><b>ErrorPolicy retry-this-job</b>
|
||||||
|
+<dt><b>ErrorPolicy retry-current-job</b>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
|
||||||
|
<dt><b>ErrorPolicy stop-printer</b>
|
||||||
|
<dd style="margin-left: 5.0em">Specifies that a failed print job should stop the printer unless otherwise specified for the printer. The 'stop-printer' error policy is the default.
|
||||||
|
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
|
||||||
|
index 53a028d..ba12b07 100644
|
||||||
|
--- a/man/cupsd.conf.man.in
|
||||||
|
+++ b/man/cupsd.conf.man.in
|
||||||
|
@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
|
||||||
|
\fBErrorPolicy retry-job\fR
|
||||||
|
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
-\fBErrorPolicy retry-this-job\fR
|
||||||
|
+\fBErrorPolicy retry-current-job\fR
|
||||||
|
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
\fBErrorPolicy stop-printer\fR
|
||||||
|
diff --git a/man/cupsd.conf.man.in.privilege-escalation b/man/cupsd.conf.man.in.privilege-escalation
|
||||||
|
index ab89e15..130ea8a 100644
|
||||||
|
--- a/man/cupsd.conf.man.in.privilege-escalation
|
||||||
|
+++ b/man/cupsd.conf.man.in.privilege-escalation
|
||||||
|
@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
|
||||||
|
\fBErrorPolicy retry-job\fR
|
||||||
|
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
-\fBErrorPolicy retry-this-job\fR
|
||||||
|
+\fBErrorPolicy retry-current-job\fR
|
||||||
|
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
\fBErrorPolicy stop-printer\fR
|
||||||
|
diff --git a/man/cupsd.conf.man.in.remove-weak-ciphers b/man/cupsd.conf.man.in.remove-weak-ciphers
|
||||||
|
index 5516780..35065ca 100644
|
||||||
|
--- a/man/cupsd.conf.man.in.remove-weak-ciphers
|
||||||
|
+++ b/man/cupsd.conf.man.in.remove-weak-ciphers
|
||||||
|
@@ -135,7 +135,7 @@ Specifies that a failed print job should be aborted (discarded) unless otherwise
|
||||||
|
\fBErrorPolicy retry-job\fR
|
||||||
|
Specifies that a failed print job should be retried at a later time unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
-\fBErrorPolicy retry-this-job\fR
|
||||||
|
+\fBErrorPolicy retry-current-job\fR
|
||||||
|
Specifies that a failed print job should be retried immediately unless otherwise specified for the printer.
|
||||||
|
.TP 5
|
||||||
|
\fBErrorPolicy stop-printer\fR
|
||||||
@ -15,7 +15,7 @@ Summary: CUPS printing system
|
|||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.2.6
|
Version: 2.2.6
|
||||||
Release: 44%{?dist}
|
Release: 50%{?dist}
|
||||||
License: GPLv2+ and LGPLv2 with exceptions and AML
|
License: GPLv2+ and LGPLv2 with exceptions and AML
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
|
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
|
||||||
@ -129,6 +129,18 @@ Patch70: 0001-Add-with-idle-exit-timeout-configure-option.patch
|
|||||||
Patch71: 0001-Add-with-systemd-timeoutstartsec-configure-option.patch
|
Patch71: 0001-Add-with-systemd-timeoutstartsec-configure-option.patch
|
||||||
# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere
|
# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere
|
||||||
Patch72: cups-ippeve-web-support.patch
|
Patch72: cups-ippeve-web-support.patch
|
||||||
|
# 2071417 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
Patch73: 0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
|
||||||
|
# 2074684 - lp to a remote server takes a long time
|
||||||
|
Patch74: 0001-Use-cupsGetNamedDest-for-legacy-printing-APIs-Issue-.patch
|
||||||
|
# 2074736 - CUPS is too chatty about "Removing document files." in debug mode
|
||||||
|
Patch75: cups-cupsd-too-chatty.patch
|
||||||
|
# CVE-2022-26691 cups: authorization bypass when using "local" authorization
|
||||||
|
Patch76: 0001-scheduler-cert.c-Fix-string-comparison-fixes-CVE-202.patch
|
||||||
|
# 2084257 - ErrorPolicy documentation is incorrect
|
||||||
|
Patch77: cups-retry-current-job-man.patch
|
||||||
|
# 1910415 - manpage update to acknowledge order dependency of -h option
|
||||||
|
Patch78: 0001-Update-man-pages-for-h-option-Issue-357.patch
|
||||||
|
|
||||||
Patch1000: cups-lspp.patch
|
Patch1000: cups-lspp.patch
|
||||||
|
|
||||||
@ -401,6 +413,18 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
%patch71 -p1 -b .timeoutstartsec
|
%patch71 -p1 -b .timeoutstartsec
|
||||||
# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere
|
# 2032965 - [RFE] RHEL8 - CUPS Web UI supports adding IPP Everywhere
|
||||||
%patch72 -p1 -b .ippeve-web-support
|
%patch72 -p1 -b .ippeve-web-support
|
||||||
|
# 2071417 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
%patch73 -p1 -b .gnutlsbye
|
||||||
|
# 2074684 - lp to a remote server takes a long time
|
||||||
|
%patch74 -p1 -b .lp-long-time
|
||||||
|
# 2074736 - CUPS is too chatty about "Removing document files." in debug mode
|
||||||
|
%patch75 -p1 -b .cupsd-too-chatty
|
||||||
|
# CVE-2022-26691 cups: authorization bypass when using "local" authorization
|
||||||
|
%patch76 -p1 -b .cve26691
|
||||||
|
# 2084257 - ErrorPolicy documentation is incorrect
|
||||||
|
%patch77 -p1 -b .retry-current-job-man
|
||||||
|
# 1910415 - manpage update to acknowledge order dependency of -h option
|
||||||
|
%patch78 -p1 -b .manpage-update
|
||||||
|
|
||||||
sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
|
sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
|
||||||
|
|
||||||
@ -820,6 +844,25 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man5/ipptoolfile.5.gz
|
%{_mandir}/man5/ipptoolfile.5.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 01 2022 Richard Lescak <rlescak@redhat.com> - 1:2.2.6-50
|
||||||
|
- 1910415 - corrected manpage patch, one lpoptions usage wasn't changed
|
||||||
|
|
||||||
|
* Thu Jun 16 2022 Richard Lescak <rlescak@redhat.com> - 1:2.2.6-49
|
||||||
|
- 1910415 - manpage update to acknowledge order dependency of -h option
|
||||||
|
|
||||||
|
* Tue May 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-48
|
||||||
|
- 2084257 - ErrorPolicy documentation is incorrect
|
||||||
|
|
||||||
|
* Thu May 26 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-47
|
||||||
|
- CVE-2022-26691 cups: authorization bypass when using "local" authorization
|
||||||
|
|
||||||
|
* Fri May 13 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-46
|
||||||
|
- 2074684 - lp to a remote server takes a long time
|
||||||
|
- 2074736 - CUPS is too chatty about "Removing document files." in debug mode
|
||||||
|
|
||||||
|
* Fri Apr 08 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-45
|
||||||
|
- 2071417 - 30-second delays printing to Windows 2016 server via HTTPS
|
||||||
|
|
||||||
* Wed Jan 19 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-44
|
* Wed Jan 19 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.6-44
|
||||||
- 2015182 - RFE: Implement IdleExitTimeout configuration during build
|
- 2015182 - RFE: Implement IdleExitTimeout configuration during build
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user