Commit Graph

52 Commits

Author SHA1 Message Date
Didier Raboud e02bc5946f Debian: Reproducibility: httpAddrGetHostname() test fails under reprotest; skip it
Forwarded: not-needed
2023-03-21 14:11:20 +08:00
Helmut Grohne ea626c5911 Debian: Build mantohtml with the build architecture compiler
mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.

Bug-Debian: https://bugs.debian.org/837936
Forwarded: not-needed
2023-03-21 14:11:14 +08:00
Didier Raboud d53416c5f1 Debian: Use dpkg-architecture in cups-config to make it architecture-independant
Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config

Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Forwarded: not-needed
2023-03-21 14:11:08 +08:00
Till Kampetter 1012426432 Debian: Show compile command lines
Forwarded: not-needed
2023-03-21 14:11:02 +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
Didier Raboud 80ded4e934 Debian: Move cupsd.conf.default from SERVERROOT to DATADIR
Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug: https://github.com/OpenPrinting/cups/pull/26
Bug-Debian: https://bugs.debian.org/640124
2023-03-21 14:10:50 +08:00
Martin Pitt 872d54f953 Debian: Set LogFileGroup to adm
Forwarded: not-needed
2023-03-21 14:10:44 +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
Till Kamppeter 8febec734d Apple AirPrint support
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
Bug: https://github.com/OpenPrinting/cups/pull/27
2023-03-21 14:10:31 +08:00
su-fang 510a6b3936 Update the debian directory. 2023-03-21 10:53:15 +08:00
su-fang 1c0f806edf merge upstream 2.4.2 2023-01-12 15:27:08 +08:00
openKylinBot 627cbd9ab9 * debian/rules:
+ fix openkylin vendor
2022-06-01 10:59:08 +08:00
openKylinBot a15a99feab changed debian/source/format to native 2022-05-13 20:08:43 +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
Zdenek Dohnal 7d243b754c Fix leakage of ppd
Gbp-Pq: Name 0006-Fix-leakage-of-ppd.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
Didier Raboud d932dd688b po4a infrastructure and translations for manpages
Author: Nicolas François <nicolas.francois@centraliens.net>, Helge Kreutzmann <debian@helgefjell.de>
Origin: vendor
Bug-Debian: https://bugs.debian.org/478597
Patch-Name: manpage-translations.patch

Gbp-Pq: Name 0034-po4a-infrastructure-and-translations-for-manpages.patch
2022-05-13 20:08:42 +08:00
Helmut Grohne b3aa21acc1 Build mantohtml with the build architecture compiler
mantohtml is run during build. Thus it needs to be built with the build
architecture compiler (or execution fails). The obvious part is switching to
CC_FOR_BUILD. That also depends on it not requiring any other cups components.
In particular, removing uses of strlcpy and replacing host architecture-
specific includes is thus needed.
Bug-Debian: https://bugs.debian.org/837936
Patch-Name Build-mantohtml-with-the-build-architecture-compiler.patch

Gbp-Pq: Name 0033-Build-mantohtml-with-the-build-architecture-compiler.patch
2022-05-13 20:08:42 +08:00
Didier Raboud baff351789 Use dpkg-architecture in cups-config to make it architecture-independant
Also filter -L/usr/lib/(triplet) out of LDFLAGS.
 Also strip unnecessary libs from --libs.
 Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
Bug-Debian: https://bugs.debian.org/751157
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name 0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
2022-05-13 20:08:42 +08:00
Bastien ROUCARIÈS 32fdd51844 Drop dangling references from cups-lpd.man
Bug-Debian: https://bugs.debian.org/570157
Patch-Name: man-cups-lpd-drop-dangling-references.patch

Gbp-Pq: Name 0031-Drop-dangling-references-from-cups-lpd.man.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
Till Kampetter 70cd974b9e Show compile command lines
Patch-Name: show-compile-command-lines.patch

Gbp-Pq: Name 0028-Show-compile-command-lines.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
Didier Raboud c0a25e6ebf Deactivate CUPS' own log rotating as the system already provides a more sophisticated log rotating
Patch-Name: default_log_settings.patch

Gbp-Pq: Name 0026-Deactivate-CUPS-own-log-rotating-as-the-system-alrea.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
Kenshi Muto cd5af0c535 Do not write VCS tags into installed conffiles
Bug: https://github.com/apple/cups/issues/2369
Origin: vendor
Author: Didier Raboud <odyx@debian.org>
Patch-Name: removecvstag.patch

Gbp-Pq: Name 0021-Do-not-write-VCS-tags-into-installed-conffiles.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
Tim Waugh 53ccc9c8e8 Let snmp backend also use manufacturer-specific MIBs
… of HP and Ricoh to obtain the device IDs of network-connected
 printers. This way we get more reliable information about make and model
 and in addition the supported page description languages, which allows one to
 identify whether an optional PostScript add-on is installed or for an
 unsupported printer which generic PPD is the best choice (requested by
 Ricoh).
Bug: https://github.com/apple/cups/issues/3552
Patch-Name: Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch

Gbp-Pq: Name 0019-Let-snmp-backend-also-use-manufacturer-specific-MIBs.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
Didier Raboud 843db89d68 Move cupsd.conf.default from SERVERROOT to DATADIR
Origin: vendor
Bug: https://github.com/apple/cups/issues/4342
Bug-Debian: https://bugs.debian.org/640124
Patch-Name: move-cupsd-conf-default-to-share.patch

Gbp-Pq: Name 0017-Move-cupsd.conf.default-from-SERVERROOT-to-DATADIR.patch
2022-05-13 20:08:42 +08:00
Michael Sweet b90f4adbbb Tests: Do not test pdftourf
Revert commit 830cfed95a5349b008999eebd34f5233bc35829c

 "Update "make test" to include alternate filter."
 .
 This fixes the error lines counting in the test, and is unneeded as pdftourf
 is not shipped in Debian.
Origin: upstream
Patch-Name: tests-no-pdftourf.patch

Gbp-Pq: Name 0016-Tests-Do-not-test-pdftourf.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 4c5ef314ba Tests: Force LC_ALL=C environment variable when grepping the output of lpstat
Permits testing in non-"C" environments.
Origin: vendor
Patch-Name: tests-make-lpstat-call-reproducible.patch

Gbp-Pq: Name 0015-Tests-Force-LC_ALL-C-environment-variable-when-grepp.patch
2022-05-13 20:08:42 +08:00
Didier Raboud a6f316bc45 Tests: Use 127.0.0.1 instead of localhost to help pbuilder
This should make the test-suite work in pbuilder. It apparently also fixes an
ipp backend problem in the test-suite.

Origin: vendor
Patch-Name: tests-use-ipv4-lo-address.patch

Gbp-Pq: Name 0014-Tests-Use-127.0.0.1-instead-of-localhost-to-help-pbu.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 03be3daee9 Tests: Force LC_* environment variables when testing (non) l10n'isation.
Permits building in non-"C" environments.
Origin: vendor
Patch-Name: tests-fix-ppdLocalize-on-unclean-env.patch

Gbp-Pq: Name 0013-Tests-Force-LC_-environment-variables-when-testing-n.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 501f1428b8 Tests: Make sure that all scheduled jobs are finished before
running a new test. Fixes failures on slow architectures like armel and
 mipsel.
Bug-Debian: https://bugs.debian.org/670878
Patch-Name: tests-wait-on-unfinished-jobs-everytime.patch

Gbp-Pq: Name 0012-Tests-Make-sure-that-all-scheduled-jobs-are-finished.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 93e2054166 Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as glibc's iconv behavior is different than what the test expects.
Bug-Debian: https://bugs.debian.org/662996
Patch-Name: test-i18n-nonlinux.patch

Gbp-Pq: Name 0011-Tests-Do-not-run-the-CUPS_EUC_JP-test-case-on-BSD-Hu.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 332aaca050 Tests: ignore 'job held' message
Origin: vendor

Gbp-Pq: Name 0010-Tests-ignore-job-held-message.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 78365163b2 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

Gbp-Pq: Name 0009-Tests-ignore-the-failure-to-write-uncompressed-data.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 94932f3085 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

Gbp-Pq: Name 0008-Tests-ignore-errors-triggered-on-ipv6-deprived-hosts.patch
2022-05-13 20:08:42 +08:00
Didier Raboud cad6b49833 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

Gbp-Pq: Name 0007-Tests-ignore-loadFile-failures.patch
2022-05-13 20:08:42 +08:00
Didier Raboud 477eb1992e 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

Gbp-Pq: Name 0006-Tests-ignore-usb-dnssd-backend-unexpected-exits.patch
2022-05-13 20:08:42 +08:00
Martin Pitt ca17faca57 Tests: Ignore warnings from colord and Avahi
These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch

Gbp-Pq: Name 0005-Tests-Ignore-warnings-from-colord-and-Avahi.patch
2022-05-13 20:08:42 +08:00
Till Kamppeter 2a411b8d55 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

Gbp-Pq: Name 0004-Fix-conversion-of-PPD-InputSlot-choice-names.patch
2022-05-13 20:08:42 +08:00
Tim Waugh c538677bf8 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

Gbp-Pq: Name 0003-Fix-jobs-with-multiple-files-or-multiple-formats.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
Didier Raboud a537e97818 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

Gbp-Pq: Name 0001-Fix-hyphen-used-as-minus-sign-manpage-errors.patch
2022-05-13 20:08:42 +08:00