Commit Graph

18 Commits

Author SHA1 Message Date
su-fang 60985f3827 Apply patchs. 2023-03-21 14:47:59 +08:00
Zdenek Dohnal 5fc68e29a0 scheduler/cert.c: fix the comment 2023-03-21 14:12:12 +08:00
Martin Pitt bc32b6771a Debian: Do not alter the permissions of cupsd.conf, ever
Origin: vendor
Bug: https://github.com/OpenPrinting/cups/pull/36
2023-03-21 14:10:56 +08:00
Till Kampetter 6aba54009a Keep foomatic PPDs "(recommended)" stanzas in NickNames
Bug-Upstream: https://github.com/OpenPrinting/cups/pull/33
Forwarded: yes
2023-03-21 14:10:37 +08:00
su-fang 1c0f806edf merge upstream 2.4.2 2023-01-12 15:27:08 +08:00
Didier Raboud 28b6d4890d Add Requires=cups.socket to cups.service, to make sure they start in the right order
Gbp-Pq: Name 0025-Add-Requires-cups.socket-to-cups.service-to-make-sur.patch
2022-05-13 20:08:43 +08:00
Till Kamppeter 254598ba35 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

Gbp-Pq: Name 0005-Fix-scheduler-cupsd.conf-load.patch
2022-05-13 20:08:42 +08:00
Martin Pitt df78ba66a1 Set default job error policy to "retry-job"
It it is less confusing and a better default on most machines.
Amend documentation accordingly.

Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Patch-Name: cups-set-default-error-policy-retry-job.patch

Gbp-Pq: Name 0030-Set-default-job-error-policy-to-retry-job.patch
2022-05-13 20:08:42 +08:00
Tim Waugh 6e3fd936c7 Set the default for SyncOnClose to Yes
Patch-Name: cupsd-set-default-for-SyncOnClose-to-Yes.patch

Gbp-Pq: Name 0029-Set-the-default-for-SyncOnClose-to-Yes.patch
2022-05-13 20:08:42 +08:00
Martin Pitt 5d3dd6a809 Do not mess with the permissions of cupsd.conf.
Patch-Name: confdirperms.patch

Gbp-Pq: Name 0027-Do-not-mess-with-the-permissions-of-cupsd.conf.patch
2022-05-13 20:08:42 +08:00
Martin Pitt 4e347e8f31 Make log files readable to group "adm", if present.
Bug-Ubuntu: https://launchpad.net/bugs/345953
Patch-Name: logfiles_adm_readable.patch

Gbp-Pq: Name 0025-Make-log-files-readable-to-group-adm-if-present.patch
2022-05-13 20:08:42 +08:00
Till Kampetter dca4965086 CUPS removes the "(recommended)" comments of the NickNames of Foomatic PPDs when listing available PPDs. This patch removes this removal action.
Patch-Name: reactivate_recommended_driver.patch

Gbp-Pq: Name 0024-CUPS-removes-the-recommended-comments-of-the-NickNam.patch
2022-05-13 20:08:42 +08:00
Till Kampetter 472a97d25d Do not use host names for broadcasting print queues and
managing print queues broadcasted from other servers by default. Many
 networks do not have valid host names for all machines.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/449586
Patch-Name: do-not-broadcast-with-hostnames.patch

Gbp-Pq: Name 0023-Do-not-use-host-names-for-broadcasting-print-queues-.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 71b6027aa8 Rename the systemd service file from org.cups.cups.* to cups.*
Patch-Name: rename-systemd-units.patch

Gbp-Pq: Name 0022-Rename-the-systemd-service-file-from-org.cups.cups.-.patch
2022-05-13 20:08:42 +08:00
Joey Hess 77312d07fc Disable time stamps in conffiles, to avoid ever-changing files in /etc.
Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
Patch-Name: no-conffile-timestamp.patch

Gbp-Pq: Name 0020-Disable-time-stamps-in-conffiles-to-avoid-ever-chang.patch
2022-05-13 20:08:42 +08:00
Till Kamppeter b697d4aac6 Patch to support Apple AirPrint (printing from iPhone, iPad, iPod Touch to a CUPS server)
Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch

Gbp-Pq: Name 0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
2022-05-13 20:08:42 +08:00
Martin Pitt 8dcd36bdbe 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

Gbp-Pq: Name 0002-Install-root-backends-world-readable.patch
2022-05-13 20:08:42 +08:00
openKylinBot 9c7a73bc57 Import Upstream version 2.3.1 2022-05-13 20:08:20 +08:00