mirror of https://gitee.com/openkylin/cups.git
Import Debian changes 2.3.1-ok1
cups (2.3.1-ok1) yangtze; urgency=medium * Build for openKylin.
This commit is contained in:
parent
9c7a73bc57
commit
e0ff084662
|
@ -0,0 +1,9 @@
|
|||
# see git-dpm(1) from git-dpm package
|
||||
d73fa697171b2a2e1dba7f1bfb519beb38625375
|
||||
d73fa697171b2a2e1dba7f1bfb519beb38625375
|
||||
0450ddd4f003de8aa8d8e7a54d181a992607d031
|
||||
0450ddd4f003de8aa8d8e7a54d181a992607d031
|
||||
cups_2.3~b8.orig.tar.gz
|
||||
37ef96f807832dcfdd36d8fcb80771fce663547e
|
||||
10371739
|
||||
signature:c852fec93034eaa9cfddaedde50a85ce25d01814:854:cups_2.3~b8.orig.tar.gz.asc
|
|
@ -0,0 +1,28 @@
|
|||
Debian users,
|
||||
|
||||
For making clear your printing problem, I need some information.
|
||||
|
||||
1. Please describe your CUPS version/revision. This will be written
|
||||
automatically if you use Debian bug system tools.
|
||||
2. Please describe Your printer vendor and model, and how to connect (usb,
|
||||
parallel, serial, lpd, ipp, http, socket, smb).
|
||||
3. Please attach your /etc/cups/printers.conf (only about problematic printer)
|
||||
4. Set LogLeveld as "debug" in your /etc/cups/cupsd.conf and reload by
|
||||
/etc/init.d/cups reload. After you do something causes a problem,
|
||||
please attach gzippped your /var/log/cups/error_log.
|
||||
5. Please attach gzipped PPD file in /etc/cups/ppd/.
|
||||
|
||||
Before you report...
|
||||
1. If you use gs as filter, please check /usr/bin/gs indicates gs-esp.
|
||||
gs-gnu doesn't support some drivers. If gs indicates gs-gnu, please
|
||||
change by 'update-alternatives --config gs'.
|
||||
2. Please don't set severity to 'grave' or 'critical' if you couldn't success
|
||||
to print out. I usually test by my printer, then upload. (it means at
|
||||
least I can success to print out)
|
||||
I promise to look over your report. Please use 'important' for
|
||||
"I can't print out by my printer!".
|
||||
|
||||
Thanks,
|
||||
--
|
||||
Kenshi Muto
|
||||
kmuto@debian.org
|
|
@ -0,0 +1,17 @@
|
|||
cups packaging for Debian
|
||||
-------------------------
|
||||
|
||||
cups is maintained with gbp-buildpackage on git.debian.org (see Vcs-Git: control
|
||||
field). gbp-buildpackage is documented at /usr/share/doc/git-buildpackage/ (in
|
||||
particular the comprehensive manual-html/).
|
||||
|
||||
It uses a standard 3.0 (quilt) patch system.
|
||||
|
||||
The really short path to get a buildable source tree is:
|
||||
|
||||
debcheckout cups
|
||||
cd cups
|
||||
QUILT_PATCHES=debian/patches quilt push -af
|
||||
|
||||
The branches are named after DEP-14, so this means that debian/master should
|
||||
always point to the latest development branch
|
|
@ -0,0 +1,5 @@
|
|||
cups (2.3.1-ok1) yangtze; urgency=medium
|
||||
|
||||
* Build for openKylin.
|
||||
|
||||
-- openKylinBot <openKylinBot@openkylin.com> Mon, 25 Apr 2022 22:03:04 +0800
|
|
@ -0,0 +1,68 @@
|
|||
# Sample client configuration file for the Common UNIX Printing System
|
||||
# (CUPS).
|
||||
#
|
||||
# Copyright 1997-2005 by Easy Software Products, all rights reserved.
|
||||
# Kenshi Muto <kmuto@debian.org> modified a bit for Debian distribution.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
# copyright law. Distribution and use rights are outlined in the file
|
||||
# "LICENSE.txt" which should have been included with this file. If this
|
||||
# file is missing or damaged please contact Easy Software Products
|
||||
# at:
|
||||
#
|
||||
# Attn: CUPS Licensing Information
|
||||
# Easy Software Products
|
||||
# 44141 Airport View Drive, Suite 204
|
||||
# Hollywood, Maryland 20636 USA
|
||||
#
|
||||
# Voice: (301) 373-9600
|
||||
# EMail: cups-info@cups.org
|
||||
# WWW: http://www.cups.org
|
||||
#
|
||||
|
||||
########################################################################
|
||||
# #
|
||||
# This is the CUPS client configuration file. This file is used to #
|
||||
# define client-specific parameters, such as the default server or #
|
||||
# default encryption settings. #
|
||||
# #
|
||||
# Put this file on /etc/cups/client.conf (system use) or #
|
||||
# ~/.cups/client.conf (personal use). #
|
||||
# #
|
||||
########################################################################
|
||||
|
||||
#
|
||||
# ServerName: the hostname of your server. By default CUPS will use the
|
||||
# domain socket /run/cups/cups.sock or the value of the CUPS_SERVER
|
||||
# environment variable.
|
||||
# ONLY ONE SERVER NAME MAY BE SPECIFIED AT A TIME. To use
|
||||
# more than one server you must use a local scheduler with browsing
|
||||
# and possibly polling.
|
||||
# The IPP version (2.0 by default, can be 1.1 or 1.0) can be specified
|
||||
# to access older servers.
|
||||
#
|
||||
|
||||
#ServerName /domain/socket
|
||||
#ServerName myhost.domain.com[:port][/version=1.1]
|
||||
#ServerName ip-address[:port][/version=1.1]
|
||||
|
||||
#
|
||||
# Encryption: whether or not to use encryption; this depends on having
|
||||
# the OpenSSL library linked into the CUPS library.
|
||||
#
|
||||
# Possible values:
|
||||
#
|
||||
# Always - Always use encryption (SSL)
|
||||
# Never - Never use encryption
|
||||
# Required - Use TLS encryption upgrade
|
||||
# IfRequested - Use encryption if the server requests it
|
||||
#
|
||||
# The default value is "IfRequested". This parameter can also be set
|
||||
# using the CUPS_ENCRYPTION environment variable.
|
||||
#
|
||||
|
||||
#Encryption Always
|
||||
#Encryption Never
|
||||
#Encryption Required
|
||||
#Encryption IfRequested
|
|
@ -0,0 +1,315 @@
|
|||
Source: cups
|
||||
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
|
||||
Uploaders: Didier Raboud <odyx@debian.org>,
|
||||
Till Kamppeter <till.kamppeter@gmail.com>
|
||||
Section: net
|
||||
Priority: optional
|
||||
Build-Depends: debhelper-compat (= 12),
|
||||
dh-apparmor,
|
||||
patch,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
pkg-config,
|
||||
ghostscript,
|
||||
libavahi-client-dev,
|
||||
libavahi-common-dev,
|
||||
libavahi-compat-libdnssd-dev,
|
||||
libdbus-1-dev,
|
||||
libfontconfig1-dev,
|
||||
libfreetype6-dev,
|
||||
libgnutls28-dev,
|
||||
libijs-dev,
|
||||
libjpeg-dev,
|
||||
libldap2-dev,
|
||||
libkrb5-dev,
|
||||
libpam0g-dev,
|
||||
libpaper-dev,
|
||||
libpng-dev,
|
||||
libsystemd-dev [linux-any],
|
||||
libtiff-dev,
|
||||
libusb-1.0-0-dev [!hurd-any],
|
||||
po4a,
|
||||
po-debconf,
|
||||
poppler-utils,
|
||||
sharutils,
|
||||
zlib1g-dev
|
||||
Build-Conflicts: libgmp-dev (<< 2:6)
|
||||
Standards-Version: 4.5.0
|
||||
Vcs-Browser: https://salsa.debian.org/printing-team/cups
|
||||
Vcs-Git: https://salsa.debian.org/printing-team/cups.git
|
||||
Homepage: https://www.cups.org/
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: libcups2
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libs
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Suggests: cups-common
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Description: Common UNIX Printing System(tm) - Core library
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the base shared libraries for CUPS.
|
||||
|
||||
Package: libcupsimage2
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libs
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libcups2 (= ${binary:Version})
|
||||
Recommends: libcupsfilters1
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Description: Common UNIX Printing System(tm) - Raster image library
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the image libraries for handling the CUPS
|
||||
raster format.
|
||||
|
||||
Package: cups
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
cups-core-drivers (>= ${binary:Version}),
|
||||
cups-daemon (>= ${binary:Version}),
|
||||
debconf | debconf-2.0,
|
||||
poppler-utils,
|
||||
procps,
|
||||
ghostscript,
|
||||
cups-common (>= ${source:Version}),
|
||||
cups-server-common (>= ${source:Version}),
|
||||
cups-client (>= ${binary:Version}),
|
||||
libcups2 (= ${binary:Version}),
|
||||
cups-ppdc,
|
||||
cups-filters
|
||||
Recommends: avahi-daemon,
|
||||
colord,
|
||||
cups-filters | foomatic-filters,
|
||||
cups-filters | ghostscript-cups
|
||||
Suggests: cups-bsd,
|
||||
foomatic-db-compressed-ppds | foomatic-db,
|
||||
cups-pdf,
|
||||
udev,
|
||||
smbclient
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Description: Common UNIX Printing System(tm) - PPD/driver support, web interface
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the parts of CUPS which are needed for using printer
|
||||
drivers.
|
||||
|
||||
Package: cups-core-drivers
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
cups-daemon (>= ${binary:Version}),
|
||||
libcups2 (= ${binary:Version}),
|
||||
cups-filters-core-drivers
|
||||
Recommends: avahi-daemon
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Breaks: cups-server-common (<< 2.1.0-0)
|
||||
Replaces: cups-server-common (<< 2.1.0-0)
|
||||
Description: Common UNIX Printing System(tm) - driverless printing
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the parts of CUPS which are needed for driverless
|
||||
printing on IPP printers with common data formats.
|
||||
|
||||
Package: cups-daemon
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
procps,
|
||||
lsb-base,
|
||||
libcups2 (= ${binary:Version}),
|
||||
ssl-cert,
|
||||
adduser,
|
||||
bc
|
||||
Recommends: colord,
|
||||
cups-browsed,
|
||||
avahi-daemon
|
||||
Suggests: cups,
|
||||
cups-bsd,
|
||||
cups-common (>= ${source:Version}),
|
||||
cups-server-common (>= ${source:Version}),
|
||||
cups-client (>= ${binary:Version}),
|
||||
cups-ppdc,
|
||||
cups-filters,
|
||||
poppler-utils,
|
||||
ghostscript,
|
||||
cups-filters | foomatic-filters,
|
||||
foomatic-db-compressed-ppds | foomatic-db,
|
||||
cups-pdf,
|
||||
udev,
|
||||
smbclient
|
||||
Breaks: cups (<< 2.1.0-0)
|
||||
Replaces: cups (<< 2.1.0-0)
|
||||
Description: Common UNIX Printing System(tm) - daemon
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the CUPS scheduler/daemon.
|
||||
|
||||
Package: cups-client
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
cups-common (>= ${source:Version}),
|
||||
libcups2 (= ${binary:Version}),
|
||||
adduser
|
||||
Suggests: cups,
|
||||
cups-bsd,
|
||||
smbclient
|
||||
Conflicts: lprng
|
||||
Description: Common UNIX Printing System(tm) - client programs (SysV)
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the System V style print client programs.
|
||||
|
||||
Package: cups-ipp-utils
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libcups2 (= ${binary:Version})
|
||||
Breaks: cups-client (<< 2.0.3-0)
|
||||
Replaces: cups-client (<< 2.0.3-0)
|
||||
Description: Common UNIX Printing System(tm) - IPP developer/admin utilities
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides IPP utilities for developers and system administrators
|
||||
|
||||
Package: libcups2-dev
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libcupsimage2-dev (= ${binary:Version}),
|
||||
libcups2 (= ${binary:Version}),
|
||||
dpkg-dev
|
||||
Description: Common UNIX Printing System(tm) - Development files CUPS library
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the files necessary for developing CUPS-aware
|
||||
applications and CUPS drivers, as well as examples how to communicate
|
||||
with cups from different programming languages (Perl, Java, and
|
||||
PHP).
|
||||
|
||||
Package: libcupsimage2-dev
|
||||
Architecture: any
|
||||
Multi-Arch: same
|
||||
Section: libdevel
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
libcupsimage2 (= ${binary:Version}),
|
||||
libcups2-dev (= ${binary:Version}),
|
||||
libpng-dev,
|
||||
libtiff-dev,
|
||||
libjpeg-dev,
|
||||
zlib1g-dev
|
||||
Recommends: libcupsfilters-dev
|
||||
Description: Common UNIX Printing System(tm) - Development files CUPS image library
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides the files necessary for developing applications
|
||||
that use the CUPS raster image format.
|
||||
|
||||
Package: cups-bsd
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
cups-client (= ${binary:Version}),
|
||||
debconf | debconf-2.0,
|
||||
cups-common (>= ${source:Version})
|
||||
Suggests: cups,
|
||||
inetutils-inetd | inet-superserver,
|
||||
update-inetd
|
||||
Conflicts: lpr,
|
||||
lprng
|
||||
Provides: lpr
|
||||
Replaces: lpr
|
||||
Description: Common UNIX Printing System(tm) - BSD commands
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpr, lpd and the like. It supports the
|
||||
Internet Printing Protocol (IPP), and has its own filtering driver
|
||||
model for handling various document types.
|
||||
.
|
||||
This package provides the BSD commands for interacting with CUPS. It
|
||||
is provided separately to allow CUPS to coexist with other printing
|
||||
systems (to a small degree).
|
||||
|
||||
Package: cups-common
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Description: Common UNIX Printing System(tm) - common files
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides common files for CUPS server and client packages.
|
||||
|
||||
Package: cups-server-common
|
||||
Architecture: all
|
||||
Multi-Arch: foreign
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Description: Common UNIX Printing System(tm) - server common files
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides common files for CUPS server.
|
||||
|
||||
Package: cups-ppdc
|
||||
Architecture: any
|
||||
Multi-Arch: foreign
|
||||
Section: utils
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
cups-common (>= ${source:Version})
|
||||
Description: Common UNIX Printing System(tm) - PPD manipulation utilities
|
||||
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
|
||||
general replacement for lpd and the like. It supports the Internet
|
||||
Printing Protocol (IPP), and has its own filtering driver model for
|
||||
handling various document types.
|
||||
.
|
||||
This package provides utilities to generate and manipulate PPD files.
|
|
@ -0,0 +1,145 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: CUPS
|
||||
Upstream-Contact: Michael Sweet <msweet@apple.com>
|
||||
Source: https://www.cups.org/software.html
|
||||
Copyright: 2005-2018, Apple Inc.
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception
|
||||
|
||||
Files: *
|
||||
Copyright: 2007-2019, Apple Inc.
|
||||
1993-2007, Easy Software Products
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception
|
||||
|
||||
Files: config-scripts/cups-gssapi.m4
|
||||
cups/auth.c
|
||||
cups/http.c
|
||||
cups/tls.c
|
||||
scheduler/auth.c
|
||||
scheduler/client.c
|
||||
scheduler/ipp.c
|
||||
Copyright: 2007-2019, Apple Inc.
|
||||
1993-2007, Easy Software Products
|
||||
2006, Jelmer Vernooij
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception
|
||||
|
||||
Files: configure
|
||||
Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
|
||||
License: FSFUL
|
||||
This configure script is free software; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
||||
Files: cups/md5-internal.h
|
||||
cups/md5.c
|
||||
Copyright: 2007-2019, Apple Inc.
|
||||
1993-2007, Easy Software Products
|
||||
1999, Aladdin Enterprises.
|
||||
License: Zlib
|
||||
|
||||
Files: debian/local/*
|
||||
Copyright: 2009, Canonical Ltd.
|
||||
License: Apache-2.0
|
||||
|
||||
Files: notifier/dbus.c
|
||||
Copyright: 2007-2019, Apple Inc.
|
||||
1993-2007, Easy Software Products
|
||||
2011, 2013 Red Hat, Inc.
|
||||
2007 Tim Waugh <twaugh@redhat.com>
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception
|
||||
|
||||
Files: scheduler/colorman.c
|
||||
Copyright: 2011, Red Hat, Inc.
|
||||
2007-2019, Apple Inc.
|
||||
1993-2007, Easy Software Products
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception or BSD-2-clause
|
||||
|
||||
License: Apache-2.0
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS"BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
.
|
||||
On Debian systems, the complete text of the Apache License,
|
||||
Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
|
||||
|
||||
License: Apache-2.0-with-GPL2-LGPL2-Exception
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS"BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
.
|
||||
On Debian systems, the complete text of the Apache License,
|
||||
Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
|
||||
.
|
||||
As an exception, if, as a result of your compiling your source code, portions
|
||||
of this Software are embedded into an Object form of such source code, you
|
||||
may redistribute such embedded portions in such Object form without complying
|
||||
with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
|
||||
.
|
||||
In addition, if you combine or link compiled forms of this Software with
|
||||
software that is licensed under the GPLv2 ("Combined Software") and if a
|
||||
court of competent jurisdiction determines that the patent provision (Section
|
||||
3), the indemnity provision (Section 9) or other Section of the License
|
||||
conflicts with the conditions of the GPLv2, you may retroactively and
|
||||
prospectively choose to deem waived or otherwise exclude such Section(s) of
|
||||
the License, but only in their entirety and only with respect to the Combined
|
||||
Software.
|
||||
|
||||
License: BSD-3-clause
|
||||
This software is Copyright (c) 2019 by foo.
|
||||
This is free software, licensed under:
|
||||
The (three-clause) BSD License
|
||||
The BSD License
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are
|
||||
met:
|
||||
* Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
* Neither the name of foo nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
||||
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
License: Zlib
|
||||
The zlib License
|
||||
.
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
.
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
.
|
||||
1. The origin of this software must not be misrepresented; you must
|
||||
not claim that you wrote the original software. If you use this
|
||||
software in a product, an acknowledgment in the product
|
||||
documentation would be appreciated but is not required.
|
||||
.
|
||||
2. Altered source versions must be plainly marked as such, and must
|
||||
not be misrepresented as being the original software.
|
||||
.
|
||||
3. This notice may not be removed or altered from any source
|
||||
distribution.
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# Debconf library
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
db_input medium cups-bsd/setuplpd || true
|
||||
db_go
|
|
@ -0,0 +1,4 @@
|
|||
usr/sbin/lpc
|
||||
usr/bin/lpq
|
||||
usr/bin/lpr
|
||||
usr/bin/lprm
|
|
@ -0,0 +1,4 @@
|
|||
usr/share/man/man1/lpr.1
|
||||
usr/share/man/man1/lprm.1
|
||||
usr/share/man/man1/lpq.1
|
||||
usr/share/man/man8/lpc.8
|
|
@ -0,0 +1,41 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# Debconf
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
|
||||
# Set documentation symlinks
|
||||
if [ -d /usr/share/doc/cups ]; then
|
||||
if [ ! -e /usr/share/doc/cups-bsd ]; then
|
||||
ln -sf cups-common /usr/share/doc/cups-bsd
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -x "`which update-inetd 2>/dev/null`" ]; then
|
||||
# Add cups-lpd to inetd.conf
|
||||
db_get cups-bsd/setuplpd
|
||||
if [ "$RET" = "true" ]; then
|
||||
update-inetd --add 'printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd'
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
# Remove inetd entry
|
||||
if [ -x "`which update-inetd 2>/dev/null`" ]; then
|
||||
update-inetd --pattern cups-lpd --remove printer 2>/dev/null || true
|
||||
fi
|
||||
|
||||
;;
|
||||
|
||||
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
|
@ -0,0 +1,28 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
install)
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
if [ ! -L /usr/share/doc/cups-bsd ]; then
|
||||
rm -rf /usr/share/doc/cups-bsd
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
if [ -L /etc/printcap ]; then
|
||||
rm -f /etc/printcap
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
# Remove documentation links
|
||||
rm -rf /usr/share/doc/cups-bsd
|
||||
|
||||
# Disable inetd entry
|
||||
if [ -x "`which update-inetd 2>/dev/null`" ]; then
|
||||
update-inetd --pattern cups-lpd --disable printer
|
||||
fi
|
||||
;;
|
||||
failed-upgrade)
|
||||
;;
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,12 @@
|
|||
# These templates have been reviewed by debian-l10n-english
|
||||
# Please do not modify them without asking for a review
|
||||
|
||||
Template: cups-bsd/setuplpd
|
||||
Type: boolean
|
||||
Default: false
|
||||
_Description: Do you want to set up the BSD lpd compatibility server?
|
||||
The CUPS package contains a server that can accept BSD-style print
|
||||
jobs and submit them to CUPS. It should only be set up if other
|
||||
computers are likely to submit jobs over the network via the "BSD" or
|
||||
"LPR" services, and these computers cannot be converted to use the
|
||||
IPP protocol that CUPS uses.
|
|
@ -0,0 +1,10 @@
|
|||
cups (1.6.2-10) unstable; urgency=low
|
||||
|
||||
From cups 1.6 the default IPP version for requests is 2.0. For remote
|
||||
connections configured with ServerName in /etc/cups/cups-client.conf,
|
||||
an older IPP version such as 1.1 or even 1.0 might need to be
|
||||
explicitly set for printing to keep working. For example:
|
||||
|
||||
ServerName remote-print-server.example.com/version=1.1
|
||||
|
||||
-- Didier Raboud <odyx@debian.org> Mon, 17 Jun 2013 08:51:44 +0200
|
|
@ -0,0 +1,14 @@
|
|||
usr/bin/cancel
|
||||
usr/bin/cupstestppd
|
||||
usr/bin/lp
|
||||
usr/bin/lpoptions
|
||||
usr/bin/lpstat
|
||||
usr/sbin/lpadmin
|
||||
usr/sbin/lpinfo
|
||||
usr/sbin/lpmove
|
||||
usr/sbin/cupsaccept
|
||||
usr/sbin/cupsreject
|
||||
usr/sbin/cupsdisable
|
||||
usr/sbin/cupsenable
|
||||
usr/sbin/cupsctl
|
||||
debian/tests/utils/test-drivers usr/share/cups/
|
|
@ -0,0 +1 @@
|
|||
/usr/share/doc/libcups2/README.Debian.gz /usr/share/doc/cups-client/README.Debian.gz
|
|
@ -0,0 +1,15 @@
|
|||
usr/share/man/man1/cupstestppd.1
|
||||
usr/share/man/man1/lp.1
|
||||
usr/share/man/man1/lpoptions.1
|
||||
usr/share/man/man1/lpstat.1
|
||||
usr/share/man/man1/cancel.1
|
||||
usr/share/man/man5/client.conf.5
|
||||
usr/share/man/man8/cupsenable.8
|
||||
usr/share/man/man8/lpadmin.8
|
||||
usr/share/man/man8/lpinfo.8
|
||||
usr/share/man/man8/lpmove.8
|
||||
usr/share/man/man8/cupsreject.8
|
||||
usr/share/man/man8/cupsdisable.8
|
||||
usr/share/man/man8/cupsaccept.8
|
||||
usr/share/man/man8/cupsctl.8
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
if [ -z "`getent group lpadmin`" ]; then
|
||||
addgroup --system lpadmin
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
install)
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
if [ -L /usr/share/doc/cups-client ]; then
|
||||
rm /usr/share/doc/cups-client
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,4 @@
|
|||
usr/share/cups/drv
|
||||
usr/share/cups/locale
|
||||
usr/share/cups/profiles
|
||||
usr/share/cups/ppdc/*.defs
|
|
@ -0,0 +1 @@
|
|||
cups-common: package-contains-empty-directory usr/share/cups/profiles/
|
|
@ -0,0 +1,2 @@
|
|||
etc/cups/ppd
|
||||
etc/cups/interfaces
|
|
@ -0,0 +1,4 @@
|
|||
usr/lib/cups/filter/pstops
|
||||
usr/lib/cups/filter/gziptoany
|
||||
usr/lib/cups/filter/commandtops
|
||||
usr/share/cups/mime/mime.convs
|
|
@ -0,0 +1 @@
|
|||
/usr/share/doc/libcups2/README.Debian.gz /usr/share/doc/cups-core-drivers/README.Debian.gz
|
|
@ -0,0 +1,19 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
rm -rf /etc/cups/interfaces
|
||||
rm -rf /etc/cups/ppd
|
||||
;;
|
||||
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
|
||||
esac
|
|
@ -0,0 +1,19 @@
|
|||
cups (2.1.4-3) unstable; urgency=low
|
||||
|
||||
The default ErrorPolicy is changed from 'stop-printer' to 'retry-job',
|
||||
as this is a much less confusing default in most use-cases.
|
||||
|
||||
The ErrorPolicy can be set globally in /etc/cups/cupsd.conf or
|
||||
per-printer, using the following command:
|
||||
lpadmin -p printername -o printer-error-policy=stop-printer
|
||||
|
||||
-- Didier Raboud <odyx@debian.org> Thu, 07 Jul 2016 16:43:34 +0200
|
||||
|
||||
cups (1.7.5-7) unstable; urgency=medium
|
||||
|
||||
CUPS can now be socket-activated when running under systemd as init, but
|
||||
isn't by default; if configured to do so, it can automatically exit itself
|
||||
after being idle for some time (30 seconds by default) by using the
|
||||
'SystemdIdleExit on' stanza in /etc/cups/cupsd.conf.
|
||||
|
||||
-- Didier Raboud <odyx@debian.org> Thu, 23 Oct 2014 22:06:18 +0200
|
|
@ -0,0 +1,95 @@
|
|||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: cups
|
||||
# Required-Start: $syslog $remote_fs
|
||||
# Required-Stop: $syslog $remote_fs
|
||||
# Should-Start: $network avahi-daemon slapd nslcd
|
||||
# Should-Stop: $network
|
||||
# X-Start-Before: samba
|
||||
# X-Stop-After: samba
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 1
|
||||
# Short-Description: CUPS Printing spooler and server
|
||||
# Description: Manage the CUPS Printing spooler and server;
|
||||
# make it's web interface accessible on http://localhost:631/
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Debian Printing Team <debian-printing@lists.debian.org>
|
||||
|
||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||
DAEMON=/usr/sbin/cupsd
|
||||
NAME=cupsd
|
||||
PIDFILE=/run/cups/$NAME.pid
|
||||
DESC="Common Unix Printing System"
|
||||
SCRIPTNAME=/etc/init.d/cups
|
||||
|
||||
unset TMPDIR
|
||||
|
||||
# Exit if the package is not installed
|
||||
test -x $DAEMON || exit 0
|
||||
|
||||
mkdir -p /run/cups/certs
|
||||
[ -x /sbin/restorecon ] && /sbin/restorecon -R /run/cups
|
||||
|
||||
# Define LSB log_* functions.
|
||||
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
|
||||
# and status_of_proc is working.
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
# Get the timezone set.
|
||||
if [ -z "$TZ" -a -e /etc/timezone ]; then
|
||||
TZ=`cat /etc/timezone`
|
||||
export TZ
|
||||
fi
|
||||
|
||||
coldplug_usb_printers() {
|
||||
if type udevadm > /dev/null 2>&1 && [ -x /lib/udev/udev-configure-printer ]; then
|
||||
for printer in `udevadm trigger --verbose --dry-run --subsystem-match=usb \
|
||||
--attr-match=bInterfaceClass=07 --attr-match=bInterfaceSubClass=01 2>/dev/null || true; \
|
||||
udevadm trigger --verbose --dry-run --subsystem-match=usb \
|
||||
--sysname-match='lp[0-9]*' 2>/dev/null || true`; do
|
||||
/lib/udev/udev-configure-printer add "${printer#/sys}"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Starting $DESC" "$NAME"
|
||||
|
||||
mkdir -p `dirname "$PIDFILE"`
|
||||
start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON
|
||||
status=$?
|
||||
[ $status = 0 ] && coldplug_usb_printers
|
||||
log_end_msg $status
|
||||
;;
|
||||
stop)
|
||||
log_daemon_msg "Stopping $DESC" "$NAME"
|
||||
start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME
|
||||
status=$?
|
||||
log_end_msg $status
|
||||
;;
|
||||
reload|force-reload)
|
||||
log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME --signal 1
|
||||
status=$?
|
||||
log_end_msg $status
|
||||
;;
|
||||
restart)
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
if start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME; then
|
||||
start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON
|
||||
fi
|
||||
status=$?
|
||||
log_end_msg $status
|
||||
;;
|
||||
status)
|
||||
status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,3 @@
|
|||
@include common-auth
|
||||
@include common-account
|
||||
@include common-session
|
|
@ -0,0 +1 @@
|
|||
etc/cups/ssl
|
|
@ -0,0 +1,2 @@
|
|||
debian/cups-socket.localhost.conf
|
||||
debian/cups-socket.public.conf
|
|
@ -0,0 +1,16 @@
|
|||
var/
|
||||
etc/cups/cups-files.conf
|
||||
usr/lib/cups/backend/ipp
|
||||
usr/lib/cups/backend/ipps
|
||||
usr/lib/cups/backend/http
|
||||
usr/lib/cups/backend/https
|
||||
usr/lib/cups/daemon/cups-exec
|
||||
usr/lib/cups/notifier
|
||||
usr/share/cups/mime/mime.types
|
||||
usr/share/cups/cupsd.conf.default
|
||||
usr/share/cups/cups-files.conf.default
|
||||
usr/share/cups/snmp.conf.default
|
||||
usr/sbin/cupsd
|
||||
lib/systemd/system/cups.socket
|
||||
lib/systemd/system/cups.path
|
||||
lib/systemd/system/cups.service
|
|
@ -0,0 +1 @@
|
|||
/usr/share/doc/libcups2/README.Debian.gz /usr/share/doc/cups-daemon/README.Debian.gz
|
|
@ -0,0 +1,3 @@
|
|||
cups-daemon: init.d-script-possible-missing-stop etc/init.d/cups 0 6
|
||||
# CUPS is WantedBy=printer.target
|
||||
cups-daemon: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/cups.service printer.target
|
|
@ -0,0 +1,13 @@
|
|||
/var/log/cups/*log {
|
||||
daily
|
||||
missingok
|
||||
rotate 7
|
||||
sharedscripts
|
||||
postrotate
|
||||
invoke-rc.d --quiet cups restart > /dev/null
|
||||
endscript
|
||||
compress
|
||||
delaycompress
|
||||
notifempty
|
||||
create
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
rm_conffile /etc/cups/cupsd.conf.default 1.7.1-3~
|
||||
rm_conffile /etc/default/cups 1.7.1-6~
|
||||
mv_conffile /etc/pam.d/cups-daemon /etc/pam.d/cups 1.7.3-2~
|
|
@ -0,0 +1,12 @@
|
|||
usr/share/man/man5/classes.conf.5
|
||||
usr/share/man/man5/cupsd.conf.5
|
||||
usr/share/man/man5/cups-files.conf.5
|
||||
usr/share/man/man5/cups-snmp.conf.5
|
||||
usr/share/man/man5/mailto.conf.5
|
||||
usr/share/man/man5/mime.types.5
|
||||
usr/share/man/man5/printers.conf.5
|
||||
usr/share/man/man7/backend.7
|
||||
usr/share/man/man7/notifier.7
|
||||
usr/share/man/man8/cupsd.8
|
||||
usr/share/man/man8/cups-snmp.8
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
if [ "$1" = configure ]; then
|
||||
# Set up lpadmin group.
|
||||
if [ -z "`getent group lpadmin`" ]; then
|
||||
addgroup --system lpadmin
|
||||
fi
|
||||
|
||||
for i in /etc/cups/classes.conf /etc/cups/printers.conf
|
||||
do
|
||||
if [ -f $i ] && ! dpkg-statoverride --list $i > /dev/null; then
|
||||
chown root:lp $i; chmod 600 $i
|
||||
fi
|
||||
done
|
||||
|
||||
# Enforce the ConfigFilePerm on ppd file if we upgrade to 2.1.x
|
||||
if dpkg --compare-versions "$2" lt-nl "2.1.0-2~"; then
|
||||
configfileperm=`egrep '^ConfigFilePerm ' /etc/cups/cupsd.conf | awk '{print $2}' | tail -n 1`
|
||||
if [ -z "$configfileperm" ]; then
|
||||
configfileperm=0640
|
||||
fi
|
||||
if [ -d /etc/cups/ppd ]; then
|
||||
for i in /etc/cups/ppd/*
|
||||
do
|
||||
if [ -f $i ]; then
|
||||
chown root:lp $i
|
||||
chmod $configfileperm $i
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# Manage printcap file and associated symlinks
|
||||
if [ -e /etc/cups/cupsd.conf ]; then
|
||||
if [ -e /etc/printcap.cups ]; then
|
||||
rm -f /etc/printcap.cups
|
||||
fi
|
||||
if [ -L /etc/printcap -a ! -e /etc/printcap ]; then
|
||||
rm -f /etc/printcap
|
||||
fi
|
||||
|
||||
printcap_file=`egrep '^Printcap ' /etc/cups/cupsd.conf | awk '{print $2}' | tail -n 1`
|
||||
if [ -z "$printcap_file" ]; then
|
||||
printcap_file=/run/cups/printcap
|
||||
fi
|
||||
if [ ! -e /etc/printcap -a -e $printcap_file ]; then
|
||||
ln -s $printcap_file /etc/printcap
|
||||
fi
|
||||
fi
|
||||
|
||||
# Create default cupsd.conf if it doesn't exist
|
||||
if [ ! -r /etc/cups/cupsd.conf ]; then
|
||||
cp /usr/share/cups/cupsd.conf.default /etc/cups/cupsd.conf
|
||||
fi
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,38 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
rm -rf /var/lib/cups
|
||||
rm -rf /var/log/cups
|
||||
rm -rf /run/cups
|
||||
rm -rf /var/cache/cups
|
||||
rm -rf /var/spool/cups
|
||||
rm -f /etc/cups/ssl/server.crt
|
||||
rm -f /etc/cups/ssl/server.key
|
||||
rm -rf /etc/cups/ssl
|
||||
rm -rf /etc/cups/passwd.md5
|
||||
rm -rf /etc/cups/cups.d
|
||||
rm -f /etc/cups/cupsd.conf
|
||||
rm -f /etc/cups/cupsd-systemd-listen.conf
|
||||
rm -f /etc/cups/cupsd.conf.pre16-bak
|
||||
rm -f /etc/cups/printers.conf* /etc/cups/classes.conf*
|
||||
rmdir /etc/cups 2>/dev/null || true
|
||||
;;
|
||||
abort-upgrade)
|
||||
if [ -e /etc/cups/cupsd.conf.conffile-bak ]; then
|
||||
# Move cupsd.conf back
|
||||
mv /etc/cups/cupsd.conf.conffile-bak /etc/cups/cupsd.conf
|
||||
fi
|
||||
;;
|
||||
remove|upgrade|failed-upgrade|abort-install|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
|
||||
esac
|
|
@ -0,0 +1,4 @@
|
|||
usr/bin/ippfind
|
||||
usr/bin/ipptool
|
||||
tools/ippeveprinter usr/sbin
|
||||
usr/share/cups/ipptool/*.test
|
|
@ -0,0 +1,4 @@
|
|||
usr/share/man/man1/ippeveprinter.1
|
||||
usr/share/man/man1/ippfind.1
|
||||
usr/share/man/man1/ipptool.1
|
||||
usr/share/man/man5/ipptoolfile.5
|
|
@ -0,0 +1,4 @@
|
|||
usr/bin/ppd*
|
||||
usr/share/cups/ppdc/*.h
|
||||
usr/share/cups/examples/
|
||||
usr/share/man/man?/ppd*.?
|
|
@ -0,0 +1,10 @@
|
|||
Document: cups
|
||||
Title: CUPS Documentation
|
||||
Author: Easy Software Products
|
||||
Abstract: This documentation covers the use and administration of a CUPS
|
||||
printing system, and the programming interface for the libcups API.
|
||||
Section: System/Hardware
|
||||
|
||||
Format: HTML
|
||||
Index: /usr/share/doc/cups/online-docs/index.html
|
||||
Files: /usr/share/doc/cups/online-docs/*.html
|
|
@ -0,0 +1,5 @@
|
|||
usr/share/cups/data
|
||||
usr/share/cups/doc-root
|
||||
usr/share/cups/model
|
||||
usr/share/cups/templates
|
||||
usr/share/cups/usb/org.cups.usb-quirks
|
|
@ -0,0 +1 @@
|
|||
/usr/share/cups/doc-root /usr/share/doc/cups/online-docs
|
|
@ -0,0 +1,2 @@
|
|||
cups-server-common: package-contains-empty-directory usr/share/cups/data/
|
||||
cups-server-common: package-contains-empty-directory usr/share/cups/model/
|
|
@ -0,0 +1 @@
|
|||
usr/share/man/man5/cupsd-logs.5
|
|
@ -0,0 +1,7 @@
|
|||
# This file goes in /etc/systemd/system/cups.socket.d/
|
||||
# Configures CUPS to only listen on localhost
|
||||
[Socket]
|
||||
# IPv4
|
||||
ListenStream=127.0.0.1:631
|
||||
# IPv6
|
||||
ListenStream=[::1]:631
|
|
@ -0,0 +1,8 @@
|
|||
# This file goes in /etc/systemd/system/cups.socket.d/
|
||||
# Configures CUPS to listen broadly
|
||||
[Socket]
|
||||
FreeBind=true
|
||||
# IPv4
|
||||
ListenStream=0.0.0.0:631
|
||||
# IPv6
|
||||
ListenStream=[::]:631
|
|
@ -0,0 +1,15 @@
|
|||
cups (1.5.3-2.7) unstable; urgency=low
|
||||
|
||||
In order to mitigate a privilege escalation from the lpadmin to root
|
||||
(CVE-2012-5519), the /etc/cups/cupsd.conf configuration file is split
|
||||
in two configuration files:
|
||||
|
||||
* /etc/cups/cupsd.conf can be edited by members of the lpadmin group
|
||||
through the cups web interface;
|
||||
* /etc/cups/cups-files.conf can only be edited by root;
|
||||
|
||||
Many sensitive configuration statements can now only be set in
|
||||
cups-files.conf. No statements have been moved automatically. Please
|
||||
check the respective manpages.
|
||||
|
||||
-- Didier Raboud <odyx@debian.org> Tue, 04 Dec 2012 12:13:14 +0100
|
|
@ -0,0 +1,20 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# Debconf library
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
db_get cupsys/raw-print
|
||||
OLD_RET=$RET
|
||||
|
||||
db_input low cupsys/raw-print || true
|
||||
db_go
|
||||
|
||||
db_get cupsys/raw-print
|
||||
if [ "$OLD_RET" != "$RET" ]; then
|
||||
db_fset cupsys/raw-print changed true
|
||||
fi
|
||||
|
||||
db_input low cupsys/backend || true
|
||||
db_go
|
|
@ -0,0 +1,4 @@
|
|||
#usr/local/share/ppd
|
||||
usr/share/ppd/custom
|
||||
# PPD-updating triggers directory
|
||||
usr/share/cups/ppd-updaters
|
|
@ -0,0 +1,4 @@
|
|||
CREDITS.md
|
||||
NOTICE
|
||||
README.md
|
||||
debian/HOWTO_BUGREPORT.txt
|
|
@ -0,0 +1 @@
|
|||
debian/printer.schema
|
|
@ -0,0 +1,15 @@
|
|||
etc/cups/snmp.conf
|
||||
usr/lib/cups/backend/lpd usr/lib/cups/backend-available
|
||||
usr/lib/cups/backend/socket usr/lib/cups/backend-available
|
||||
usr/lib/cups/backend/usb usr/lib/cups/backend-available
|
||||
usr/lib/cups/backend/dnssd usr/lib/cups/backend-available
|
||||
usr/lib/cups/backend/snmp usr/lib/cups/backend-available
|
||||
usr/lib/cups/cgi-bin
|
||||
usr/lib/cups/monitor
|
||||
usr/lib/cups/daemon/cups-deviced
|
||||
usr/lib/cups/daemon/cups-driverd
|
||||
usr/lib/cups/daemon/cups-lpd
|
||||
usr/lib/cups/filter/rasterto*
|
||||
usr/lib/cups/driver/
|
||||
usr/sbin/cupsfilter
|
||||
../presubj usr/share/bug/cups/
|
|
@ -0,0 +1 @@
|
|||
/usr/share/doc/libcups2/README.Debian.gz /usr/share/doc/cups/README.Debian.gz
|
|
@ -0,0 +1,6 @@
|
|||
cups: non-standard-executable-perm usr/lib/cups/backend-available/lpd 0744 != 0755
|
||||
cups: non-standard-executable-perm usr/lib/cups/backend-available/dnssd 0744 != 0755
|
||||
cups: non-standard-executable-perm usr/lib/cups/backend-available/usb 0744 != 0755
|
||||
cups: package-contains-empty-directory usr/lib/cups/driver/
|
||||
cups: package-contains-empty-directory usr/share/ppd/custom/
|
||||
cups: package-contains-empty-directory usr/share/cups/ppd-updaters/
|
|
@ -0,0 +1,14 @@
|
|||
# These three were removed in 1.3.10-3, but we're only finally doing this in 2.1.0-4~
|
||||
rm_conffile /etc/cups/pstopdf.convs 2.1.0-4~
|
||||
rm_conffile /etc/cups/oopstops.convs 2.1.0-4~
|
||||
rm_conffile /etc/cups/oopstops.types 2.1.0-4~
|
||||
|
||||
# These two were removed in 1.4.0~svn8773-1~, but we're only finally doing this in 2.0.3-9~
|
||||
rm_conffile /etc/cups/mime.convs 2.0.3-9~
|
||||
rm_conffile /etc/cups/mime.types 2.0.3-9~
|
||||
|
||||
rm_conffile /etc/cups/acroread.conf 1.6.2-9~
|
||||
rm_conffile /etc/cups/pdftops.conf 1.6.2-9~
|
||||
rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
|
||||
mv_conffile /etc/logrotate.d/cups /etc/logrotate.d/cups-daemon 1.6.1~
|
||||
rm_conffile /etc/logrotate.d/cups 1.6.2-3~
|
|
@ -0,0 +1,11 @@
|
|||
usr/share/man/man1/cups.1
|
||||
usr/share/man/man7/filter.7
|
||||
usr/share/man/man5/subscriptions.conf.5
|
||||
usr/share/man/man5/mime.convs.5
|
||||
usr/share/man/man8/cupsd-helper.8
|
||||
usr/share/man/man8/cups-deviced.8
|
||||
usr/share/man/man8/cups-driverd.8
|
||||
usr/share/man/man8/cups-exec.8
|
||||
usr/share/man/man8/cupsfilter.8
|
||||
usr/share/man/man8/cups-lpd.8
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# Debconf
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
if [ "$1" = configure ]; then
|
||||
# set up custom PPD directory
|
||||
if ! dpkg-statoverride --list /usr/share/ppd/custom > /dev/null
|
||||
then
|
||||
chown root:lpadmin /usr/share/ppd/custom 2>/dev/null || true
|
||||
chmod 3775 /usr/share/ppd/custom 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Generate raw MIME handling files if they don't already exist.
|
||||
if [ ! -e /etc/cups/raw.types ]; then
|
||||
cat >/etc/cups/raw.types <<EOF
|
||||
# This file was generated by the cups package. You may change it, or
|
||||
# reconfigure this file with dpkg-reconfigure. If it is removed, it
|
||||
# will be regenerated by the package scripts.
|
||||
|
||||
application/octet-stream
|
||||
EOF
|
||||
fi
|
||||
if [ ! -e /etc/cups/raw.convs ]; then
|
||||
cat >/etc/cups/raw.convs <<EOF
|
||||
# This file was generated by the cups package. You may change it, or
|
||||
# reconfigure this file with dpkg-reconfigure. If it is removed, it
|
||||
# will be regenerated by the package scripts.
|
||||
|
||||
application/octet-stream application/vnd.cups-raw 0 -
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Set up raw printing of application/octet-stream if desired.
|
||||
db_fget cupsys/raw-print changed
|
||||
if [ "$RET" = "true" ]; then
|
||||
mv /etc/cups/raw.convs /etc/cups/raw.convs-convert
|
||||
db_get cupsys/raw-print
|
||||
if [ "$RET" = "true" ]; then
|
||||
sed 's/^\s*#\s*application/application/' \
|
||||
< /etc/cups/raw.convs-convert > /etc/cups/raw.convs
|
||||
else
|
||||
sed 's/^application/#application/' \
|
||||
< /etc/cups/raw.convs-convert > /etc/cups/raw.convs
|
||||
fi
|
||||
rm -f /etc/cups/raw.convs-convert
|
||||
db_fset cupsys/raw-print changed false
|
||||
fi
|
||||
# Set up backends
|
||||
db_get cupsys/backend && SELECTED=$RET
|
||||
# We remove the scsi backend from the output as it got removed in CUPS 1.5.0
|
||||
# We also remove the IPP backends as they are statically in cups-daemon now
|
||||
list=`echo $SELECTED | sed -e 's/, /,/g' | sed -e 's/scsi,*\b//g' | sed -e 's/ipp,*\b//g' | sed -e 's/ipps,*\b//g' | sed -e 's/ipp14,*\b//g' | sed -e 's/parallel,*\b//g' | sed -e 's/serial,*\b//g'`
|
||||
save_IFS=$IFS
|
||||
IFS=,
|
||||
(cd /usr/lib/cups/backend && rm -f lpd socket usb snmp dnssd mdns)
|
||||
for module in $list; do
|
||||
ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
|
||||
if [ "$module" = "dnssd" ]; then
|
||||
ln /usr/lib/cups/backend/dnssd /usr/lib/cups/backend/mdns
|
||||
fi
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
# activate new backends on upgrades
|
||||
db_fset cupsys/backend changed false
|
||||
|
||||
# Resync Debconf database with real state
|
||||
list=`( cd /usr/lib/cups/backend && for f in lpd socket usb snmp dnssd; do [ -e $f ] && echo -n "$f, "; done ) | sed -e 's/, $//'`
|
||||
db_set cupsys/backend $list;
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
# ppd_updater is supposed to be launched only with a running CUPS.
|
||||
ppd_updater () {
|
||||
driverregexp="$1"
|
||||
gennicknameregexp="$2"
|
||||
|
||||
[ ! -z "$gennicknameregexp" ] && \
|
||||
gennicknameregexp="; $gennicknameregexp"
|
||||
gennicknameregexp='s/\s*\(recommended\)//'"$gennicknameregexp"
|
||||
tmpfile1=`mktemp -t updateppds.XXXXXX`
|
||||
tempfiles="$tempfiles $tmpfile1"
|
||||
grep -E $driverregexp $tmpfile0 > $tmpfile1 || :
|
||||
cd /etc/cups/ppd
|
||||
for ppd in *.ppd; do
|
||||
[ -r "$ppd" ] || continue
|
||||
queue=${ppd%.ppd}
|
||||
lpstat -h /run/cups/cups.sock -p "$queue" >/dev/null 2>&1 || continue
|
||||
nickname=`grep '\*NickName:' "$ppd" | cut -d '"' -f 2 | perl -p -e 's/\n$//' | perl -p -e "$gennicknameregexp" | perl -p -e 's/(\W)/\\\\$1/g'`
|
||||
lang=`grep '\*LanguageVersion:' "$ppd" | cut -d ' ' -f 2 | perl -e 'print lc(<>)' | perl -p -e 's/[\r\n]//gs'`
|
||||
ppdfound="0"
|
||||
englishppduri=""
|
||||
tmpfile2=`mktemp -t updateppds.XXXXXX`
|
||||
tempfiles="$tempfiles $tmpfile2"
|
||||
cat $tmpfile1 | perl -p -e "$gennicknameregexp; s/\n*$/\n/s" | grep -E '^\S+\s+.*'"$nickname"'$' | cut -d ' ' -f 1 > $tmpfile2
|
||||
while read newppduri; do
|
||||
[ "$ppdfound" = "0" ] && lpadmin -h /run/cups/cups.sock -p "$queue" -m $newppduri 2>/dev/null || continue
|
||||
newlang=`grep '\*LanguageVersion:' "$ppd" | cut -d ' ' -f 2 | perl -e 'print lc(<>)' | perl -p -e 's/[\r\n]//gs'`
|
||||
[ "$newlang" = "$lang" ] && ppdfound="1"
|
||||
[ "$newlang" = "english" ] && englishppduri="$newppduri"
|
||||
done < $tmpfile2
|
||||
[ "$ppdfound" = "0" ] && [ ! -z "$englishppduri" ] && lpadmin -h /run/cups/cups.sock -p "$queue" -m $englishppduri 2>/dev/null && ppdfound="1"
|
||||
[ "$ppdfound" = "1" ] && echo PPD for printer $queue updated >&2
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Do the following only if CUPS is running and the needed CUPS tools
|
||||
# are available
|
||||
if which lpstat > /dev/null 2>&1 && \
|
||||
which lpinfo > /dev/null 2>&1 && \
|
||||
which lpadmin > /dev/null 2>&1 && \
|
||||
LC_ALL=C lpstat -h /run/cups/cups.sock -r | grep -v not > /dev/null 2>&1; then
|
||||
|
||||
tempfiles=
|
||||
trap 'rm -f $tempfiles; exit 0' 0 HUP INT QUIT ILL ABRT PIPE TERM
|
||||
tmpfile0=`mktemp -t updateppds.XXXXXX`
|
||||
tempfiles="$tempfiles $tmpfile0"
|
||||
|
||||
lpinfo -h /run/cups/cups.sock -m > $tmpfile0
|
||||
|
||||
if [ "$1" = configure ] ; then
|
||||
# Update CUPS included drivers' queues
|
||||
echo "Updating PPD files for cups ..."
|
||||
ppd_updater 'lsb/usr/cups-included/|drv:///sample.drv/' 's/,\s*\d+\.\d+[\d\.]*$//i'
|
||||
fi
|
||||
if [ "$1" = triggered ] || [ "$1" = configure ] ; then
|
||||
# Update external drivers' queues.
|
||||
#
|
||||
# We log the modification dates of the file in
|
||||
# /usr/share/cups/ppd-updaters/* after updating the PPDs
|
||||
# according to them. These dates are more or less the creation
|
||||
# dates of the driver packages. Then we only update the PPDs of
|
||||
# packages, where the /usr/share/cups/ppd-updaters/* file has a
|
||||
# modification date different to the logged date as this means
|
||||
# that a fresh /usr/share/cups/ppd-updaters/* file and
|
||||
# therefore a fresh package got installed. This avoids updating
|
||||
# of PPDs when the corresponding package was not changed.
|
||||
logfile=/var/cache/cups/ppd-updates
|
||||
touch $logfile
|
||||
for driverfile in `ls /usr/share/cups/ppd-updaters`; do
|
||||
driver=`echo $driverfile | perl -p -e 's/\.ppd-updater$//' | perl -p -e 's/^printer-driver-//'`
|
||||
modtime=`ls -l --time-style=+%s /usr/share/cups/ppd-updaters/$driverfile | perl -p -e 's/^\s*\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s*$/$1\n/'`
|
||||
oldmodtime=`cat $logfile | grep " $driver$" | cut -d ' ' -f 1`
|
||||
if [ "$modtime" != "$oldmodtime" ]; then
|
||||
echo "Updating PPD files for $driver ..."
|
||||
. /usr/share/cups/ppd-updaters/${driverfile}
|
||||
ppd_updater "${DRIVER_REGEXP}" "${GENNICKNAME_REGEXP}"
|
||||
cat $logfile | grep -v " $driver$" > $logfile.new || touch $logfile.new
|
||||
echo "$modtime $driver" >> $logfile.new
|
||||
mv $logfile.new $logfile
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
db_stop
|
||||
exit 0
|
|
@ -0,0 +1,18 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
case "$1" in
|
||||
purge)
|
||||
rm -f /var/lib/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types
|
||||
;;
|
||||
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postrm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
|
||||
esac
|
|
@ -0,0 +1,21 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
remove)
|
||||
(cd /usr/lib/cups/backend && rm -f lpd socket usb snmp dnssd mdns)
|
||||
;;
|
||||
upgrade|deconfigure)
|
||||
;;
|
||||
failed-upgrade)
|
||||
;;
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,28 @@
|
|||
# These templates have been reviewed by debian-l10n-english
|
||||
# Please do not modify them without asking for a review
|
||||
|
||||
Template: cupsys/raw-print
|
||||
Type: boolean
|
||||
Default: true
|
||||
_Description: Do you want CUPS to print unknown jobs as raw jobs?
|
||||
The Internet Printing Protocol (IPP) enforces a MIME type for all
|
||||
print jobs. Since not all sources of print jobs can attach an
|
||||
appropriate type, many jobs get submitted as the MIME type
|
||||
application/octet-stream and could be rejected if CUPS cannot guess
|
||||
the job's format.
|
||||
.
|
||||
CUPS can handle all such jobs as "raw" jobs, which causes them to be
|
||||
sent directly to the printer without processing.
|
||||
.
|
||||
It is recommended to choose this option if the server will be
|
||||
accepting print jobs from Windows computers or Samba servers.
|
||||
|
||||
Template: cupsys/backend
|
||||
Type: multiselect
|
||||
__Choices: lpd, socket, usb, snmp, dnssd
|
||||
Default: lpd, socket, usb, snmp, dnssd
|
||||
_Description: Printer communication backends:
|
||||
CUPS uses backend programs to communicate with the printer device or port.
|
||||
.
|
||||
Please choose the backend program to be used by CUPS. The default choice
|
||||
should fit the most common environments.
|
|
@ -0,0 +1,4 @@
|
|||
# Trigger is activated when a driver touches a file named after the binary
|
||||
# package name containing proper DRIVER_REGEXP and GENNICKNAME_REGEXP shell
|
||||
# variables in the /usr/share/cups/ppd-updaters/ directory
|
||||
interest-noawait /usr/share/cups/ppd-updaters
|
|
@ -0,0 +1,4 @@
|
|||
[DEFAULT]
|
||||
debian-branch = debian/master
|
||||
upstream-branch = upstream/latest
|
||||
pristine-tar = True
|
|
@ -0,0 +1,6 @@
|
|||
include:
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
|
||||
|
||||
variables:
|
||||
RELEASE: 'experimental'
|
|
@ -0,0 +1,8 @@
|
|||
libcups2-dev (2.3~b3-1) experimental; urgency=low
|
||||
|
||||
CUPS has changed its license to Apache-2.0 which is incompatible with GPL-2
|
||||
(only). Maintainers of GPL-2 software linking against libcups2 or
|
||||
libcupsimage2 must either get its license changed or stop shipping said
|
||||
software.
|
||||
|
||||
-- Didier Raboud <odyx@debian.org> Thu, 22 Feb 2018 20:05:28 +0100
|
|
@ -0,0 +1,18 @@
|
|||
usr/bin/cups-config
|
||||
usr/lib/*/libcups.so
|
||||
usr/lib/*/libcups.a
|
||||
usr/include/cups/adminutil.h
|
||||
usr/include/cups/array.h
|
||||
usr/include/cups/backend.h
|
||||
usr/include/cups/cups.h
|
||||
usr/include/cups/dir.h
|
||||
usr/include/cups/file.h
|
||||
usr/include/cups/http.h
|
||||
usr/include/cups/ipp.h
|
||||
usr/include/cups/language.h
|
||||
usr/include/cups/ppd.h
|
||||
usr/include/cups/pwg.h
|
||||
usr/include/cups/sidechannel.h
|
||||
usr/include/cups/transcode.h
|
||||
usr/include/cups/versioning.h
|
||||
#../../cups/language-private.h usr/include/cups/i18n.h
|
|
@ -0,0 +1 @@
|
|||
usr/share/man/man1/cups-config.1
|
|
@ -0,0 +1,32 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
install)
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
if [ ! -L /usr/share/doc/libcups2-dev ]; then
|
||||
rm -rf /usr/share/doc/libcups2-dev
|
||||
fi
|
||||
# workaround for upgrades where this changed from a directory to a file;
|
||||
# this fails with overlays (containers, schroots) sometimes (LP: #1272285)
|
||||
# this can be dropped in jessie+1/trusty+1
|
||||
if [ -d /usr/include/cups/i18n.h ]; then
|
||||
rm -rf /usr/include/cups/i18n.h
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,198 @@
|
|||
Conventions used in this document
|
||||
================================
|
||||
|
||||
In this README we will use 'cups' to refer to versions 1.6.x (and newer)
|
||||
of the Debian package. When necessary, other versions will be specified
|
||||
explicitly. This is because there is a very important difference in the
|
||||
behaviour of cups and cups 1.5.x (or older versions) regarding advertising
|
||||
print queues. In almost every other regard, the behaviour of cups is
|
||||
identical to its preceding versions.
|
||||
|
||||
We will we also use 'standard' to mean a Debian cups installation which
|
||||
pulls in all recommended packages. This will set you up with a complete
|
||||
filtering system and an extensive selection of printer drivers and PPD
|
||||
files.
|
||||
|
||||
|
||||
Print queues, drivers and printers
|
||||
==================================
|
||||
|
||||
Below is an outline view of the progress of a job through the printing
|
||||
system:
|
||||
|
||||
Submitted cups scheduler Filtering system Transport mechanism
|
||||
print -> and -> plus -> USB, network, -> Printer
|
||||
job print queue drivers etc
|
||||
|
||||
For this to take place successfully the scheduler must be told:
|
||||
|
||||
* Which driver the job is to use (a PPD file)
|
||||
* The transport mechanism (the device-uri)
|
||||
|
||||
Given these two things, it will then have a print queue set up to submit
|
||||
the job to. Reading lpinfo(8) and lpadmin(8) will give you more on the
|
||||
fundamental way of establishing a queue.
|
||||
|
||||
Debian supports printers via printer driver executables and PPD files in
|
||||
the cups, ghostscript. foomatic and printer-driver-* packages. It is more
|
||||
than likely you will find something to suit you from this collection of
|
||||
free software. If needs be, a manufacturer supplied PPD can be provided
|
||||
using lpadmin or the web interface.
|
||||
|
||||
Prior to setting up a queue it is a good idea to visit
|
||||
|
||||
http://www.openprinting.org
|
||||
|
||||
to get some idea from its extensive database as to which drivers are
|
||||
suitable for your printer.
|
||||
|
||||
|
||||
Setting up a local print queue
|
||||
==============================
|
||||
|
||||
The command line tools, lpadmin and lpinfo, can be used for this. Also,
|
||||
depending on what is installed on your system, a queue may be set up in an
|
||||
automated way. However, cups provides a web interface to accomplish the
|
||||
same task. It is accessed from a browser with
|
||||
|
||||
http://localhost:631
|
||||
|
||||
There is copious documentation under 'Online Help' and 'Printers' will
|
||||
display a list of local and remote print queues.
|
||||
|
||||
'Administration' is where you need to be to set up a local print queue.
|
||||
At some point you will be required to authenticate. A User Name of 'root'
|
||||
and root's password is always acceptable. Any other user must be a member
|
||||
of the lpadmin group.
|
||||
|
||||
By default cups is configured only to allow connections to local queues
|
||||
from localhost, effectively disabling printing to them from other
|
||||
machines on the network. The web interface or cupsd.conf and printers.conf
|
||||
in /etc/cups can be used to alter this behaviour.
|
||||
|
||||
|
||||
Printing to advertised, shared print queues
|
||||
===========================================
|
||||
|
||||
Suppose you are on a network which has a server using the
|
||||
Bonjour/DNS-SD/mDNS protocol to advertise its local print queues as being
|
||||
shared. Your machine will have a list of the advertised queues if you have
|
||||
avahi-daemon installed and running. But your cups needs a little help to
|
||||
access this list. It can get assistance from cups-browsed.
|
||||
|
||||
In its default setup cups-browsed will see exactly what avahi-daemon sees.
|
||||
From this information it creates local queues which, just like the local
|
||||
queues you may have created yourself, are capable of being used by your
|
||||
applications. The difference is that the discovered queues are raw queues:
|
||||
any job sent to them is processed on the remote machine, not on your
|
||||
machine.
|
||||
|
||||
A standard cups installation includes avahi-daemon and cups-browsed. This
|
||||
means your machine will pick up the Bonjour broadcasts of remote servers
|
||||
and, without any further configuration, you will have its queues listed in
|
||||
/etc/cups/printers.conf and displayed with 'lpstat -a'.
|
||||
|
||||
Now for the bad news! The remote server may not be broadcasting with the
|
||||
Bonjour protocol but using the CUPS/IPP browsing protocol. cups knows
|
||||
nothing whatsoever about this protocol so forget about it being able to
|
||||
use or process information from the remote print queues. But, good news;
|
||||
cups-browsed can come to the rescue. Please read its documentation and
|
||||
check the setting for 'BrowseRemoteProtocols' in its configuration file,
|
||||
/etc/cups/cups-browsed.conf. If it is 'CUPS dnssd' you have nothing to do.
|
||||
|
||||
|
||||
Advertising your local queues
|
||||
=============================
|
||||
|
||||
Your cups install (standard or not) automatically uses only the Bonjour
|
||||
protocol to advertise any print queues you choose to share. Sharing
|
||||
print queues may be done either by
|
||||
|
||||
* setting 'Browsing' to 'On' or 'Off' in /etc/cups/cusd.conf
|
||||
or
|
||||
* Using the Administration section of the web interface
|
||||
|
||||
Having done this, finer control over individual print queues can be
|
||||
achieved in /etc/cups/printers.conf with 'Shared' as 'On' or 'Off' for
|
||||
chosen printers. Alternatively, a print queue can be modified from the
|
||||
Printers section of the web interface.
|
||||
|
||||
Ok, you have chosen to share; everything is now alright? Not quite! A
|
||||
1.6.x machine listening to your Bonjour broadcasts will be capable of
|
||||
processing them with the aid of cups-browsed but a 1.5.x (or older)
|
||||
machine will not be. This is because it usually does not have
|
||||
cups-browsed available to install so can only process CUPS/IPP protocol
|
||||
broadcasts. But, once again, cups-browsed on your machine can help your
|
||||
cups daemon out. Please read its documentation.
|
||||
|
||||
Socket-activation under systemd
|
||||
========================================
|
||||
|
||||
Since 1.7.1-7, when systemd is the active init system, CUPS can be
|
||||
configured to be socket-activated; it will then only be launched on accesses to
|
||||
its sockets. The socket definition in /lib/systemd/system/cups.socket gets
|
||||
configured through files in /etc/systemd/system/cups.socket.d/; see
|
||||
systemd.unit(5) and the examples files in /usr/share/doc/cups-daemon/examples .
|
||||
|
||||
CUPS opens its listening ports based on 'Port' and 'Listen' stanzas in
|
||||
/etc/cups/cupsd.conf. For systemd's socket activation to working, cups.socket
|
||||
needs to be configured to listen to the correct IPs and aports by dropping
|
||||
configuration files in the /etc/systemd/system/cups.socket.d/ directory.
|
||||
|
||||
When launched by socket-activation, CUPS can additionally exit itself after
|
||||
being idle for some time (60 seconds by default) by setting 'IdleExitTimeout'
|
||||
in /etc/cups/cupsd.conf'.
|
||||
|
||||
Printing without using a local cups daemon
|
||||
==========================================
|
||||
|
||||
For this to be possible you need to have permission to access a remote
|
||||
server and to have at least cups-client installed. The cups and
|
||||
cups-daemon packages are not required. The documentation for cups and
|
||||
client.conf(5) should be sufficient to guide you further.
|
||||
|
||||
|
||||
LPD support.
|
||||
============
|
||||
|
||||
The BSD commands are separated into their own package, cups-bsd, whereas
|
||||
the cups-lpd daemon is in the cups package. The hope is to make it
|
||||
possible to have cups and some other BSD-style printing system (such as
|
||||
lpr) side-by-side for testing purposes. However, it's known that cups
|
||||
conflicts with LPRng, since LPRng provides some System V printing commands
|
||||
as well; this problem will (hopefully) be dealt with in time.
|
||||
|
||||
The cups-lpd daemon is disabled by default. To enable it install cups-bsd
|
||||
and update-inetd; then run:
|
||||
|
||||
dpkg-reconfigure cups-bsd
|
||||
|
||||
and follow the prompts. You will need a compatible inetd daemon installed
|
||||
(not xinetd).
|
||||
|
||||
When using the LPD support provided by cups-bsd you need to ensure
|
||||
debconf knows that you want LPD support enabled, otherwise LPD support
|
||||
will be disabled when you upgrade cups-bsd. To check, install
|
||||
debconf-utils and execute:
|
||||
|
||||
debconf-get-selections | grep setuplpd
|
||||
|
||||
The command should return:
|
||||
|
||||
cups-bsd cups-bsd/setuplpd boolean true
|
||||
|
||||
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
Please see /usr/share/doc/cups/HOWTO_BUGREPORT.txt.
|
||||
|
||||
|
||||
|
||||
|
||||
This document is based on the one originally written by
|
||||
|
||||
Jeff Licquia <licquia@debian.org> and Kenshi Muto <kmuto@debian.org>
|
||||
|
||||
and has been updated by Brian Potkin to reflect changes in the Debian
|
||||
printing system during the intervening period.
|
|
@ -0,0 +1 @@
|
|||
debian/client.conf
|
|
@ -0,0 +1 @@
|
|||
usr/lib/*/libcups.so.*
|
|
@ -0,0 +1,455 @@
|
|||
libcups.so.2 libcups2 #MINVER#
|
||||
# Keep these at the latest upstream release
|
||||
(optional|regex)"^_pwg.*@Base$" 2.3~b6
|
||||
(optional|regex)"^_cups.*@Base$" 2.3~b6
|
||||
(optional|regex)"^_http.*@Base$" 2.3~b6
|
||||
(optional|regex)"^_ipp.*@Base$" 2.3~b6
|
||||
(optional|regex)"^_ppd.*@Base$" 2.3~b6
|
||||
(optional=GnuTLS)_httpReadGNUTLS@Base 1.4.4-3~
|
||||
(optional=GnuTLS)_httpWriteGNUTLS@Base 1.4.4-3~
|
||||
cupsAddDest@Base 1.4.0
|
||||
cupsAddDestMediaOptions@Base 2.3~b1
|
||||
cupsAddIntegerOption@Base 2.2.4
|
||||
cupsAddOption@Base 1.4.0
|
||||
cupsAdminCreateWindowsPPD@Base 1.4.0
|
||||
cupsAdminExportSamba@Base 1.4.0
|
||||
cupsAdminGetServerSettings@Base 1.4.0
|
||||
cupsAdminSetServerSettings@Base 1.4.0
|
||||
cupsArrayAdd@Base 1.4.0
|
||||
cupsArrayClear@Base 1.4.0
|
||||
cupsArrayCount@Base 1.4.0
|
||||
cupsArrayCurrent@Base 1.4.0
|
||||
cupsArrayDelete@Base 1.4.0
|
||||
cupsArrayDup@Base 1.4.0
|
||||
cupsArrayFind@Base 1.4.0
|
||||
cupsArrayFirst@Base 1.4.0
|
||||
cupsArrayGetIndex@Base 1.4.0
|
||||
cupsArrayGetInsert@Base 1.4.0
|
||||
cupsArrayIndex@Base 1.4.0
|
||||
cupsArrayInsert@Base 1.4.0
|
||||
cupsArrayLast@Base 1.4.0
|
||||
cupsArrayNew2@Base 1.4.0
|
||||
cupsArrayNew3@Base 1.5.0
|
||||
cupsArrayNew@Base 1.4.0
|
||||
cupsArrayNext@Base 1.4.0
|
||||
cupsArrayPrev@Base 1.4.0
|
||||
cupsArrayRemove@Base 1.4.0
|
||||
cupsArrayRestore@Base 1.4.0
|
||||
cupsArraySave@Base 1.4.0
|
||||
cupsArrayUserData@Base 1.4.0
|
||||
cupsBackChannelRead@Base 1.4.0
|
||||
cupsBackChannelWrite@Base 1.4.0
|
||||
cupsBackendDeviceURI@Base 1.4.0
|
||||
cupsBackendReport@Base 1.4.0
|
||||
cupsCancelDestJob@Base 1.6.0
|
||||
cupsCancelJob2@Base 1.4.0
|
||||
cupsCancelJob@Base 1.4.0
|
||||
cupsCharsetToUTF8@Base 1.4.0
|
||||
cupsCheckDestSupported@Base 1.6.0
|
||||
cupsCloseDestJob@Base 1.6.0
|
||||
cupsConnectDest@Base 1.6.0
|
||||
cupsCopyDest@Base 1.6.0
|
||||
cupsCopyDestConflicts@Base 1.6.0
|
||||
cupsCopyDestInfo@Base 1.6.0
|
||||
cupsCreateDestJob@Base 1.6.0
|
||||
cupsCreateJob@Base 1.4.0
|
||||
cupsDirClose@Base 1.4.0
|
||||
cupsDirOpen@Base 1.4.0
|
||||
cupsDirRead@Base 1.4.0
|
||||
cupsDirRewind@Base 1.4.0
|
||||
cupsDoAuthentication@Base 1.4.0
|
||||
cupsDoFileRequest@Base 1.4.0
|
||||
cupsDoIORequest@Base 1.4.0
|
||||
cupsDoRequest@Base 1.4.0
|
||||
cupsEncodeOption@Base 2.3~b4
|
||||
cupsEncodeOptions2@Base 1.4.0
|
||||
cupsEncodeOptions@Base 1.4.0
|
||||
cupsEncryption@Base 1.4.0
|
||||
cupsEnumDests@Base 1.6.0
|
||||
cupsFileClose@Base 1.4.0
|
||||
cupsFileCompression@Base 1.4.0
|
||||
cupsFileEOF@Base 1.4.0
|
||||
cupsFileFind@Base 1.4.0
|
||||
cupsFileFlush@Base 1.4.0
|
||||
cupsFileGetChar@Base 1.4.0
|
||||
cupsFileGetConf@Base 1.4.0
|
||||
cupsFileGetLine@Base 1.4.0
|
||||
cupsFileGets@Base 1.4.0
|
||||
cupsFileLock@Base 1.4.0
|
||||
cupsFileNumber@Base 1.4.0
|
||||
cupsFileOpen@Base 1.4.0
|
||||
cupsFileOpenFd@Base 1.4.0
|
||||
cupsFilePeekChar@Base 1.4.0
|
||||
cupsFilePrintf@Base 1.4.0
|
||||
cupsFilePutChar@Base 1.4.0
|
||||
cupsFilePutConf@Base 1.4.0
|
||||
cupsFilePuts@Base 1.4.0
|
||||
cupsFileRead@Base 1.4.0
|
||||
cupsFileRewind@Base 1.4.0
|
||||
cupsFileSeek@Base 1.4.0
|
||||
cupsFileStderr@Base 1.4.0
|
||||
cupsFileStdin@Base 1.4.0
|
||||
cupsFileStdout@Base 1.4.0
|
||||
cupsFileTell@Base 1.4.0
|
||||
cupsFileUnlock@Base 1.4.0
|
||||
cupsFileWrite@Base 1.4.0
|
||||
cupsFindDestDefault@Base 1.7.0
|
||||
cupsFindDestReady@Base 1.7.0
|
||||
cupsFindDestSupported@Base 1.7.0
|
||||
cupsFinishDestDocument@Base 1.6.0
|
||||
cupsFinishDocument@Base 1.4.0
|
||||
cupsFreeDestInfo@Base 1.6.0
|
||||
cupsFreeDests@Base 1.4.0
|
||||
cupsFreeJobs@Base 1.4.0
|
||||
cupsFreeOptions@Base 1.4.0
|
||||
cupsGetClasses@Base 1.4.0
|
||||
cupsGetConflicts@Base 1.4.0
|
||||
cupsGetDefault2@Base 1.4.0
|
||||
cupsGetDefault@Base 1.4.0
|
||||
cupsGetDest@Base 1.4.0
|
||||
cupsGetDestMediaByIndex@Base 1.7.0
|
||||
cupsGetDestMediaByName@Base 1.6.0
|
||||
cupsGetDestMediaBySize@Base 1.6.0
|
||||
cupsGetDestMediaCount@Base 1.7.0
|
||||
cupsGetDestMediaDefault@Base 1.7.0
|
||||
cupsGetDestWithURI@Base 2.0.2
|
||||
cupsGetDests2@Base 1.4.0
|
||||
cupsGetDests@Base 1.4.0
|
||||
cupsGetDevices@Base 1.4.0
|
||||
cupsGetFd@Base 1.4.0
|
||||
cupsGetFile@Base 1.4.0
|
||||
cupsGetIntegerOption@Base 2.2.4
|
||||
cupsGetJobs2@Base 1.4.0
|
||||
cupsGetJobs@Base 1.4.0
|
||||
cupsGetNamedDest@Base 1.4.0
|
||||
cupsGetOption@Base 1.4.0
|
||||
cupsGetPPD2@Base 1.4.0
|
||||
cupsGetPPD3@Base 1.4.0
|
||||
cupsGetPPD@Base 1.4.0
|
||||
cupsGetPassword2@Base 1.4.0
|
||||
cupsGetPassword@Base 1.4.0
|
||||
cupsGetPrinters@Base 1.4.0
|
||||
cupsGetResponse@Base 1.4.0
|
||||
cupsHashData@Base 2.2~b2
|
||||
cupsHashString@Base 2.2.7
|
||||
cupsGetServerPPD@Base 1.4.0
|
||||
cupsLangDefault@Base 1.4.0
|
||||
cupsLangEncoding@Base 1.4.0
|
||||
cupsLangFlush@Base 1.4.0
|
||||
cupsLangFree@Base 1.4.0
|
||||
cupsLangGet@Base 1.4.0
|
||||
cupsLastError@Base 1.4.0
|
||||
cupsLastErrorString@Base 1.4.0
|
||||
cupsLocalizeDestMedia@Base 2.0.2
|
||||
cupsLocalizeDestOption@Base 1.6.0
|
||||
cupsLocalizeDestValue@Base 1.6.0
|
||||
cupsMakeServerCredentials@Base 2.0.2
|
||||
cupsMarkOptions@Base 1.4.0
|
||||
cupsNotifySubject@Base 1.4.0
|
||||
cupsNotifyText@Base 1.4.0
|
||||
cupsParseOptions@Base 1.4.0
|
||||
cupsPrintFile2@Base 1.4.0
|
||||
cupsPrintFile@Base 1.4.0
|
||||
cupsPrintFiles2@Base 1.4.0
|
||||
cupsPrintFiles@Base 1.4.0
|
||||
cupsPutFd@Base 1.4.0
|
||||
cupsPutFile@Base 1.4.0
|
||||
cupsRasterClose@Base 2.3~b6
|
||||
cupsRasterErrorString@Base 2.3~b6
|
||||
cupsRasterInitPWGHeader@Base 2.3~b6
|
||||
cupsRasterInterpretPPD@Base 2.3~b6
|
||||
cupsRasterOpen@Base 2.3~b6
|
||||
cupsRasterOpenIO@Base 2.3~b6
|
||||
cupsRasterReadHeader2@Base 2.3~b6
|
||||
cupsRasterReadHeader@Base 2.3~b6
|
||||
cupsRasterReadPixels@Base 2.3~b6
|
||||
cupsRasterWriteHeader2@Base 2.3~b6
|
||||
cupsRasterWriteHeader@Base 2.3~b6
|
||||
cupsRasterWritePixels@Base 2.3~b6
|
||||
cupsReadResponseData@Base 1.4.0
|
||||
cupsRemoveDest@Base 1.4.0
|
||||
cupsRemoveOption@Base 1.4.0
|
||||
cupsResolveConflicts@Base 1.4.0
|
||||
cupsSendRequest@Base 1.4.0
|
||||
cupsServer@Base 1.4.0
|
||||
cupsSetClientCertCB@Base 1.5.0
|
||||
cupsSetCredentials@Base 1.5.0
|
||||
cupsSetDefaultDest@Base 1.4.0
|
||||
cupsSetDests2@Base 1.4.0
|
||||
cupsSetDests@Base 1.4.0
|
||||
cupsSetEncryption@Base 1.4.0
|
||||
cupsSetPasswordCB2@Base 1.4.0
|
||||
cupsSetPasswordCB@Base 1.4.0
|
||||
cupsSetServer@Base 1.4.0
|
||||
cupsSetServerCertCB@Base 1.5.0
|
||||
cupsSetServerCredentials@Base 2.0.2
|
||||
cupsSetUser@Base 1.4.0
|
||||
cupsSetUserAgent@Base 1.7.0
|
||||
cupsSideChannelDoRequest@Base 1.4.0
|
||||
cupsSideChannelRead@Base 1.4.0
|
||||
cupsSideChannelSNMPGet@Base 1.4.0
|
||||
cupsSideChannelSNMPWalk@Base 1.4.0
|
||||
cupsSideChannelWrite@Base 1.4.0
|
||||
cupsStartDestDocument@Base 1.6.0
|
||||
cupsStartDocument@Base 1.4.0
|
||||
cupsTempFd@Base 1.4.0
|
||||
cupsTempFile2@Base 1.4.0
|
||||
cupsTempFile@Base 1.4.0
|
||||
cupsUTF32ToUTF8@Base 1.4.0
|
||||
cupsUTF8ToCharset@Base 1.4.0
|
||||
cupsUTF8ToUTF32@Base 1.4.0
|
||||
cupsUser@Base 1.4.0
|
||||
cupsUserAgent@Base 1.7.0
|
||||
cupsWriteRequestData@Base 1.4.0
|
||||
httpAcceptConnection@Base 1.7.0
|
||||
httpAddCredential@Base 1.5.0
|
||||
httpAddrAny@Base 1.4.0
|
||||
httpAddrClose@Base 2.0.2
|
||||
httpAddrConnect2@Base 1.6.0
|
||||
httpAddrConnect@Base 1.4.0
|
||||
httpAddrCopyList@Base 1.7.0
|
||||
httpAddrEqual@Base 1.4.0
|
||||
httpAddrFamily@Base 2.0.2
|
||||
httpAddrFreeList@Base 1.4.0
|
||||
httpAddrGetList@Base 1.4.0
|
||||
httpAddrLength@Base 1.4.0
|
||||
httpAddrListen@Base 1.7.0
|
||||
httpAddrLocalhost@Base 1.4.0
|
||||
httpAddrLookup@Base 1.4.0
|
||||
httpAddrPort@Base 1.7.0
|
||||
httpAddrString@Base 1.4.0
|
||||
httpAssembleURI@Base 1.4.0
|
||||
httpAssembleURIf@Base 1.4.0
|
||||
httpAssembleUUID@Base 1.7.0
|
||||
httpBlocking@Base 1.4.0
|
||||
httpCheck@Base 1.4.0
|
||||
httpClearCookie@Base 1.4.0
|
||||
httpClearFields@Base 1.4.0
|
||||
httpClose@Base 1.4.0
|
||||
httpCompareCredentials@Base 2.0.2
|
||||
httpConnect2@Base 1.7.0
|
||||
httpConnect@Base 1.4.0
|
||||
httpConnectEncrypt@Base 1.4.0
|
||||
httpCopyCredentials@Base 1.5.0
|
||||
httpCredentialsAreValidForName@Base 2.0.2
|
||||
httpCredentialsGetExpiration@Base 2.0.2
|
||||
httpCredentialsGetTrust@Base 2.0.2
|
||||
httpCredentialsString@Base 2.0.2
|
||||
httpDecode64@Base 1.4.0
|
||||
httpDecode64_2@Base 1.4.0
|
||||
httpDelete@Base 1.4.0
|
||||
httpEncode64@Base 1.4.0
|
||||
httpEncode64_2@Base 1.4.0
|
||||
httpEncryption@Base 1.4.0
|
||||
httpError@Base 1.4.0
|
||||
httpFieldValue@Base 2.0.2
|
||||
httpFlush@Base 1.4.0
|
||||
httpFlushWrite@Base 1.4.0
|
||||
httpFreeCredentials@Base 1.5.0
|
||||
httpGet@Base 1.4.0
|
||||
httpGetActivity@Base 2.0.2
|
||||
httpGetAddress@Base 2.0.2
|
||||
httpGetAuthString@Base 1.4.0
|
||||
httpGetBlocking@Base 1.4.0
|
||||
httpGetContentEncoding@Base 1.7.0
|
||||
httpGetCookie@Base 1.4.0
|
||||
httpGetDateString2@Base 1.4.0
|
||||
httpGetDateString@Base 1.4.0
|
||||
httpGetDateTime@Base 1.4.0
|
||||
httpGetEncryption@Base 2.0.2
|
||||
httpGetExpect@Base 1.7.0
|
||||
httpGetFd@Base 1.4.0
|
||||
httpGetField@Base 1.4.0
|
||||
httpGetHostByName@Base 1.4.0
|
||||
httpGetHostname@Base 1.4.0
|
||||
httpGetKeepAlive@Base 2.0.2
|
||||
httpGetLength2@Base 1.4.0
|
||||
httpGetLength@Base 1.4.0
|
||||
httpGetPending@Base 2.0.2
|
||||
httpGetReady@Base 2.0.2
|
||||
httpGetRemaining@Base 2.0.2
|
||||
httpGetState@Base 1.6.0
|
||||
httpGetStatus@Base 1.4.0
|
||||
httpGetSubField2@Base 1.4.0
|
||||
httpGetSubField@Base 1.4.0
|
||||
httpGetVersion@Base 1.6.0
|
||||
httpGets@Base 1.4.0
|
||||
httpHead@Base 1.4.0
|
||||
httpInitialize@Base 1.4.0
|
||||
httpIsChunked@Base 2.0.2
|
||||
httpIsEncrypted@Base 2.0.2
|
||||
httpLoadCredentials@Base 2.0.2
|
||||
httpMD5@Base 1.4.0
|
||||
httpMD5Final@Base 1.4.0
|
||||
httpMD5String@Base 1.4.0
|
||||
httpOptions@Base 1.4.0
|
||||
httpPeek@Base 1.7.0
|
||||
httpPost@Base 1.4.0
|
||||
httpPrintf@Base 1.4.0
|
||||
httpPut@Base 1.4.0
|
||||
httpRead2@Base 1.4.0
|
||||
httpRead@Base 1.4.0
|
||||
httpReadRequest@Base 1.7.0
|
||||
httpReconnect2@Base 1.6.0
|
||||
httpReconnect@Base 1.4.0
|
||||
httpResolveHostname@Base 2.0.2
|
||||
httpSaveCredentials@Base 2.0.2
|
||||
httpSeparate2@Base 1.4.0
|
||||
httpSeparate@Base 1.4.0
|
||||
httpSeparateURI@Base 1.4.0
|
||||
httpSetAuthString@Base 1.4.0
|
||||
httpSetCookie@Base 1.4.0
|
||||
httpSetCredentials@Base 1.5.0
|
||||
httpSetDefaultField@Base 1.7.0
|
||||
httpSetExpect@Base 1.4.0
|
||||
httpSetField@Base 1.4.0
|
||||
httpSetKeepAlive@Base 2.0.2
|
||||
httpSetLength@Base 1.4.0
|
||||
httpSetTimeout@Base 1.5.0
|
||||
httpShutdown@Base 2.0.2
|
||||
httpStateString@Base 2.0.2
|
||||
httpStatus@Base 1.4.0
|
||||
httpTrace@Base 1.4.0
|
||||
httpURIStatusString@Base 2.0.2
|
||||
httpUpdate@Base 1.4.0
|
||||
httpWait@Base 1.4.0
|
||||
httpWrite2@Base 1.4.0
|
||||
httpWrite@Base 1.4.0
|
||||
httpWriteResponse@Base 1.7.0
|
||||
ippAddBoolean@Base 1.4.0
|
||||
ippAddBooleans@Base 1.4.0
|
||||
ippAddCollection@Base 1.4.0
|
||||
ippAddCollections@Base 1.4.0
|
||||
ippAddDate@Base 1.4.0
|
||||
ippAddInteger@Base 1.4.0
|
||||
ippAddIntegers@Base 1.4.0
|
||||
ippAddOctetString@Base 1.4.0
|
||||
ippAddOutOfBand@Base 1.6.0
|
||||
ippAddRange@Base 1.4.0
|
||||
ippAddRanges@Base 1.4.0
|
||||
ippAddResolution@Base 1.4.0
|
||||
ippAddResolutions@Base 1.4.0
|
||||
ippAddSeparator@Base 1.4.0
|
||||
ippAddString@Base 1.4.0
|
||||
ippAddStringf@Base 1.7.0
|
||||
ippAddStringfv@Base 1.7.0
|
||||
ippAddStrings@Base 1.4.0
|
||||
ippAttributeString@Base 1.6.0
|
||||
ippContainsInteger@Base 1.7.0
|
||||
ippContainsString@Base 1.7.0
|
||||
ippCopyAttribute@Base 1.6.0
|
||||
ippCopyAttributes@Base 1.6.0
|
||||
ippCreateRequestedArray@Base 1.7.0
|
||||
ippDateToTime@Base 1.4.0
|
||||
ippDelete@Base 1.4.0
|
||||
ippDeleteAttribute@Base 1.4.0
|
||||
ippDeleteValues@Base 1.6.0
|
||||
ippEnumString@Base 1.6.0
|
||||
ippEnumValue@Base 1.6.0
|
||||
ippErrorString@Base 1.4.0
|
||||
ippErrorValue@Base 1.4.0
|
||||
ippFindAttribute@Base 1.4.0
|
||||
ippFindNextAttribute@Base 1.4.0
|
||||
ippFirstAttribute@Base 1.6.0
|
||||
ippGetBoolean@Base 1.6.0
|
||||
ippGetCollection@Base 1.6.0
|
||||
ippGetCount@Base 1.6.0
|
||||
ippGetDate@Base 1.6.0
|
||||
ippGetGroupTag@Base 1.6.0
|
||||
ippGetInteger@Base 1.6.0
|
||||
ippGetName@Base 1.6.0
|
||||
ippGetOctetString@Base 1.7.0
|
||||
ippGetOperation@Base 1.6.0
|
||||
ippGetRange@Base 1.6.0
|
||||
ippGetRequestId@Base 1.6.0
|
||||
ippGetResolution@Base 1.6.0
|
||||
ippGetState@Base 1.6.0
|
||||
ippGetStatusCode@Base 1.6.0
|
||||
ippGetString@Base 1.6.0
|
||||
ippGetValueTag@Base 1.6.0
|
||||
ippGetVersion@Base 1.6.0
|
||||
ippLength@Base 1.4.0
|
||||
ippNew@Base 1.4.0
|
||||
ippNewRequest@Base 1.4.0
|
||||
ippNewResponse@Base 1.7.0
|
||||
ippNextAttribute@Base 1.6.0
|
||||
ippOpString@Base 1.4.0
|
||||
ippOpValue@Base 1.4.0
|
||||
ippPort@Base 1.4.0
|
||||
ippRead@Base 1.4.0
|
||||
ippReadFile@Base 1.4.0
|
||||
ippReadIO@Base 1.4.0
|
||||
ippSetBoolean@Base 1.6.0
|
||||
ippSetCollection@Base 1.6.0
|
||||
ippSetDate@Base 1.6.0
|
||||
ippSetGroupTag@Base 1.6.0
|
||||
ippSetInteger@Base 1.6.0
|
||||
ippSetName@Base 1.6.0
|
||||
ippSetOctetString@Base 1.7.0
|
||||
ippSetOperation@Base 1.6.0
|
||||
ippSetPort@Base 1.4.0
|
||||
ippSetRange@Base 1.6.0
|
||||
ippSetRequestId@Base 1.6.0
|
||||
ippSetResolution@Base 1.6.0
|
||||
ippSetState@Base 1.6.0
|
||||
ippSetStatusCode@Base 1.6.0
|
||||
ippSetString@Base 1.6.0
|
||||
ippSetStringf@Base 1.7.0
|
||||
ippSetStringfv@Base 1.7.0
|
||||
ippSetValueTag@Base 1.6.0
|
||||
ippSetVersion@Base 1.6.0
|
||||
ippStateString@Base 2.0.2
|
||||
ippTagString@Base 1.4.0
|
||||
ippTagValue@Base 1.4.0
|
||||
ippTimeToDate@Base 1.4.0
|
||||
ippValidateAttribute@Base 1.7.0
|
||||
ippValidateAttributes@Base 1.7.0
|
||||
ippWrite@Base 1.4.0
|
||||
ippWriteFile@Base 1.4.0
|
||||
ippWriteIO@Base 1.4.0
|
||||
ppdClose@Base 1.4.0
|
||||
ppdCollect2@Base 1.4.0
|
||||
ppdCollect@Base 1.4.0
|
||||
ppdConflicts@Base 1.4.0
|
||||
ppdEmit@Base 1.4.0
|
||||
ppdEmitAfterOrder@Base 1.4.0
|
||||
ppdEmitFd@Base 1.4.0
|
||||
ppdEmitJCL@Base 1.4.0
|
||||
ppdEmitJCLEnd@Base 1.4.0
|
||||
ppdEmitString@Base 1.4.0
|
||||
ppdErrorString@Base 1.4.0
|
||||
ppdFindAttr@Base 1.4.0
|
||||
ppdFindChoice@Base 1.4.0
|
||||
ppdFindCustomOption@Base 1.4.0
|
||||
ppdFindCustomParam@Base 1.4.0
|
||||
ppdFindMarkedChoice@Base 1.4.0
|
||||
ppdFindNextAttr@Base 1.4.0
|
||||
ppdFindOption@Base 1.4.0
|
||||
ppdFirstCustomParam@Base 1.4.0
|
||||
ppdFirstOption@Base 1.4.0
|
||||
ppdInstallableConflict@Base 1.4.0
|
||||
ppdIsMarked@Base 1.4.0
|
||||
ppdLastError@Base 1.4.0
|
||||
ppdLocalize@Base 1.4.0
|
||||
ppdLocalizeAttr@Base 1.4.0
|
||||
ppdLocalizeIPPReason@Base 1.4.0
|
||||
ppdLocalizeMarkerName@Base 1.4.0
|
||||
ppdMarkDefaults@Base 1.4.0
|
||||
ppdMarkOption@Base 1.4.0
|
||||
ppdNextCustomParam@Base 1.4.0
|
||||
ppdNextOption@Base 1.4.0
|
||||
ppdOpen2@Base 1.4.0
|
||||
ppdOpen@Base 1.4.0
|
||||
ppdOpenFd@Base 1.4.0
|
||||
ppdOpenFile@Base 1.4.0
|
||||
ppdPageLength@Base 1.4.0
|
||||
ppdPageSize@Base 1.4.0
|
||||
ppdPageSizeLimits@Base 1.4.0
|
||||
ppdPageWidth@Base 1.4.0
|
||||
ppdSetConformance@Base 1.4.0
|
||||
pwgFormatSizeName@Base 1.7.0
|
||||
pwgInitSize@Base 1.7.0
|
||||
pwgMediaForLegacy@Base 1.7.0
|
||||
pwgMediaForPPD@Base 1.7.0
|
||||
pwgMediaForPWG@Base 1.7.0
|
||||
pwgMediaForSize@Base 1.7.0
|
|
@ -0,0 +1,3 @@
|
|||
usr/lib/*/libcupsimage.so
|
||||
usr/lib/*/libcupsimage.a
|
||||
usr/include/cups/raster.h
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
install)
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
if [ ! -L /usr/share/doc/libcupsimage2-dev ]; then
|
||||
rm -rf /usr/share/doc/libcupsimage2-dev
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1 @@
|
|||
usr/lib/*/libcupsimage.so.*
|
|
@ -0,0 +1,26 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
case "$1" in
|
||||
install)
|
||||
;;
|
||||
|
||||
upgrade)
|
||||
if [ ! -L /usr/share/doc/libcupsimage2 ]; then
|
||||
rm -rf /usr/share/doc/libcupsimage2
|
||||
fi
|
||||
;;
|
||||
|
||||
abort-upgrade)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "preinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
|
@ -0,0 +1,13 @@
|
|||
libcupsimage.so.2 libcupsimage2 #MINVER#
|
||||
# Keep this one at the latest upstream release
|
||||
(optional|regex)|^_cups.*@Base$" 1.6.2
|
||||
cupsRasterClose@Base 1.4.0
|
||||
cupsRasterErrorString@Base 1.4.0
|
||||
cupsRasterInterpretPPD@Base 1.4.0
|
||||
cupsRasterOpen@Base 1.4.0
|
||||
cupsRasterReadHeader2@Base 1.4.0
|
||||
cupsRasterReadHeader@Base 1.4.0
|
||||
cupsRasterReadPixels@Base 1.4.0
|
||||
cupsRasterWriteHeader2@Base 1.4.0
|
||||
cupsRasterWriteHeader@Base 1.4.0
|
||||
cupsRasterWritePixels@Base 1.4.0
|
|
@ -0,0 +1,217 @@
|
|||
# vim:syntax=apparmor
|
||||
# Last Modified: Thu Aug 2 12:54:46 2007
|
||||
# Author: Martin Pitt <martin.pitt@ubuntu.com>
|
||||
|
||||
#include <tunables/global>
|
||||
|
||||
/usr/sbin/cupsd flags=(attach_disconnected) {
|
||||
#include <abstractions/base>
|
||||
#include <abstractions/bash>
|
||||
#include <abstractions/authentication>
|
||||
#include <abstractions/dbus>
|
||||
#include <abstractions/fonts>
|
||||
#include <abstractions/nameservice>
|
||||
#include <abstractions/perl>
|
||||
#include <abstractions/user-tmp>
|
||||
|
||||
capability chown,
|
||||
capability fowner,
|
||||
capability fsetid,
|
||||
capability kill,
|
||||
capability net_bind_service,
|
||||
capability setgid,
|
||||
capability setuid,
|
||||
capability audit_write,
|
||||
capability wake_alarm,
|
||||
deny capability block_suspend,
|
||||
|
||||
# noisy
|
||||
deny signal (send) set=("term") peer=unconfined,
|
||||
|
||||
# nasty, but we limit file access pretty tightly, and cups chowns a
|
||||
# lot of files to 'lp' which it cannot read/write afterwards any
|
||||
# more
|
||||
capability dac_override,
|
||||
capability dac_read_search,
|
||||
|
||||
# the bluetooth backend needs this
|
||||
network bluetooth,
|
||||
|
||||
# the dnssd backend uses those
|
||||
network x25 seqpacket,
|
||||
network ax25 dgram,
|
||||
network netrom seqpacket,
|
||||
network rose dgram,
|
||||
network ipx dgram,
|
||||
network appletalk dgram,
|
||||
network econet dgram,
|
||||
network ash dgram,
|
||||
|
||||
/{usr/,}bin/bash ixr,
|
||||
/{usr/,}bin/dash ixr,
|
||||
/{usr/,}bin/hostname ixr,
|
||||
/dev/lp* rw,
|
||||
deny /dev/tty rw, # silence noise
|
||||
/dev/ttyS* rw,
|
||||
/dev/ttyUSB* rw,
|
||||
/dev/usb/lp* rw,
|
||||
/dev/bus/usb/ r,
|
||||
/dev/bus/usb/** rw,
|
||||
/dev/parport* rw,
|
||||
/etc/cups/ rw,
|
||||
/etc/cups/** rw,
|
||||
/etc/cups/interfaces/* ixrw,
|
||||
/etc/foomatic/* r,
|
||||
/etc/gai.conf r,
|
||||
/etc/papersize r,
|
||||
/etc/pnm2ppa.conf r,
|
||||
/etc/printcap rwl,
|
||||
/etc/ssl/** r,
|
||||
@{PROC}/net/ r,
|
||||
@{PROC}/net/* r,
|
||||
@{PROC}/sys/dev/parport/** r,
|
||||
@{PROC}/*/net/ r,
|
||||
@{PROC}/*/net/** r,
|
||||
@{PROC}/*/auxv r,
|
||||
@{PROC}/sys/crypto/** r,
|
||||
/sys/** r,
|
||||
/usr/bin/* ixr,
|
||||
/usr/sbin/* ixr,
|
||||
/{usr/,}bin/* ixr,
|
||||
/{usr/,}sbin/* ixr,
|
||||
/usr/lib/** rm,
|
||||
|
||||
# backends which come with CUPS can be confined
|
||||
/usr/lib/cups/backend/bluetooth ixr,
|
||||
/usr/lib/cups/backend/dnssd ixr,
|
||||
/usr/lib/cups/backend/http ixr,
|
||||
/usr/lib/cups/backend/ipp ixr,
|
||||
/usr/lib/cups/backend/lpd ixr,
|
||||
/usr/lib/cups/backend/mdns ixr,
|
||||
/usr/lib/cups/backend/parallel ixr,
|
||||
/usr/lib/cups/backend/serial ixr,
|
||||
/usr/lib/cups/backend/snmp ixr,
|
||||
/usr/lib/cups/backend/socket ixr,
|
||||
/usr/lib/cups/backend/usb ixr,
|
||||
|
||||
# we treat cups-pdf specially, since it needs to write into /home
|
||||
# and thus needs extra paranoia
|
||||
/usr/lib/cups/backend/cups-pdf Px,
|
||||
|
||||
# allow communicating with cups-pdf via Unix sockets
|
||||
unix peer=(label=/usr/lib/cups/backend/cups-pdf),
|
||||
|
||||
# third party backends get no restrictions as they often need high
|
||||
# privileges and this is beyond our control
|
||||
/usr/lib/cups/backend/* Cx -> third_party,
|
||||
|
||||
/usr/lib/cups/cgi-bin/* ixr,
|
||||
/usr/lib/cups/daemon/* ixr,
|
||||
/usr/lib/cups/monitor/* ixr,
|
||||
/usr/lib/cups/notifier/* ixr,
|
||||
# filters and drivers (PPD generators) are always run as non-root,
|
||||
# and there are a lot of third-party drivers which we cannot predict
|
||||
/usr/lib/cups/filter/** Cxr -> third_party,
|
||||
/usr/lib/cups/driver/* Cxr -> third_party,
|
||||
/usr/local/** rm,
|
||||
/usr/local/lib/cups/** rix,
|
||||
/usr/share/** r,
|
||||
/{,var/}run/** rm,
|
||||
/{,var/}run/avahi-daemon/socket rw,
|
||||
deny /{,var/}run/samba/ rw,
|
||||
/{,var/}run/samba/** rw,
|
||||
/var/cache/samba/*.tdb r,
|
||||
/var/{cache,lib}/samba/printing/printers.tdb r,
|
||||
/{,var/}run/cups/ rw,
|
||||
/{,var/}run/cups/** rw,
|
||||
/var/cache/cups/ rw,
|
||||
/var/cache/cups/** rwk,
|
||||
/var/log/cups/ rw,
|
||||
/var/log/cups/* rw,
|
||||
/var/spool/cups/ rw,
|
||||
/var/spool/cups/** rw,
|
||||
|
||||
# third-party printer drivers; no known structure here
|
||||
/opt/** rix,
|
||||
|
||||
# FIXME: no policy ATM for hplip and Brother drivers
|
||||
/usr/bin/hpijs Cx -> third_party,
|
||||
/usr/Brother/** Cx -> third_party,
|
||||
|
||||
# Kerberos authentication
|
||||
/etc/krb5.conf r,
|
||||
deny /etc/krb5.conf w,
|
||||
/etc/krb5.keytab rk,
|
||||
/etc/cups/krb5.keytab rwk,
|
||||
/tmp/krb5cc* k,
|
||||
|
||||
# likewise authentication
|
||||
/etc/likewise r,
|
||||
/etc/likewise/* r,
|
||||
|
||||
# silence noise
|
||||
deny /etc/udev/udev.conf r,
|
||||
|
||||
signal peer=/usr/sbin/cupsd//third_party,
|
||||
unix peer=(label=/usr/sbin/cupsd//third_party),
|
||||
profile third_party flags=(attach_disconnected) {
|
||||
# third party backends, filters, and drivers get relatively no restrictions
|
||||
# as they often need high privileges, are unpredictable or otherwise beyond
|
||||
# our control
|
||||
file,
|
||||
capability,
|
||||
audit deny capability mac_admin,
|
||||
network,
|
||||
dbus,
|
||||
signal,
|
||||
ptrace,
|
||||
unix,
|
||||
}
|
||||
|
||||
# Site-specific additions and overrides. See local/README for details.
|
||||
#include <local/usr.sbin.cupsd>
|
||||
}
|
||||
|
||||
# separate profile since this needs to write into /home
|
||||
/usr/lib/cups/backend/cups-pdf {
|
||||
#include <abstractions/base>
|
||||
#include <abstractions/fonts>
|
||||
#include <abstractions/nameservice>
|
||||
#include <abstractions/user-tmp>
|
||||
|
||||
capability chown,
|
||||
capability fowner,
|
||||
capability fsetid,
|
||||
capability setgid,
|
||||
capability setuid,
|
||||
|
||||
# unfortunate, but required for when $HOME is 700
|
||||
capability dac_override,
|
||||
capability dac_read_search,
|
||||
|
||||
# allow communicating with cupsd via Unix sockets
|
||||
unix peer=(label=/usr/sbin/cupsd),
|
||||
|
||||
@{PROC}/*/auxv r,
|
||||
|
||||
/{usr/,}bin/dash ixr,
|
||||
/{usr/,}bin/bash ixr,
|
||||
/{usr/,}bin/cp ixr,
|
||||
/etc/papersize r,
|
||||
/etc/cups/cups-pdf.conf r,
|
||||
/etc/cups/ppd/*.ppd r,
|
||||
/usr/bin/gs ixr,
|
||||
/usr/lib/cups/backend/cups-pdf mr,
|
||||
/usr/lib/ghostscript/** mr,
|
||||
/usr/share/** r,
|
||||
/var/log/cups/cups-pdf*_log w,
|
||||
/var/spool/cups/** r,
|
||||
/var/spool/cups-pdf/** rw,
|
||||
|
||||
# allow read and write on almost anything in @{HOME} (lenient, but
|
||||
# private-files-strict is in effect), to support customized "Out"
|
||||
# setting in cups-pdf.conf (Debian#940578)
|
||||
#include <abstractions/private-files-strict>
|
||||
@{HOME}/[^.]*/{,**/} rw,
|
||||
@{HOME}/[^.]*/** rw,
|
||||
}
|
|
@ -0,0 +1,13 @@
|
|||
'''apport package hook for cups
|
||||
|
||||
(c) 2009 Canonical Ltd.
|
||||
Author: Brian Murray <brian@ubuntu.com>
|
||||
'''
|
||||
|
||||
from apport.hookutils import *
|
||||
|
||||
def add_info(report):
|
||||
attach_hardware(report)
|
||||
attach_printing(report)
|
||||
attach_mac_events(report, ['/usr/sbin/cupsd',
|
||||
'/usr/lib/cups/backend/cups-pdf'])
|
|
@ -0,0 +1,5 @@
|
|||
[CUPS]
|
||||
title=Common UNIX Printing System server
|
||||
description=CUPS is a printing system with support for IPP, samba, lpd, and other protocols.
|
||||
ports=631
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# README for CUPS manpages translation
|
||||
|
||||
As the manpage translations patch using po4a has not been accepted by
|
||||
upstream, they have been moved out of the patch to the
|
||||
debian/manpage-po4a/ directory. This should ease shared maintenance and
|
||||
enhance the visibility of these translations.
|
||||
|
||||
## How to update .pot and .po files
|
||||
|
||||
1. Checkout the branch you want to work on (usually 'debian/master').
|
||||
It has the patches already applied.
|
||||
|
||||
2. Launch po4a from the correct directory:
|
||||
|
||||
$ cd man; po4a ../debian/manpage-po4a/cups.cfg
|
|
@ -0,0 +1,49 @@
|
|||
[po_directory] ../debian/manpage-po4a/po/
|
||||
|
||||
[type: man] backend.7 $lang:$lang/backend.7
|
||||
[type: man] cancel.1 $lang:$lang/cancel.1
|
||||
[type: man] classes.conf.5 $lang:$lang/classes.conf.5
|
||||
[type: man] client.conf.5 $lang:$lang/client.conf.5
|
||||
[type: man] cups.1 $lang:$lang/cups.1
|
||||
[type: man] cupsaccept.8 $lang:$lang/cupsaccept.8
|
||||
[type: man] cups-config.1 $lang:$lang/cups-config.1
|
||||
[type: man] cupsctl.8 $lang:$lang/cupsctl.8
|
||||
[type: man] cupsd.8 $lang:$lang/cupsd.8
|
||||
[type: man] cupsd.conf.5 $lang:$lang/cupsd.conf.5
|
||||
[type: man] cupsd-helper.8 $lang:$lang/cupsd-helper.8
|
||||
[type: man] cupsd-logs.5 $lang:$lang/cupsd-logs.5
|
||||
[type: man] cupsenable.8 $lang:$lang/cupsenable.8
|
||||
[type: man] cups-files.conf.5 $lang:$lang/cups-files.conf.5
|
||||
[type: man] cupsfilter.8 $lang:$lang/cupsfilter.8
|
||||
[type: man] cups-lpd.8 $lang:$lang/cups-lpd.8
|
||||
[type: man] cups-snmp.8 $lang:$lang/cups-snmp.8
|
||||
[type: man] cups-snmp.conf.5 $lang:$lang/cups-snmp.conf.5
|
||||
[type: man] cupstestppd.1 $lang:$lang/cupstestppd.1
|
||||
[type: man] filter.7 $lang:$lang/filter.7
|
||||
[type: man] ippevepcl.7 $lang:$lang/ippevepcl.7
|
||||
[type: man] ippeveprinter.1 $lang:$lang/ippeveprinter.1
|
||||
[type: man] ippfind.1 $lang:$lang/ippfind.1
|
||||
[type: man] ipptool.1 $lang:$lang/ipptool.1
|
||||
[type: man] ipptoolfile.5 $lang:$lang/ipptoolfile.5
|
||||
[type: man] lp.1 $lang:$lang/lp.1
|
||||
[type: man] lpadmin.8 $lang:$lang/lpadmin.8
|
||||
[type: man] lpc.8 $lang:$lang/lpc.8
|
||||
[type: man] lpinfo.8 $lang:$lang/lpinfo.8
|
||||
[type: man] lpmove.8 $lang:$lang/lpmove.8
|
||||
[type: man] lpoptions.1 $lang:$lang/lpoptions.1
|
||||
[type: man] lpq.1 $lang:$lang/lpq.1
|
||||
[type: man] lpr.1 $lang:$lang/lpr.1
|
||||
[type: man] lprm.1 $lang:$lang/lprm.1
|
||||
[type: man] lpstat.1 $lang:$lang/lpstat.1
|
||||
[type: man] mailto.conf.5 $lang:$lang/mailto.conf.5
|
||||
[type: man] mime.convs.5 $lang:$lang/mime.convs.5
|
||||
[type: man] mime.types.5 $lang:$lang/mime.types.5
|
||||
[type: man] notifier.7 $lang:$lang/notifier.7
|
||||
[type: man] ppdc.1 $lang:$lang/ppdc.1
|
||||
[type: man] ppdcfile.5 $lang:$lang/ppdcfile.5
|
||||
[type: man] ppdhtml.1 $lang:$lang/ppdhtml.1
|
||||
[type: man] ppdi.1 $lang:$lang/ppdi.1
|
||||
[type: man] ppdmerge.1 $lang:$lang/ppdmerge.1
|
||||
[type: man] ppdpo.1 $lang:$lang/ppdpo.1
|
||||
[type: man] printers.conf.5 $lang:$lang/printers.conf.5
|
||||
[type: man] subscriptions.conf.5 $lang:$lang/subscriptions.conf.5
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,16 @@
|
|||
Description: Disable Browsing by default on Ubuntu (not sanctioned yet by https://wiki.ubuntu.com/DefaultNetworkServices). This is only applied when building on Ubuntu.
|
||||
Author: Martin Pitt <martin.pitt@ubuntu.com>
|
||||
|
||||
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
|
||||
index 42e24a2..4282368 100644
|
||||
--- a/conf/cupsd.conf.in
|
||||
+++ b/conf/cupsd.conf.in
|
||||
@@ -17,7 +17,7 @@ Listen localhost:@DEFAULT_IPP_PORT@
|
||||
@CUPS_LISTEN_DOMAINSOCKET@
|
||||
|
||||
# Show shared printers on the local network.
|
||||
-Browsing On
|
||||
+Browsing Off
|
||||
BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
|
||||
|
||||
# Default authentication type, when authentication is required...
|
|
@ -0,0 +1,571 @@
|
|||
From: Didier Raboud <odyx@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:11:05 +0200
|
||||
Subject: Fix hyphen-used-as-minus-sign manpage errors
|
||||
|
||||
Automatically generated using sed -i -s 's/^-/\\-/g;s/ -/ \\-/g;s/"-/"\\-/g' man/*.man*
|
||||
Also fix a missing backslash escape
|
||||
|
||||
Origin: vendor
|
||||
Bug-Upstream: https://github.com/apple/cups/issues/4299
|
||||
Patch-Name: manpage-hyphen-minus.patch
|
||||
---
|
||||
man/backend.7 | 4 ++--
|
||||
man/client.conf.5 | 4 ++--
|
||||
man/cups-files.conf.5 | 2 +-
|
||||
man/cups-lpd.8 | 6 +++---
|
||||
man/cups-snmp.conf.5 | 2 +-
|
||||
man/cups.1 | 2 +-
|
||||
man/cupsctl.8 | 6 +++---
|
||||
man/cupsd-logs.5 | 36 ++++++++++++++++++------------------
|
||||
man/cupsd.conf.5 | 2 +-
|
||||
man/cupsfilter.8 | 2 +-
|
||||
man/filter.7 | 2 +-
|
||||
man/ippeveprinter.1 | 6 +++---
|
||||
man/ippfind.1 | 6 +++---
|
||||
man/ipptoolfile.5 | 8 ++++----
|
||||
man/lp.1 | 12 ++++++------
|
||||
man/lpadmin.8 | 6 +++---
|
||||
man/lpoptions.1 | 4 ++--
|
||||
man/lpr.1 | 8 ++++----
|
||||
man/mime.convs.5 | 6 +++---
|
||||
man/mime.types.5 | 4 ++--
|
||||
man/ppdc.1 | 2 +-
|
||||
21 files changed, 65 insertions(+), 65 deletions(-)
|
||||
|
||||
diff --git a/man/backend.7 b/man/backend.7
|
||||
index 5a70326..3c42631 100644
|
||||
--- a/man/backend.7
|
||||
+++ b/man/backend.7
|
||||
@@ -163,7 +163,7 @@ The scheduler will respond to this by canceling the job.
|
||||
.TP 5
|
||||
.B CUPS_BACKEND_RETRY
|
||||
The print file was not successfully transmitted because of a temporary issue.
|
||||
-The scheduler will retry the job at a future time - other jobs may print before this one.
|
||||
+The scheduler will retry the job at a future time \- other jobs may print before this one.
|
||||
.TP 5
|
||||
.B CUPS_BACKEND_RETRY_CURRENT
|
||||
The print file was not successfully transmitted because of a temporary issue.
|
||||
@@ -198,7 +198,7 @@ or
|
||||
programs to send print jobs or
|
||||
.BR lpinfo (8)
|
||||
to query for available printers using the backend.
|
||||
-The one exception is the SNMP backend - see
|
||||
+The one exception is the SNMP backend \- see
|
||||
.BR cups-snmp (8)
|
||||
for more information.
|
||||
.SH NOTES
|
||||
diff --git a/man/client.conf.5 b/man/client.conf.5
|
||||
index 4dbf0c4..f0adb9f 100644
|
||||
--- a/man/client.conf.5
|
||||
+++ b/man/client.conf.5
|
||||
@@ -77,7 +77,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
|
||||
The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
|
||||
The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
|
||||
The \fIDenyCBC\fR option disables all CBC cipher suites.
|
||||
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
|
||||
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
|
||||
The \fIMinTLS\fR options set the minimum TLS version to support.
|
||||
The \fIMaxTLS\fR options set the maximum TLS version to support.
|
||||
Not all operating systems support TLS 1.3 at this time.
|
||||
@@ -130,7 +130,7 @@ Configuration settings can instead be viewed or changed using the
|
||||
command:
|
||||
.nf
|
||||
defaults write /Library/Preferences/org.cups.PrintingPrefs.plist Encryption Required
|
||||
-defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse -bool NO
|
||||
+defaults write /Library/Preferences/org.cups.PrintingPrefs.plist TrustOnFirstUse \-bool NO
|
||||
|
||||
defaults read /Library/Preferences/org.cups.PrintingPrefs.plist Encryption
|
||||
.fi
|
||||
diff --git a/man/cups-files.conf.5 b/man/cups-files.conf.5
|
||||
index b451e2f..7249406 100644
|
||||
--- a/man/cups-files.conf.5
|
||||
+++ b/man/cups-files.conf.5
|
||||
@@ -236,7 +236,7 @@ The following directives are deprecated and will be removed from a future versio
|
||||
\fBFileDevice No\fR
|
||||
Specifies whether the file pseudo-device can be used for new printer queues.
|
||||
The URI "file:///dev/null" is always allowed.
|
||||
-File devices cannot be used with "raw" print queues - a PPD file is required.
|
||||
+File devices cannot be used with "raw" print queues \- a PPD file is required.
|
||||
The specified file is overwritten for every print job.
|
||||
Writing to directories is not supported.
|
||||
.\"#FontPath
|
||||
diff --git a/man/cups-lpd.8 b/man/cups-lpd.8
|
||||
index e8ce325..344d2af 100644
|
||||
--- a/man/cups-lpd.8
|
||||
+++ b/man/cups-lpd.8
|
||||
@@ -15,9 +15,9 @@ cups-lpd \- receive print jobs and report printer status to lpd clients (depreca
|
||||
[
|
||||
\fB\-h \fIhostname\fR[\fB:\fIport\fR]
|
||||
] [
|
||||
-.B -n
|
||||
+.B \-n
|
||||
] [
|
||||
-.B -o
|
||||
+.B \-o
|
||||
.I option=value
|
||||
]
|
||||
.SH DESCRIPTION
|
||||
@@ -34,7 +34,7 @@ and
|
||||
\fB-h \fIhostname\fR[\fB:\fIport\fR]
|
||||
Sets the CUPS server (and port) to use.
|
||||
.TP 5
|
||||
-.B -n
|
||||
+.B \-n
|
||||
Disables reverse address lookups; normally
|
||||
.B cups-lpd
|
||||
will try to discover the hostname of the client via a reverse DNS lookup.
|
||||
diff --git a/man/cups-snmp.conf.5 b/man/cups-snmp.conf.5
|
||||
index 4ca20f2..bb77c73 100644
|
||||
--- a/man/cups-snmp.conf.5
|
||||
+++ b/man/cups-snmp.conf.5
|
||||
@@ -16,7 +16,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 \fI/etc/cups\fR directory.
|
||||
Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
|
||||
.LP
|
||||
-The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend -
|
||||
+The Community and DebugLevel directives are used by all backends. The remainder apply only to the SNMP backend \-
|
||||
.BR cups-snmp (8).
|
||||
.SH DIRECTIVES
|
||||
The following directives are understood by the CUPS network backends:
|
||||
diff --git a/man/cups.1 b/man/cups.1
|
||||
index 706620d..b0c51a7 100644
|
||||
--- a/man/cups.1
|
||||
+++ b/man/cups.1
|
||||
@@ -38,7 +38,7 @@ The easiest way to start is by using the web interface to configure your printer
|
||||
.LP
|
||||
When you are asked for a username and password, enter your login username and password or the "root" username and password.
|
||||
.LP
|
||||
-After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration - click/press on the Query Printer for Default Options button to update the options automatically.
|
||||
+After the printer is added you will be asked to set the default printer options (paper size, output mode, etc.) for the printer. Make any changes as needed and then click/press on the Set Default Options button to save them. Some printers also support auto-configuration \- click/press on the Query Printer for Default Options button to update the options automatically.
|
||||
.LP
|
||||
Once you have added the printer, you can print to it from any application. You can also choose Print Test Page from the maintenance menu to print a simple test page and verify that everything is working properly.
|
||||
.LP
|
||||
diff --git a/man/cupsctl.8 b/man/cupsctl.8
|
||||
index 791954c..c88eb22 100644
|
||||
--- a/man/cupsctl.8
|
||||
+++ b/man/cupsctl.8
|
||||
@@ -73,19 +73,19 @@ Display the current settings:
|
||||
Enable debug logging:
|
||||
.nf
|
||||
|
||||
- cupsctl --debug-logging
|
||||
+ cupsctl \--debug-logging
|
||||
|
||||
.fi
|
||||
Get the current debug logging state:
|
||||
.nf
|
||||
|
||||
- cupsctl | grep '^_debug_logging' | awk -F= '{print $2}'
|
||||
+ cupsctl | grep '^_debug_logging' | awk \-F= '{print $2}'
|
||||
|
||||
.fi
|
||||
Disable printer sharing:
|
||||
.nf
|
||||
|
||||
- cupsctl --no-share-printers
|
||||
+ cupsctl \--no-share-printers
|
||||
.fi
|
||||
.SH KNOWN ISSUES
|
||||
You cannot set the Listen or Port directives using \fBcupsctl\fR.
|
||||
diff --git a/man/cupsd-logs.5 b/man/cupsd-logs.5
|
||||
index 2070be9..a912c46 100644
|
||||
--- a/man/cupsd-logs.5
|
||||
+++ b/man/cupsd-logs.5
|
||||
@@ -30,25 +30,25 @@ Each line is in an extended version of the so-called "Common Log Format" used by
|
||||
For example:
|
||||
.nf
|
||||
|
||||
- 10.0.1.2 - - [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
|
||||
+ 10.0.1.2 \- \- [01/Dec/2005:21:50:28 +0000] "POST / HTTP/1.1" 200 317
|
||||
CUPS-Get-Printers successful-ok-ignored-or-substituted-attributes
|
||||
- localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
|
||||
- 200 0 - -
|
||||
- localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
|
||||
+ localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
|
||||
+ 200 0 \- \-
|
||||
+ localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
|
||||
200 157 CUPS-Get-Printers
|
||||
successful-ok-ignored-or-substituted-attributes
|
||||
- localhost - - [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
|
||||
- 200 1411 CUPS-Get-Devices -
|
||||
- localhost - - [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
|
||||
- 200 6667 - -
|
||||
+ localhost \- \- [01/Dec/2005:21:50:32 +0000] "POST / HTTP/1.1"
|
||||
+ 200 1411 CUPS-Get-Devices \-
|
||||
+ localhost \- \- [01/Dec/2005:21:50:32 +0000] "GET /admin HTTP/1.1"
|
||||
+ 200 6667 \- \-
|
||||
|
||||
.fi
|
||||
The \fIhost\fR field will normally only be an IP address unless you have enabled the HostNameLookups directive in the \fIcupsd.conf\fR file or if the IP address corresponds to your local machine.
|
||||
.LP
|
||||
-The \fIgroup\fR field always contains "-".
|
||||
+The \fIgroup\fR field always contains "\-".
|
||||
.LP
|
||||
The \fIuser\fR field is the authenticated username of the requesting user.
|
||||
-If no username and password is supplied for the request then this field contains "-".
|
||||
+If no username and password is supplied for the request then this field contains "\-".
|
||||
.LP
|
||||
The \fIdate-time\fR field is the date and time of the request in local time and is in the format "[DD/MON/YYYY:HH:MM:SS +ZZZZ]".
|
||||
.LP
|
||||
@@ -98,7 +98,7 @@ Request too large; typically this means that a client tried to print a file larg
|
||||
Upgrading to TLS-encrypted connection.
|
||||
.TP 5
|
||||
500
|
||||
-Server error; typically this happens when the server is unable to open/create a file - consult the error_log file for details.
|
||||
+Server error; typically this happens when the server is unable to open/create a file \- consult the error_log file for details.
|
||||
.TP 5
|
||||
501
|
||||
The client requested encryption but encryption support is not enabled/compiled in.
|
||||
@@ -110,11 +110,11 @@ HTTP version number not supported; typically this means that you have a maliciou
|
||||
The \fIbytes\fR field contains the number of bytes in the request.
|
||||
For POST requests the bytes field contains the number of bytes of non-IPP data that is received from the client.
|
||||
.LP
|
||||
-The \fIipp-operation\fR field contains either "-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
|
||||
+The \fIipp-operation\fR field contains either "\-" for non-IPP requests or the IPP operation name for POST requests containing an IPP request.
|
||||
.LP
|
||||
-The \fIipp-status\fR field contains either "-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
|
||||
+The \fIipp-status\fR field contains either "\-" for non-IPP requests or the IPP status code name for POST requests containing an IPP response.
|
||||
.SS ERROR LOG FILE FORMAT
|
||||
-The \fIerror_log\fR file lists messages from the scheduler - errors, warnings, etc. The LogLevel directive in the
|
||||
+The \fIerror_log\fR file lists messages from the scheduler \- errors, warnings, etc. The LogLevel directive in the
|
||||
.BR cupsd.conf (5)
|
||||
file controls which messages are logged:
|
||||
.nf
|
||||
@@ -204,15 +204,15 @@ The format of this field is identical to the data-time field in the \fIaccess_lo
|
||||
.LP
|
||||
The \fInum-sheets\fR field provides the total number of pages (sheets) that have been printed on for the job.
|
||||
.LP
|
||||
-The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "-" if neither was provided.
|
||||
+The \fIjob-billing\fR field contains a copy of the job-billing or job-account-id attributes provided with the IPP Create-Job or Print-Job requests or "\-" if neither was provided.
|
||||
.LP
|
||||
The \fIjob-originating-host-name\fR field contains the hostname or IP address of the client that printed the job.
|
||||
.LP
|
||||
-The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
|
||||
+The \fIjob-name\fR field contains a copy of the job-name attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
|
||||
.LP
|
||||
-The \fImedia\fR 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 \fImedia\fR 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.
|
||||
.LP
|
||||
-The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "-" if none was provided.
|
||||
+The \fIsides\fR field contains a copy of the sides attribute provided with the IPP Create-Job or Print-Job requests or "\-" if none was provided.
|
||||
.SH SEE ALSO
|
||||
.BR cupsd (8),
|
||||
.BR cupsd.conf (5),
|
||||
diff --git a/man/cupsd.conf.5 b/man/cupsd.conf.5
|
||||
index 00b1a22..49fdb06 100644
|
||||
--- a/man/cupsd.conf.5
|
||||
+++ b/man/cupsd.conf.5
|
||||
@@ -446,7 +446,7 @@ The \fIAllowDH\fR option enables cipher suites using plain Diffie-Hellman key ne
|
||||
The \fIAllowRC4\fR option enables the 128-bit RC4 cipher suites, which are required for some older clients.
|
||||
The \fIAllowSSL3\fR option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.
|
||||
The \fIDenyCBC\fR option disables all CBC cipher suites.
|
||||
-The \fIDenyTLS1.0\fR option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1.
|
||||
+The \fIDenyTLS1.0\fR option disables TLS v1.0 support \- this sets the minimum protocol version to TLS v1.1.
|
||||
The \fIMinTLS\fR options set the minimum TLS version to support.
|
||||
The \fIMaxTLS\fR options set the maximum TLS version to support.
|
||||
Not all operating systems support TLS 1.3 at this time.
|
||||
diff --git a/man/cupsfilter.8 b/man/cupsfilter.8
|
||||
index c655c21..fe4c5a2 100644
|
||||
--- a/man/cupsfilter.8
|
||||
+++ b/man/cupsfilter.8
|
||||
@@ -126,7 +126,7 @@ command use the current user and security session. This may result in different
|
||||
The following command will generate a PDF preview of job 42 for a printer named "myprinter" and save it to a file named "preview.pdf":
|
||||
.nf
|
||||
|
||||
- cupsfilter -m application/pdf -d myprinter -j 42 >preview.pdf
|
||||
+ cupsfilter \-m application/pdf \-d myprinter \-j 42 >preview.pdf
|
||||
.fi
|
||||
.SH SEE ALSO
|
||||
.BR cups (1),
|
||||
diff --git a/man/filter.7 b/man/filter.7
|
||||
index dbc3150..8cb79bb 100644
|
||||
--- a/man/filter.7
|
||||
+++ b/man/filter.7
|
||||
@@ -136,7 +136,7 @@ Sets the named keywords in the printer's PPD file. This is typically used to upd
|
||||
.TP 5
|
||||
\fBSTATE: +\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
|
||||
.TP 5
|
||||
-\fBSTATE: -\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
|
||||
+\fBSTATE: \-\fI printer-state-reason \fR[ \fI... printer-state-reason\fR ]
|
||||
Sets, adds, or removes "printer-state-reason" keywords for the current queue. Typically this is used to indicate media, ink, and toner conditions on a printer.
|
||||
.TP 5
|
||||
\fBWARNING:\fI message\fR
|
||||
diff --git a/man/ippeveprinter.1 b/man/ippeveprinter.1
|
||||
index fa32efb..8ab2654 100644
|
||||
--- a/man/ippeveprinter.1
|
||||
+++ b/man/ippeveprinter.1
|
||||
@@ -143,8 +143,8 @@ If "command" is not an absolute path ("/path/to/command"),
|
||||
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").
|
||||
-In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory - see the
|
||||
+command can be used to discover the correct binary directory ("cups-config \--serverbin").
|
||||
+In addition, the CUPS_SERVERBIN environment variable can be used to override the default location of this directory \- see the
|
||||
.BR cups (1)
|
||||
man page for more details.
|
||||
.TP 5
|
||||
@@ -244,7 +244,7 @@ Logs an informational/progress message if \-v has been specified and copies the
|
||||
\fBSTATE: \fIkeyword[,keyword,...]\fR
|
||||
Sets the printer's "printer-state-reasons" attribute to the listed keywords.
|
||||
.TP 5
|
||||
-\fBSTATE: -\fIkeyword[,keyword,...]\fR
|
||||
+\fBSTATE: \-\fIkeyword[,keyword,...]\fR
|
||||
Removes the listed keywords from the printer's "printer-state-reasons" attribute.
|
||||
.TP 5
|
||||
\fBSTATE: +\fIkeyword[,keyword,...]\fR
|
||||
diff --git a/man/ippfind.1 b/man/ippfind.1
|
||||
index 32f2e6f..d77ef75 100644
|
||||
--- a/man/ippfind.1
|
||||
+++ b/man/ippfind.1
|
||||
@@ -75,7 +75,7 @@ True is the hostname matches the given regular expression.
|
||||
.B \-l
|
||||
.TP 5
|
||||
.B \-\-ls
|
||||
-Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "-ls" output for HTTP URLs.
|
||||
+Lists attributes returned by Get-Printer-Attributes for IPP printers and traditional \fIfind\fR "\-ls" output for HTTP URLs.
|
||||
The result is true if the URI is accessible, false otherwise.
|
||||
.TP 5
|
||||
.B \-\-local
|
||||
@@ -108,7 +108,7 @@ The result is always true.
|
||||
.B \-q
|
||||
.TP 5
|
||||
.B \-\-quiet
|
||||
-Quiet mode - just returns the exit codes below.
|
||||
+Quiet mode \- just returns the exit codes below.
|
||||
.TP 5
|
||||
.B \-r
|
||||
.TP 5
|
||||
@@ -141,7 +141,7 @@ True if the URI matches the given regular expression.
|
||||
.TP 5
|
||||
\fB\-\-exec \fIutility \fR[ \fIargument \fR... ] \fB;\fR
|
||||
Executes the specified program if the current result is true.
|
||||
-"{foo}" arguments are replaced with the corresponding value - see SUBSTITUTIONS below.
|
||||
+"{foo}" arguments are replaced with the corresponding value \- see SUBSTITUTIONS below.
|
||||
.PP
|
||||
Expressions may also contain modifiers:
|
||||
.TP 5
|
||||
diff --git a/man/ipptoolfile.5 b/man/ipptoolfile.5
|
||||
index 7001017..5763232 100644
|
||||
--- a/man/ipptoolfile.5
|
||||
+++ b/man/ipptoolfile.5
|
||||
@@ -166,8 +166,8 @@ The following directives are understood within a \fItest\fR:
|
||||
\fBATTR \fItag attribute-name value(s)\fR
|
||||
Adds an attribute to the test request.
|
||||
Out-of-band tags (admin-define, delete-attribute, no-value, not-settable, unknown, unsupported) have no value.
|
||||
-Values for other tags are delimited by the comma (",") character - escape commas using the "\\" character.
|
||||
-Common attributes and values are listed in the IANA IPP registry - see references below.
|
||||
+Values for other tags are delimited by the comma (",") character \- escape commas using the "\\" character.
|
||||
+Common attributes and values are listed in the IANA IPP registry \- see references below.
|
||||
.TP 5
|
||||
\fBATTR collection \fIattribute-name \fB{ MEMBER \fItag member-name value(s) ... \fB}\fR [ \fI... \fB,{ \fI... \fB} \fR]
|
||||
Adds a collection attribute to the test request.
|
||||
@@ -194,7 +194,7 @@ test report.
|
||||
\fBEXPECT ?\fIattribute-name predicate(s)\fR
|
||||
.TP 5
|
||||
\fBEXPECT !\fIattribute-name\fR
|
||||
-Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates - see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
|
||||
+Specifies that the response must/may/must not include the named attribute. Additional requirements can be added as predicates \- see the "EXPECT PREDICATES" section for more information on predicates. Attribute names can specify member attributes by separating the attribute and member names with the forward slash, for example "media\-col/media\-size/x\-dimension".
|
||||
.TP 5
|
||||
\fBEXPECT-ALL \fIattribute-name \fR[ \fIpredicate(s) \fR]
|
||||
.TP 5
|
||||
@@ -246,7 +246,7 @@ Specifies whether
|
||||
will skip the current test if the previous test resulted in an error/failure.
|
||||
.TP 5
|
||||
\fBSTATUS \fIstatus-code \fR[ \fIpredicate\fR ]
|
||||
-Specifies an expected response status-code value. Additional requirements can be added as predicates - see the "STATUS PREDICATES" section for more information on predicates.
|
||||
+Specifies an expected response status-code value. Additional requirements can be added as predicates \- see the "STATUS PREDICATES" section for more information on predicates.
|
||||
.TP 5
|
||||
\fBTEST\-ID "\fIidentifier\fR"
|
||||
Specifies an identifier string for the current test.
|
||||
diff --git a/man/lp.1 b/man/lp.1
|
||||
index cbea3b8..839a482 100644
|
||||
--- a/man/lp.1
|
||||
+++ b/man/lp.1
|
||||
@@ -83,7 +83,7 @@ lp \- print files
|
||||
]
|
||||
.SH DESCRIPTION
|
||||
\fBlp\fR submits files for printing or alters a pending job.
|
||||
-Use a filename of "-" to force printing from the standard input.
|
||||
+Use a filename of "\-" to force printing from the standard input.
|
||||
.SS THE DEFAULT DESTINATION
|
||||
CUPS provides many ways to set the default destination. The \fBLPDEST\fR and \fBPRINTER\fR environment variables are consulted first.
|
||||
If neither are set, the current default set using the
|
||||
@@ -153,7 +153,7 @@ Use a value of \fIrestart\fR with the \fI-i\fR option to restart a completed job
|
||||
\fB\-P \fIpage-list\fR
|
||||
Specifies which pages to print in the document.
|
||||
The list can contain a list of numbers and ranges (#-#) separated by commas, e.g., "1,3-5,16".
|
||||
-The page numbers refer to the output pages and not the document's original pages - options like "number-up" can affect the numbering of the pages.
|
||||
+The page numbers refer to the output pages and not the document's original pages \- options like "number-up" can affect the numbering of the pages.
|
||||
.SS COMMON JOB OPTIONS
|
||||
Aside from the printer-specific options reported by the
|
||||
.BR lpoptions (1)
|
||||
@@ -183,7 +183,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
|
||||
\fB\-o print\-quality=4\fR
|
||||
.TP 5
|
||||
\fB\-o print\-quality=5\fR
|
||||
-Specifies the output quality - draft (3), normal (4), or best (5).
|
||||
+Specifies the output quality \- draft (3), normal (4), or best (5).
|
||||
.TP 5
|
||||
\fB\-o sides=one\-sided\fR
|
||||
Prints on one side of the paper.
|
||||
@@ -202,19 +202,19 @@ The \fI-q\fR option accepts a different range of values than the Solaris lp comm
|
||||
Print two copies of a document to the default printer:
|
||||
.nf
|
||||
|
||||
- lp -n 2 filename
|
||||
+ lp \-n 2 filename
|
||||
|
||||
.fi
|
||||
Print a double-sided legal document to a printer called "foo":
|
||||
.nf
|
||||
|
||||
- lp -d foo -o media=legal -o sides=two-sided-long-edge filename
|
||||
+ lp \-d foo \-o media=legal \-o sides=two-sided-long-edge filename
|
||||
|
||||
.fi
|
||||
Print a presentation document 2-up to a printer called "bar":
|
||||
.nf
|
||||
|
||||
- lp -d bar -o number-up=2 filename
|
||||
+ lp \-d bar \-o number-up=2 filename
|
||||
.fi
|
||||
.SH SEE ALSO
|
||||
.BR cancel (1),
|
||||
diff --git a/man/lpadmin.8 b/man/lpadmin.8
|
||||
index 1b8c91b..ce6a698 100644
|
||||
--- a/man/lpadmin.8
|
||||
+++ b/man/lpadmin.8
|
||||
@@ -120,7 +120,7 @@ command.
|
||||
.TP 5
|
||||
\fB\-o \fIname\fB-default=\fIvalue\fR
|
||||
Sets a default server-side option for the destination.
|
||||
-Any print-time option can be defaulted, e.g., "-o number-up-default=2" to set the default "number-up" option value to 2.
|
||||
+Any print-time option can be defaulted, e.g., "\-o number-up-default=2" to set the default "number-up" option value to 2.
|
||||
.TP 5
|
||||
\fB\-o port\-monitor=\fIname\fR
|
||||
Sets the binary communications program to use when printing, "none", "bcp", or "tbcp".
|
||||
@@ -162,7 +162,7 @@ If the resulting class becomes empty it is removed.
|
||||
Sets user-level access control on a destination.
|
||||
Names starting with "@" are interpreted as UNIX groups.
|
||||
The latter two forms turn user-level access control off.
|
||||
-Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
|
||||
+Note: The user 'root' is not granted special access \- using "\-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
|
||||
.TP 5
|
||||
\fB\-v "\fIdevice-uri\fB"\fR
|
||||
Sets the \fIdevice-uri\fR attribute of the printer queue.
|
||||
@@ -218,7 +218,7 @@ These files should not be edited directly and are an implementation detail of CU
|
||||
Create an IPP Everywhere print queue:
|
||||
.nf
|
||||
|
||||
- lpadmin -p myprinter -E -v ipp://myprinter.local/ipp/print -m everywhere
|
||||
+ lpadmin \-p myprinter \-E \-v ipp://myprinter.local/ipp/print \-m everywhere
|
||||
|
||||
.fi
|
||||
.SH SEE ALSO
|
||||
diff --git a/man/lpoptions.1 b/man/lpoptions.1
|
||||
index a34fd01..7550d9a 100644
|
||||
--- a/man/lpoptions.1
|
||||
+++ b/man/lpoptions.1
|
||||
@@ -102,9 +102,9 @@ Destinations can only be removed using the
|
||||
.BR lpadmin (8)
|
||||
command.
|
||||
.SH FILES
|
||||
-\fI~/.cups/lpoptions\fR - user defaults and instances created by non-root users.
|
||||
+\fI~/.cups/lpoptions\fR \- user defaults and instances created by non-root users.
|
||||
.br
|
||||
-\fI/etc/cups/lpoptions\fR - system-wide defaults and instances created by the root user.
|
||||
+\fI/etc/cups/lpoptions\fR \- system-wide defaults and instances created by the root user.
|
||||
.SH CONFORMING TO
|
||||
The \fBlpoptions\fR command is unique to CUPS.
|
||||
.SH SEE ALSO
|
||||
diff --git a/man/lpr.1 b/man/lpr.1
|
||||
index f367cd9..635d126 100644
|
||||
--- a/man/lpr.1
|
||||
+++ b/man/lpr.1
|
||||
@@ -138,7 +138,7 @@ Prints the job in reverse portrait (rotated 180 degrees).
|
||||
\fB\-o print\-quality=4\fR
|
||||
.TP 5
|
||||
\fB\-o print\-quality=5\fR
|
||||
-Specifies the output quality - draft (3), normal (4), or best (5).
|
||||
+Specifies the output quality \- draft (3), normal (4), or best (5).
|
||||
.TP 5
|
||||
\fB\-o sides=one\-sided\fR
|
||||
Prints on one side of the paper.
|
||||
@@ -154,19 +154,19 @@ The \fI\-c\fR, \fI\-d\fR, \fI\-f\fR, \fI\-g\fR, \fI\-i\fR, \fI\-n\fR, \fI\-t\fR,
|
||||
Print two copies of a document to the default printer:
|
||||
.nf
|
||||
|
||||
- lpr -# 2 filename
|
||||
+ lpr \-# 2 filename
|
||||
|
||||
.fi
|
||||
Print a double-sided legal document to a printer called "foo":
|
||||
.nf
|
||||
|
||||
- lpr -P foo -o media=legal -o sides=two-sided-long-edge filename
|
||||
+ lpr \-P foo \-o media=legal \-o sides=two-sided-long-edge filename
|
||||
|
||||
.fi
|
||||
Print a presentation document 2-up to a printer called "foo":
|
||||
.nf
|
||||
|
||||
- lpr -P foo -o number-up=2 filename
|
||||
+ lpr \-P foo \-o number-up=2 filename
|
||||
.fi
|
||||
.SH SEE ALSO
|
||||
.BR cancel (1),
|
||||
diff --git a/man/mime.convs.5 b/man/mime.convs.5
|
||||
index 25a6f76..04ba394 100644
|
||||
--- a/man/mime.convs.5
|
||||
+++ b/man/mime.convs.5
|
||||
@@ -35,11 +35,11 @@ A value of 100 means that the filter uses a large amount of resources while a va
|
||||
The \fIfilter\fR field specifies the filter program filename.
|
||||
Filenames are relative to the CUPS filter directory.
|
||||
.SH FILES
|
||||
-\fI/etc/cups\fR - Typical CUPS configuration directory.
|
||||
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
|
||||
.br
|
||||
-\fI/usr/lib/cups/filter\fR - Typical CUPS filter directory.
|
||||
+\fI/usr/lib/cups/filter\fR \- Typical CUPS filter directory.
|
||||
.br
|
||||
-\fI/usr/libexec/cups/filter\fR - CUPS filter directory on macOS.
|
||||
+\fI/usr/libexec/cups/filter\fR \- CUPS filter directory on macOS.
|
||||
.SH EXAMPLES
|
||||
Define a filter that converts PostScript documents to CUPS Raster format:
|
||||
.nf
|
||||
diff --git a/man/mime.types.5 b/man/mime.types.5
|
||||
index 7e83de1..3572726 100644
|
||||
--- a/man/mime.types.5
|
||||
+++ b/man/mime.types.5
|
||||
@@ -35,7 +35,7 @@ See the "TYPE MATCHING AND PRIORITY" section for more information.
|
||||
.LP
|
||||
The rules may be grouped using parenthesis, joined using "+" for a logical AND, joined using "," or whitespace for a logical OR, and negated using "!".
|
||||
.SS RULES
|
||||
-Rules take two forms - a filename extension by itself and functions with test
|
||||
+Rules take two forms \- a filename extension by itself and functions with test
|
||||
values inside parenthesis.
|
||||
The following functions are available:
|
||||
.TP 5
|
||||
@@ -85,7 +85,7 @@ extension "doc", normally the type "text/bar" will be chosen since its name is
|
||||
alphanumerically smaller than "text/foo".
|
||||
However, if "text/foo" also defines a higher priority than "text/bar", "text/foo" will be chosen instead.
|
||||
.SH FILES
|
||||
-\fI/etc/cups\fR - Typical CUPS configuration directory.
|
||||
+\fI/etc/cups\fR \- Typical CUPS configuration directory.
|
||||
.SH EXAMPLES
|
||||
Define two MIME media types for raster data, with one being a subset with higher priority:
|
||||
.nf
|
||||
diff --git a/man/ppdc.1 b/man/ppdc.1
|
||||
index 44e9d24..38e2669 100644
|
||||
--- a/man/ppdc.1
|
||||
+++ b/man/ppdc.1
|
||||
@@ -85,7 +85,7 @@ The default is to generate uncompressed PPD files.
|
||||
\fB\-\-crlf\fR
|
||||
.TP 5
|
||||
\fB\-\-lf\fR
|
||||
-Specifies the line ending to use - carriage return, carriage return and line feed, or line feed alone.
|
||||
+Specifies the line ending to use \- carriage return, carriage return and line feed, or line feed alone.
|
||||
The default is to use the line feed character alone.
|
||||
.SH NOTES
|
||||
PPD files are deprecated and will no longer be supported in a future feature release of CUPS.
|
|
@ -0,0 +1,66 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:11:06 +0200
|
||||
Subject: Install root backends world-readable
|
||||
|
||||
This is needed:
|
||||
- to comply with Debian Policy
|
||||
- because it is both nonsensical to not do so
|
||||
- it also breaks system checkers, bug reporting, etc
|
||||
|
||||
Bug: https://github.com/apple/cups/issues/2935
|
||||
Bug-Debian: https://bugs.debian.org/410171
|
||||
Patch-Name install-root-backends-world-readable.patch
|
||||
---
|
||||
backend/Makefile | 4 ++--
|
||||
scheduler/cups-deviced.c | 2 +-
|
||||
scheduler/job.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/backend/Makefile b/backend/Makefile
|
||||
index e3ce49b..b734458 100644
|
||||
--- a/backend/Makefile
|
||||
+++ b/backend/Makefile
|
||||
@@ -13,7 +13,7 @@ include ../Makedefs
|
||||
# Object files...
|
||||
#
|
||||
|
||||
-# RBACKENDS are installed mode 0700 so cupsd will run them as root...
|
||||
+# RBACKENDS are installed mode 0744 so cupsd will run them as root...
|
||||
#
|
||||
# UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
|
||||
# an unprivileged user...
|
||||
@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC)
|
||||
echo Installing backends in $(SERVERBIN)/backend
|
||||
$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
|
||||
for file in $(RBACKENDS); do \
|
||||
- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
|
||||
+ $(LIBTOOL) $(INSTALL_BIN) -m 744 $$file $(SERVERBIN)/backend; \
|
||||
done
|
||||
for file in $(UBACKENDS); do \
|
||||
$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
|
||||
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
|
||||
index 77703b9..14478fd 100644
|
||||
--- a/scheduler/cups-deviced.c
|
||||
+++ b/scheduler/cups-deviced.c
|
||||
@@ -265,7 +265,7 @@ main(int argc, /* I - Number of command-line args */
|
||||
* all others run as the unprivileged user...
|
||||
*/
|
||||
|
||||
- start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IRWXO)));
|
||||
+ start_backend(dent->filename, !(dent->fileinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH)));
|
||||
}
|
||||
|
||||
cupsDirClose(dir);
|
||||
diff --git a/scheduler/job.c b/scheduler/job.c
|
||||
index e20e7c5..eb99b3e 100644
|
||||
--- a/scheduler/job.c
|
||||
+++ b/scheduler/job.c
|
||||
@@ -1247,7 +1247,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */
|
||||
else if (stat(command, &backinfo))
|
||||
backroot = 0;
|
||||
else
|
||||
- backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
|
||||
+ backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
|
||||
|
||||
argv[0] = job->printer->sanitized_device_uri;
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From: Tim Waugh <twaugh@redhat.com>
|
||||
Date: Tue, 9 Aug 2016 18:11:07 +0200
|
||||
Subject: Fix jobs with multiple files or multiple formats
|
||||
|
||||
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
|
||||
Bug: https://github.com/apple/cups/issues/4348
|
||||
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
|
||||
---
|
||||
backend/ipp.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/backend/ipp.c b/backend/ipp.c
|
||||
index 3f3e186..a99079e 100644
|
||||
--- a/backend/ipp.c
|
||||
+++ b/backend/ipp.c
|
||||
@@ -1804,7 +1804,10 @@ main(int argc, /* I - Number of command-line args */
|
||||
ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
|
||||
(i + 1) >= num_files);
|
||||
|
||||
- if (document_format)
|
||||
+ if (num_files > 1)
|
||||
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
|
||||
+ "document-format", NULL, "application/octet-stream");
|
||||
+ else if (document_format)
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
|
||||
"document-format", NULL, document_format);
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
From: Till Kamppeter <till.kamppeter@gmail.com>
|
||||
Date: Mon, 17 Feb 2020 09:05:58 +0100
|
||||
Subject: Fix conversion of PPD InputSlot choice names
|
||||
|
||||
When I create a CUPS queue with a PPD file with choice names "Tray-1", "Tray-2",
|
||||
... in the InputSlot option CUPS translates these names to double-dashed IPP
|
||||
attribute names: "tray--1", "tray--2", ... in the "media-source" attribute, both
|
||||
when passing a job to the printer with the IPP backend, making the printer
|
||||
ignore the tray choice, and also when answering a get-printer-attributes IPP
|
||||
request from a client. This happens when in the PPD a dash is followed by a
|
||||
digit, as the pwg_unppdize_name() function in cups/ppd-cache.c inserts a dash
|
||||
whenever a non-digit is followed by a digit in the PPD name. As IPP attribute
|
||||
names generally never have double-dashes and also no dashes in the beginning or
|
||||
the end of the name, I have modified the pwg_unppdize_name() function
|
||||
appropriately.
|
||||
|
||||
Bug: https://github.com/apple/cups/issues/5740
|
||||
Bug-Debian: https://bugs.debian.org/949315
|
||||
---
|
||||
cups/ppd-cache.c | 47 ++++++++++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 38 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
|
||||
index 5965e38..6609f53 100644
|
||||
--- a/cups/ppd-cache.c
|
||||
+++ b/cups/ppd-cache.c
|
||||
@@ -5140,6 +5140,8 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */
|
||||
{
|
||||
char *ptr, /* Pointer into name buffer */
|
||||
*end; /* End of name buffer */
|
||||
+ int nodash = 1; /* Next char in IPP name cannot be a
|
||||
+ dash (first char or after a dash) */
|
||||
|
||||
|
||||
if (_cups_islower(*ppd))
|
||||
@@ -5151,7 +5153,9 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */
|
||||
const char *ppdptr; /* Pointer into PPD keyword */
|
||||
|
||||
for (ppdptr = ppd + 1; *ppdptr; ppdptr ++)
|
||||
- if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr))
|
||||
+ if (_cups_isupper(*ppdptr) || strchr(dashchars, *ppdptr) ||
|
||||
+ (*ppdptr == '-' && *(ppdptr - 1) == '-') ||
|
||||
+ (*ppdptr == '-' && *(ppdptr + 1) == '\0'))
|
||||
break;
|
||||
|
||||
if (!*ppdptr)
|
||||
@@ -5163,19 +5167,44 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */
|
||||
|
||||
for (ptr = name, end = name + namesize - 1; *ppd && ptr < end; ppd ++)
|
||||
{
|
||||
- if (_cups_isalnum(*ppd) || *ppd == '-')
|
||||
+ if (_cups_isalnum(*ppd))
|
||||
+ {
|
||||
*ptr++ = (char)tolower(*ppd & 255);
|
||||
- else if (strchr(dashchars, *ppd))
|
||||
- *ptr++ = '-';
|
||||
+ nodash = 0;
|
||||
+ }
|
||||
+ else if (*ppd == '-' || strchr(dashchars, *ppd))
|
||||
+ {
|
||||
+ if (nodash == 0)
|
||||
+ {
|
||||
+ *ptr++ = '-';
|
||||
+ nodash = 1;
|
||||
+ }
|
||||
+ }
|
||||
else
|
||||
+ {
|
||||
*ptr++ = *ppd;
|
||||
+ nodash = 0;
|
||||
+ }
|
||||
|
||||
- if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
|
||||
- _cups_isupper(ppd[1]) && ptr < end)
|
||||
- *ptr++ = '-';
|
||||
- else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
|
||||
- *ptr++ = '-';
|
||||
+ if (nodash == 0)
|
||||
+ {
|
||||
+ if (!_cups_isupper(*ppd) && _cups_isalnum(*ppd) &&
|
||||
+ _cups_isupper(ppd[1]) && ptr < end)
|
||||
+ {
|
||||
+ *ptr++ = '-';
|
||||
+ nodash = 1;
|
||||
+ }
|
||||
+ else if (!isdigit(*ppd & 255) && isdigit(ppd[1] & 255))
|
||||
+ {
|
||||
+ *ptr++ = '-';
|
||||
+ nodash = 1;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
+ /* Remove trailing dashes */
|
||||
+ while (ptr > name && *(ptr - 1) == '-')
|
||||
+ ptr --;
|
||||
+
|
||||
*ptr = '\0';
|
||||
}
|
|
@ -0,0 +1,86 @@
|
|||
From: Till Kamppeter <till.kamppeter@gmail.com>
|
||||
Date: Sat, 22 Feb 2020 14:28:58 +0100
|
||||
Subject: Fix scheduler cupsd.conf load
|
||||
|
||||
When running it without arguments it is supposed to read the local CUPS's
|
||||
cupsd.conf and show a summary of the setting. in CUPS 2.3.1 it shows a mess
|
||||
with a lot of HTML inside and this is due to the fact that when loading the
|
||||
file via HTTP using the /admin/cups/cupsd.conf path the scheduler calls the
|
||||
admin.cgi program which returns the admin front page of the web admin
|
||||
interface. cupsctl then tries to interpret that as the config file and displays
|
||||
garbage. Even worse is if you run cupsctl with command line argument (one of
|
||||
the five switches or a key=value pair) to change a setting. It seems to load
|
||||
cupsd.conf again and gets again the HTML code of the web interface page.
|
||||
cupsctl tries to interpret this again, producing garbage, adds the
|
||||
user-supplied setting and writes all this back into cupsd.conf. Then it tries
|
||||
to restart the scheduler which fails due to the broken config file.
|
||||
The problem is that in the file scheduler/client.conf, in the function
|
||||
get_file() the URI from the client is at first checked whether it begins with
|
||||
"/admin/" and in this case the CGI program admin.cgi is responsible. Only after
|
||||
that the check for "/admin/conf/cupsd.conf" comes and is never reached.
|
||||
I have changed the order now appropriately and this way cupsctl works again.
|
||||
Note that the problem only occurs if the web interface is active and the
|
||||
cupsctl command is issued by a non-root user.
|
||||
This is a regression caused by issue #5652.
|
||||
|
||||
Bug: https://github.com/apple/cups/issues/5744
|
||||
---
|
||||
scheduler/client.c | 38 +++++++++++++++++++-------------------
|
||||
1 file changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/scheduler/client.c b/scheduler/client.c
|
||||
index c2ee8f1..54b841b 100644
|
||||
--- a/scheduler/client.c
|
||||
+++ b/scheduler/client.c
|
||||
@@ -2789,6 +2789,25 @@ get_file(cupsd_client_t *con, /* I - Client connection */
|
||||
|
||||
perm_check = 0;
|
||||
}
|
||||
+ else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
|
||||
+ {
|
||||
+ strlcpy(filename, ConfigurationFile, len);
|
||||
+
|
||||
+ perm_check = 0;
|
||||
+ }
|
||||
+ else if (!strncmp(con->uri, "/admin/log/", 11))
|
||||
+ {
|
||||
+ if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
|
||||
+ strlcpy(filename, AccessLog, len);
|
||||
+ else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
|
||||
+ strlcpy(filename, ErrorLog, len);
|
||||
+ else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
|
||||
+ strlcpy(filename, PageLog, len);
|
||||
+ else
|
||||
+ return (NULL);
|
||||
+
|
||||
+ perm_check = 0;
|
||||
+ }
|
||||
else if (!strncmp(con->uri, "/admin", 6) || !strncmp(con->uri, "/classes", 8) || !strncmp(con->uri, "/jobs", 5) || !strncmp(con->uri, "/printers", 9))
|
||||
{
|
||||
/*
|
||||
@@ -2822,25 +2841,6 @@ get_file(cupsd_client_t *con, /* I - Client connection */
|
||||
|
||||
perm_check = 0;
|
||||
}
|
||||
- else if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
|
||||
- {
|
||||
- strlcpy(filename, ConfigurationFile, len);
|
||||
-
|
||||
- perm_check = 0;
|
||||
- }
|
||||
- else if (!strncmp(con->uri, "/admin/log/", 11))
|
||||
- {
|
||||
- if (!strncmp(con->uri + 11, "access_log", 10) && AccessLog[0] == '/')
|
||||
- strlcpy(filename, AccessLog, len);
|
||||
- else if (!strncmp(con->uri + 11, "error_log", 9) && ErrorLog[0] == '/')
|
||||
- strlcpy(filename, ErrorLog, len);
|
||||
- else if (!strncmp(con->uri + 11, "page_log", 8) && PageLog[0] == '/')
|
||||
- strlcpy(filename, PageLog, len);
|
||||
- else
|
||||
- return (NULL);
|
||||
-
|
||||
- perm_check = 0;
|
||||
- }
|
||||
else if (con->language)
|
||||
{
|
||||
snprintf(language, sizeof(language), "/%s", con->language->language);
|
|
@ -0,0 +1,28 @@
|
|||
From: Martin Pitt <mpitt@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:11:09 +0200
|
||||
Subject: Tests: Ignore warnings from colord and Avahi
|
||||
|
||||
These warnings change the expected number of warnings
|
||||
|
||||
Patch-Name: tests-ignore-warnings.patch
|
||||
---
|
||||
test/run-stp-tests.sh | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
|
||||
index 2f9630f..a601581 100755
|
||||
--- a/test/run-stp-tests.sh
|
||||
+++ b/test/run-stp-tests.sh
|
||||
@@ -1040,7 +1040,11 @@ else
|
||||
fi
|
||||
|
||||
# Warning log messages
|
||||
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
|
||||
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
|
||||
+ $GREP -v 'Unable to initialize USB access via libusb, libusb error' | \
|
||||
+ $GREP -v 'org.freedesktop.ColorManager' | \
|
||||
+ $GREP -v -E 'Avahi client failed: -(1|26)' | \
|
||||
+ wc -l | awk '{print $1}'`
|
||||
if test $count != 8; then
|
||||
echo "FAIL: $count warning messages, expected 8."
|
||||
$GREP '^W ' $BASE/log/error_log
|
|
@ -0,0 +1,21 @@
|
|||
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||
Date: Fri, 14 Feb 2020 16:48:49 +0100
|
||||
Subject: Fix leakage of ppd
|
||||
|
||||
---
|
||||
ppdc/ppdc-import.cxx | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
|
||||
index 04b587d..b4a8341 100644
|
||||
--- a/ppdc/ppdc-import.cxx
|
||||
+++ b/ppdc/ppdc-import.cxx
|
||||
@@ -323,5 +323,8 @@ ppdcSource::import_ppd(const char *f) // I - Filename
|
||||
}
|
||||
}
|
||||
|
||||
+ if (ppd)
|
||||
+ ppdClose(ppd);
|
||||
+
|
||||
return (1);
|
||||
}
|
|
@ -0,0 +1,31 @@
|
|||
From: Didier Raboud <odyx@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:11:10 +0200
|
||||
Subject: Tests: ignore usb & dnssd backend unexpected exits
|
||||
|
||||
Ignore the following errors:
|
||||
"[cups-deviced] PID * (usb) crashed on signal 11!" and
|
||||
"[cups-deviced] PID * (dnssd) stopped with status 1"
|
||||
|
||||
They seem to regularly happen on Debian/Ubuntu buildds and break error lines
|
||||
counting.
|
||||
Patch-Name: tests-ignore-usb-crash.patch
|
||||
---
|
||||
test/run-stp-tests.sh | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
|
||||
index a601581..8bde425 100755
|
||||
--- a/test/run-stp-tests.sh
|
||||
+++ b/test/run-stp-tests.sh
|
||||
@@ -1025,7 +1025,10 @@ else
|
||||
fi
|
||||
|
||||
# Error log messages
|
||||
-count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | wc -l | awk '{print $1}'`
|
||||
+count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
|
||||
+ $GREP -v '(usb) crashed on signal 11' | \
|
||||
+ $GREP -v '(dnssd) stopped with status 1' | \
|
||||
+ wc -l | awk '{print $1}'`
|
||||
if test $count != 33; then
|
||||
echo "FAIL: $count error messages, expected 33."
|
||||
$GREP '^E ' $BASE/log/error_log
|
|
@ -0,0 +1,25 @@
|
|||
From: Didier Raboud <odyx@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:30:48 +0200
|
||||
Subject: Tests: ignore loadFile failures
|
||||
|
||||
Ignore the 'loadFile failed: temp file: not a PDF file' error that sometimes
|
||||
breaks the errorlines counting on kfreebsd-amd64 for some reason
|
||||
Origin: vendor
|
||||
Patch-Name: tests-ignore-kfreebsd-amd64-not-a-pdf.patch
|
||||
---
|
||||
test/run-stp-tests.sh | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
|
||||
index 8bde425..f5a98dd 100755
|
||||
--- a/test/run-stp-tests.sh
|
||||
+++ b/test/run-stp-tests.sh
|
||||
@@ -1028,6 +1028,8 @@ fi
|
||||
count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup' | \
|
||||
$GREP -v '(usb) crashed on signal 11' | \
|
||||
$GREP -v '(dnssd) stopped with status 1' | \
|
||||
+ $GREP -v 'loadFile failed: temp file: not a PDF file' | \
|
||||
+ $GREP -v 'Failed to connect to system bus' | \
|
||||
wc -l | awk '{print $1}'`
|
||||
if test $count != 33; then
|
||||
echo "FAIL: $count error messages, expected 33."
|
24
debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
vendored
Normal file
24
debian/patches/0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
vendored
Normal file
|
@ -0,0 +1,24 @@
|
|||
From: Didier Raboud <odyx@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:33:56 +0200
|
||||
Subject: Tests: ignore errors triggered on ipv6-deprived hosts
|
||||
|
||||
Ignore the 'Address family not supported by protocol' error that breaks the
|
||||
errorlines counting on buildds without a working IPv6 stack.
|
||||
Origin: vendor
|
||||
Patch-Name: tests-ignore-ipv6-address-family-not-supported.patch
|
||||
---
|
||||
test/run-stp-tests.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
|
||||
index f5a98dd..f3a4321 100755
|
||||
--- a/test/run-stp-tests.sh
|
||||
+++ b/test/run-stp-tests.sh
|
||||
@@ -1030,6 +1030,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
|
||||
$GREP -v '(dnssd) stopped with status 1' | \
|
||||
$GREP -v 'loadFile failed: temp file: not a PDF file' | \
|
||||
$GREP -v 'Failed to connect to system bus' | \
|
||||
+ $GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
|
||||
wc -l | awk '{print $1}'`
|
||||
if test $count != 33; then
|
||||
echo "FAIL: $count error messages, expected 33."
|
24
debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
vendored
Normal file
24
debian/patches/0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
vendored
Normal file
|
@ -0,0 +1,24 @@
|
|||
From: Didier Raboud <odyx@debian.org>
|
||||
Date: Tue, 9 Aug 2016 18:36:02 +0200
|
||||
Subject: Tests: ignore the failure to write uncompressed data
|
||||
|
||||
Ignore the 'Unable to write uncompressed print data: Broken pipe' error that
|
||||
sometimes breaks the errorlines counting on kfreebsd for some reason.
|
||||
Origin: vendor
|
||||
Patch-Name: tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
|
||||
---
|
||||
test/run-stp-tests.sh | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
|
||||
index f3a4321..c072ad8 100755
|
||||
--- a/test/run-stp-tests.sh
|
||||
+++ b/test/run-stp-tests.sh
|
||||
@@ -1031,6 +1031,7 @@ count=`$GREP '^E ' $BASE/log/error_log | $GREP -v 'Unknown default SystemGroup'
|
||||
$GREP -v 'loadFile failed: temp file: not a PDF file' | \
|
||||
$GREP -v 'Failed to connect to system bus' | \
|
||||
$GREP -v -E 'Unable to open listen socket for address .* Address family not supported by protocol.' | \
|
||||
+ $GREP -v 'Unable to write uncompressed print data: Broken pipe' | \
|
||||
wc -l | awk '{print $1}'`
|
||||
if test $count != 33; then
|
||||
echo "FAIL: $count error messages, expected 33."
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue