From: Michael R Sweet Date: Fri, 3 May 2019 16:29:58 +0000 (-0400) Subject: Move ippeveprinter commands to CUPS_SERVERBIN/command. X-Git-Tag: v2.3rc1~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da48e461472590caea416fda443c3c8be3373c4;p=thirdparty%2Fcups.git Move ippeveprinter commands to CUPS_SERVERBIN/command. --- diff --git a/CHANGES.md b/CHANGES.md index ab789a5484..fd46d45e17 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,12 @@ -CHANGES - 2.3b8 - 2019-05-02 -============================ +CHANGES - 2.3rc1 - 2019-05-03 +============================= + + +Changes in CUPS v2.3rc1 +----------------------- + +- The `ippeveprinter` command now looks for print commands in the "command" + subdirectory. Changes in CUPS v2.3b8 diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index b1a0385d5f..953a26789a 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 ef6f3f45da..c02f6f1efe 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 da5126d60c..f30ec909e9 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 27a1b60da4..c567cbba7b 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 7283d7563c..ad0e68ed0c 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 fbd2dc4eb9..d61d8340fd 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 9ff2b9aeff..c7c17f7f4f 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 769ffe64c7..d75ddc5b06 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 897b0541e8..c52125fc7f 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 308a3a2367..e701445d66 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 42d06faad7..11aac7a76d 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 f889b866f4..10101dbbed 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. @@ -307,7 +307,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. @@ -322,7 +322,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. @@ -415,7 +415,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.) @@ -491,7 +491,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. @@ -514,7 +514,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 @@ -530,7 +530,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 @@ -577,7 +577,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 @@ -609,8 +609,8 @@ 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), diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html index d99136a1bf..5892071037 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 6e9d81d891..bce2134db1 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 c8070497be..65d896b57c 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-ippeveprinter.html b/doc/help/man-ippeveprinter.html index 7e4b0a94c0..ec25dabc0f 100644 --- a/doc/help/man-ippeveprinter.html +++ b/doc/help/man-ippeveprinter.html @@ -110,7 +110,7 @@ printer command ("-c ippeveps").
Run the specified command for each document that is printed. If "command" is not an absolute path ("/path/to/command"), ippeveprinter -looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter. +looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command. The cups-config(1) command can be used to discover the correct binary directory ("cups-config --serverbin"). diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html index 09b921fb3b..ba221270fa 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 1ce68ab29e..755bf2fd93 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 37970b408e..c945ea9c82 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 47dc7a4557..8f5b87cbbc 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 6afbc71a3c..e4d8813c8e 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 28d166cacd..cc4393ef81 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 27e051fdbb..d8d96d36ca 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 a2f8ba68ee..4a3123ea56 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 fb7ec0287f..325f2cd28e 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/ippeveprinter.1 b/man/ippeveprinter.1 index 0fb4c2416e..3165400f2a 100644 --- a/man/ippeveprinter.1 +++ b/man/ippeveprinter.1 @@ -6,7 +6,7 @@ .\" Licensed under Apache License v2.0. See the file "LICENSE" for more .\" information. .\" -.TH ippeveprinter 1 "CUPS" "24 April 2019" "Apple Inc." +.TH ippeveprinter 1 "CUPS" "3 May 2019" "Apple Inc." .SH NAME ippeveprinter \- an ipp everywhere printer application for cups .SH SYNOPSIS @@ -119,7 +119,7 @@ Specifies the maximum IPP version to report. Run the specified command for each document that is printed. If "command" is not an absolute path ("/path/to/command"), .B ippeveprinter -looks for the command in the "ippeveprinter" subdirectory of the CUPS binary directory, typically /usr/lib/cups/ippeveprinter or /usr/libexec/cups/ippeveprinter. +looks for the command in the "command" subdirectory of the CUPS binary directory, typically /usr/lib/cups/command or /usr/libexec/cups/command. The .BR cups-config (1) command can be used to discover the correct binary directory ("cups-config --serverbin"). diff --git a/packaging/cups.list.in b/packaging/cups.list.in index e2e7b69ede..537c194508 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -278,6 +278,9 @@ f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi f 0555 root sys $SERVERBIN/cgi-bin/help.cgi cgi-bin/help.cgi f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi +d 0755 root sys $SERVERBIN/command - +f 0555 root sys $SERVERBIN/command/ippevepcl tools/ippevepcl +f 0555 root sys $SERVERBIN/command/ippeveps tools/ippeveps d 0755 root sys $SERVERBIN/daemon - f 0555 root sys $SERVERBIN/daemon/cups-deviced scheduler/cups-deviced f 0555 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd @@ -291,9 +294,6 @@ l 0755 root sys $SERVERBIN/filter/rastertodymo rastertolabel f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp f 0555 root sys $SERVERBIN/filter/rastertopwg filter/rastertopwg -d 0755 root sys $SERVERBIN/ippeveprinter - -f 0555 root sys $SERVERBIN/ippeveprinter/ippevepcl tools/ippevepcl -f 0555 root sys $SERVERBIN/ippeveprinter/ippeveps tools/ippeveps d 0755 root sys $SERVERBIN/notifier - f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 93867f2c53..d37103c4f5 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -236,6 +236,8 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/cups/backend/usb %dir /usr/lib/cups/cgi-bin /usr/lib/cups/cgi-bin/* +%dir /usr/lib/cups/command +/usr/lib/cups/command/* %dir /usr/lib/cups/daemon /usr/lib/cups/daemon/cups-deviced /usr/lib/cups/daemon/cups-driverd @@ -243,8 +245,6 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/lib/cups/driver %dir /usr/lib/cups/filter /usr/lib/cups/filter/* -%dir /usr/lib/cups/ippeveprinter -/usr/lib/cups/ippeveprinter/* %dir /usr/lib/cups/monitor /usr/lib/cups/monitor/* %dir /usr/lib/cups/notifier diff --git a/tools/Makefile b/tools/Makefile index 43ba688478..479f2ba9f3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -89,10 +89,10 @@ install-exec: for file in $(IPPTOOLS); do \ $(INSTALL_BIN) $$file $(BINDIR); \ done - echo Installing printer commands in $(SERVERBIN)/ippeveprinter... - $(INSTALL_DIR) -m 755 $(SERVERBIN)/ippeveprinter + echo Installing printer commands in $(SERVERBIN)/command... + $(INSTALL_DIR) -m 755 $(SERVERBIN)/command for file in $(IPPEVECOMMANDS); do \ - $(INSTALL_BIN) $$file $(SERVERBIN)/ippeveprinter; \ + $(INSTALL_BIN) $$file $(SERVERBIN)/command; \ done if test "x$(SYMROOT)" != "x"; then \ $(INSTALL_DIR) $(SYMROOT); \ @@ -127,9 +127,9 @@ uninstall: $(RM) $(BINDIR)/$$file; \ done -$(RMDIR) $(BINDIR) - echo Uninstalling print commands from $(SERVERBIN)/ippeveprinter... + echo Uninstalling print commands from $(SERVERBIN)/command... for file in $(IPPEVECOMMANDS); do \ - $(RM) $(SERVERBIN)/ippeveprinter/$$file; \ + $(RM) $(SERVERBIN)/command/$$file; \ done -$(RMDIR) $(SERVERBIN)/ippeveprinter diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c index 1ec874b55c..4f6f0cf9bb 100644 --- a/tools/ippeveprinter.c +++ b/tools/ippeveprinter.c @@ -1403,7 +1403,7 @@ create_printer( } else { - snprintf(path, sizeof(path), "%s/ippeveprinter/%s", cg->cups_serverbin, command); + snprintf(path, sizeof(path), "%s/command/%s", cg->cups_serverbin, command); if (access(command, X_OK)) {