Merge ~jchittum/ubuntu/+source/cups:merge-lp2130070-resolute into ubuntu/+source/cups:debian/sid

[John Chittum]

PPA Build: https://launchpad.net/~jchittum/+archive/ubuntu/cups-merge-lp2130070

amd64 autopkgtest pass : https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-jchittum-cups-merge-lp2130070/resolute/amd64/c/cups/20251208_134106_d5d2d@/log.gz

arm64 autopkgtest pass : https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-jchittum-cups-merge-lp2130070/resolute/arm64/c/cups/20251208_134016_5b34d@/log.gz

[Nick Rosbrook (enr0n)]

Thanks for the work here. A couple of comments before it's ready.

(1) Rather than having a single commit for all of debian/rules, please split this into commits for each logical change. The same applies to debian/control.

For example, I don't think the "--enable-snapped-clients" delta and the "--enable-gnutls" delta in debian/rules are related. These should be separate logical commits.

On the other hand, the pkgconfig changes in debian/rules *is* tied to the debian/libcups2-dev.install and debian/cups.pc.in delta. Maybe that should represent one logical commit.

(2) I don't actually see a mention of the debian/rules delta in the changelog, so please add that.

(3) I think you are probably right that the "refresh patches" delta is unnecessary. Please try dropping that.

(4) One other note on the changelog - it deviates considerably from previous merge changelogs, but I don't think it necessarily adds context. In some cases, I think it removes information (like what's going on overall with the pkgconfig delta).

Please try not to remove too much of the long-standing entries for the delta. I think it's fine to add context in a way that doesn't considerably alter the existing text though.

One thing that might be helpful is using the --CL-- trick in the commit messages so that you can associate more context in the git commit, while not necessarily impacting the changelog itself.

review: Needs Fixing

f430ac3... by John Chittum on 2026-01-08

d/rules --with-tls=gnutls

    - In debian/rules updated "./configure" arguments from "--enable-gnutls" to
      "--with-tls=gnutls". Now libcups has support for all hash types again,
      especially can provide sha2-256 to PAPPL.

9bcd5a3... by John Chittum on 2026-01-08

d/rules --enable-snapped-clients

    - Added "--enable-snapped-clients" to the "./configure" options to use
      the correct Snap mediation mode for an unsnapped cupsd, like provided
      by this package.

2511a36... by John Chittum on 2026-01-08

pkgconfig file from upstream

    - Use pkgconfig file cups.pc from upstream and not Debian's own file
      of CUPS' pre-pkgconfig era. also use
      "--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" in the
      "./configure" command line therefore.

c3557b2... by John Chittum on 2026-01-08

d/ch 2.4.16-1ubuntu1 cleanup

[Nick Rosbrook (enr0n)]

Thanks for the follow up on this. LGTM.

Note that "d/control updates" *should* still be broken into two commits (the additions are not related), but no big deal.

Uploading.

review: Approve

Unmerged commits

c3557b2... by John Chittum on 2026-01-08

d/ch 2.4.16-1ubuntu1 cleanup

d5c71a9... by John Chittum on 2025-12-05

reconstruct-changelog

374f29f... by John Chittum on 2025-12-05

merge-changelogs

f687caa... by Ryan Lee on 2025-09-23

debian/local/apparmor-profile: add rule for accessing /etc/paperspecs (LP: #2125520)

ca58374... by Ryan Lee on 2025-09-23

debian/local/apparmor-profile: update for new coreutil paths (LP: #2123870)

bf2e2e5... by John Chittum on 2025-12-04

d/control updates

- Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
  Snap mediation.

- In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.

8454ebf... by John Chittum on 2025-12-04

d/local/apparmor-profile

In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
to allow cupsd to determine which interfaces a snapped client
is plugging.

2511a36... by John Chittum on 2026-01-08

pkgconfig file from upstream

    - Use pkgconfig file cups.pc from upstream and not Debian's own file
      of CUPS' pre-pkgconfig era. also use
      "--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" in the
      "./configure" command line therefore.

9bcd5a3... by John Chittum on 2026-01-08

d/rules --enable-snapped-clients

    - Added "--enable-snapped-clients" to the "./configure" options to use
      the correct Snap mediation mode for an unsnapped cupsd, like provided
      by this package.

f430ac3... by John Chittum on 2026-01-08

d/rules --with-tls=gnutls

    - In debian/rules updated "./configure" arguments from "--enable-gnutls" to
      "--with-tls=gnutls". Now libcups has support for all hash types again,
      especially can provide sha2-256 to PAPPL.

diff --git a/debian/changelog b/debian/changelog
index a214a89..92f402b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+cups (2.4.16-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. (LP: #2130070) Remaining changes:
+    - d/p/9100-ppd-cache-add-auto-presets.patch
+      Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, not (yet) upstream in CUPS).
+    - d/libcups2-dev.install, d/rules
+      Use pkgconfig file cups.pc from upstream and not Debian's own file
+      of CUPS' pre-pkgconfig era. also use
+      "--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" in the
+      "./configure" command line therefore.
+    - d/local/apparmor-profile
+      + In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+        to allow cupsd to determine which interfaces a snapped client
+        is plugging.
+      + update for new coreutil paths (LP #2123870)
+      + add rule for accessing /etc/paperspecs (LP #2125520)
+    - d/control
+      + Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+        Snap mediation.
+      + In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+    - d/rules
+      + Added "--enable-snapped-clients" to the "./configure" options to use
+        the correct Snap mediation mode for an unsnapped cupsd, like provided
+        by this package.
+      + In debian/rules updated ./configure arguments from --enable-gnutls to
+        --with-tls=gnutls. Now libcups has support for all hash types again,
+        especially can provide sha2-256 to PAPPL.
+  * Dropped Changes
+    - d/p/CVE-2025-58060.patch : patched in upstream version
+    - d/p/CVE-2025-58364.patch : patched in upstream version
+    - d/p/CVE-2025-61915.patch : patched in upstream version
+    - d/rules
+      + --with-system-groups='lpadmin root'. This was included in Debian 2.4.1op1-2
+        as ='root lpadmin', somehow dropped and inverted in Ubuntu.
+
+ -- John Chittum <[e-mail]>  Fri, 05 Dec 2025 12:59:59 -0500
+
 cups (2.4.16-1) unstable; urgency=medium
 
   * Update to new upstream version 2.4.16.
@@ -27,6 +69,69 @@ cups (2.4.14-1) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Sat, 04 Oct 2025 12:26:19 +0200
 
+cups (2.4.12-0ubuntu4) resolute; urgency=medium
+
+  * SECURITY UPDATE: Local denial-of-service via cupsd.conf update and
+    related issues
+    - debian/patches/CVE-2025-61915.patch: fix various issues in cupsd in
+      conf/cups-files.conf.in, config-scripts/cups-defaults.m4,
+      config.h.in, configure, doc/help/man-cups-files.conf.html,
+      man/cups-files.conf.5, scheduler/auth.c, scheduler/auth.h,
+      scheduler/client.c, scheduler/conf.c, test/run-stp-tests.sh,
+      vcnet/config.h, xcode/CUPS.xcodeproj/project.pbxproj, xcode/config.h.
+    - CVE-2025-61915
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 01 Dec 2025 09:15:47 -0500
+
+cups (2.4.12-0ubuntu3) questing; urgency=medium
+
+  * debian/local/apparmor-profile:
+    - Update for new coreutil paths (LP: #2123870)
+    - Add rule for accessing /etc/paperspecs (LP: #2125520)
+
+ -- Ryan Lee <[e-mail]>  Mon, 22 Sep 2025 16:44:55 -0700
+
+cups (2.4.12-0ubuntu2) questing; urgency=medium
+
+  * SECURITY UPDATE: authorization bypass
+    - d/p/CVE-2025-58060.patch: only allow basic and kerberos authentication
+      if it is enabled.
+    - CVE-2025-58060
+  * SECURITY UPDATE: remote DoS
+    - d/p/CVE-2025-58364.patch: fix null dereference in ipp_read_io().
+    - CVE-2025-58364
+
+ -- Eduardo Barretto <[e-mail]>  Fri, 05 Sep 2025 17:13:12 +0200
+
+cups (2.4.12-0ubuntu1) plucky; urgency=medium
+
+  * New upstream bug fix release 2.4.12
+    - Another half year worth of bug fixes ...
+    - Last 2.4.x upstream release.
+  * Refreshed patches.
+
+ -- Till Kamppeter <[e-mail]>  Tue, 08 Apr 2025 13:27:28 +0200
+
+cups (2.4.11-0ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for libpaper.
+
+ -- Sudip Mukherjee <[e-mail]>  Sun, 22 Dec 2024 11:02:49 +0000
+
+cups (2.4.11-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release 2.4.11
+    - Includes fix for CVE-2024-47175
+    - In both plucky and oracular the build test ("make check") fails
+      for CUPS 2.4.10, cupsd instance on port 8631 not starting up, 2.4.11
+      fixes this somehow, most probably this is upstream issue #989.
+  * Drop 0014-CVE-2024-47175-and-further-hardening.patch, included
+    upstream
+  * Add the new /usr/lib/systemd/system/system-cups.slice file to
+    cups-daemon.install
+
+ -- Till Kamppeter <[e-mail]>  Mon, 25 Nov 2024 20:34:33 +0100
+
 cups (2.4.10-4) unstable; urgency=medium
 
   * CVE-2025-58060
@@ -43,6 +148,37 @@ cups (2.4.10-3) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Sun, 01 Jun 2025 13:45:05 +0200
 
+cups (2.4.10-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089041). Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - Use also "--with-system-groups='lpadmin root'" in "./configure" command
+      line.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - In debian/rules updated "./configure" arguments from "--enable-gnutls" to
+      "--with-tls=gnutls". Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - Use pkgconfig file cups.pc from upstream and not Debian's own file
+      of CUPS' pre-pkgconfig era. also use
+      "--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" in the
+      "./configure" command line therefore.
+  * In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+  * CVE-2024-35235.patch: Removed, included upstream. (Closes: #1087849)
+
+ -- Alessandro Astone <[e-mail]>  Tue, 19 Nov 2024 16:20:03 +0100
+
 cups (2.4.10-2) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
@@ -60,6 +196,59 @@ cups (2.4.10-2) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Thu, 26 Sep 2024 23:45:05 +0200
 
+cups (2.4.10-1ubuntu2) oracular; urgency=medium
+
+  * SECURITY UPDATE: PPD injection issues (LP: #2082335)
+    - debian/patches/sec-202409-1.patch: validate URIs, attribute names,
+      and capabilities in cups/ppd-cache.c, scheduler/ipp.c.
+    - debian/patches/sec-202409-2.patch: sanitize make and model in
+      cups/ppd-cache.c.
+    - debian/patches/sec-202409-3.patch: PPDize preset and template names
+      in cups/ppd-cache.c.
+    - debian/patches/sec-202409-4.patch: quote PPD localized strings in
+      cups/ppd-cache.c.
+    - debian/patches/sec-202409-5.patch: fix warnings in cups/ppd-cache.c.
+    - CVE-2024-47175
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 26 Sep 2024 07:14:15 -0400
+
+cups (2.4.10-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - Use also "--with-system-groups='lpadmin root'" in "./configure" command
+      line.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - In debian/rules updated "./configure" arguments from "--enable-gnutls" to
+      "--with-tls=gnutls". Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - Use pkgconfig file cups.pc from upstream and not Debian's own file
+      of CUPS' pre-pkgconfig era. also use
+      "--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig" in the
+      "./configure" command line therefore.
+    - In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+  * 9100-ppd-cache-add-auto-presets.patch: Updated with quilt.
+  * 9110-delay-creating-driverless-printer-until-ppd-generated.patch,
+    9120-longer-timeout-for-avahi-resolving-for-cupsgetdests.patch,
+    9130-fix-document-unprintable-error-handling.patch,
+    CVE-2024-35235.patch,
+    fix-scheduler-start-if-only-domain-socket-to-listen.patch: Removed,
+    included upstream.
+
+ -- Till Kamppeter <[e-mail]>  Mon, 12 Aug 2024 15:49:30 +0200
+
 cups (2.4.10-1) unstable; urgency=medium
 
   * Update to new upstream version 2.4.10.
@@ -90,6 +279,144 @@ cups (2.4.7-2) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Tue, 11 Jun 2024 22:16:49 +0200
 
+cups (2.4.7-1.2ubuntu9) oracular; urgency=medium
+
+  * SECURITY REGRESSION: early exit on missing listen directive
+    - d/p/fix-scheduler-start-if-only-domain-socket-to-listen.patch: don't
+      exit if no valid Listen or Port found (LP: #2070315) 
+
+ -- Sudhakar Verma <[e-mail]>  Tue, 02 Jul 2024 17:37:44 +0530
+
+cups (2.4.7-1.2ubuntu8) oracular; urgency=medium
+
+  * SECURITY UPDATE: cupsd listen arbitrary chmod 0140777
+    - debian/patches/CVE-2024-35235.patch: validate status of unlink and bind
+      in cups/http-addr.c
+    - CVE-2024-35235 
+
+ -- Sudhakar Verma <[e-mail]>  Fri, 21 Jun 2024 15:57:06 +0530
+
+cups (2.4.7-1.2ubuntu7) noble; urgency=low
+
+  * Another fix for crash caused by the fix of the background polling of
+    printer capability information in ...ubuntu4. Added also commit 6aeb03b
+    from 2.4.x GIT branch to the patch (LP: #2060692, Upstream issue #934,
+    pull request #935).
+
+ -- Till Kamppeter <[e-mail]>  Fri, 12 Apr 2024 22:13:19 +0200
+
+cups (2.4.7-1.2ubuntu6) noble; urgency=low
+
+  * Fix crash caused by the fix of the background polling of printer
+    capability information in ...ubuntu4. Added commit 2e65a35 from 2.4.x
+    GIT branch to the patch (LP: #2060692, Upstream issue #934, pull
+    request #937).
+  * Backported upstream commits 939368f from 2.4.x GIT branch, to
+    fix the auto-repeating of a job in Raster mode when failed printing
+    in PDF mode, due to printer-internal bug/incompatibility (Upstream
+    issue #391).
+
+ -- Till Kamppeter <[e-mail]>  Thu, 11 Apr 2024 23:23:19 +0200
+
+cups (2.4.7-1.2ubuntu5) noble; urgency=low
+
+  * Longer timeout for Avahi resolving for cupsGetDests() API function, used
+    by "lpstat -l -e" (Upstream issues #47, #751, fix is already in place
+    in the CUPS Snap).
+
+ -- Till Kamppeter <[e-mail]>  Sat,  6 Apr 2024 00:05:19 +0200
+
+cups (2.4.7-1.2ubuntu4) noble; urgency=low
+
+  * Backported upstream commits 6c6e1b0, ff16dab, and df3718b from 2.4.x GIT
+    branch, to
+    - Fix race condition due to removal of temporary queue while still accessing
+      it. Now timeout clock is reset on every access, temporary queues not
+      created if there is a permanent queue to the same printer, temporary queues
+      expire after 5 min instead of 1 min (Upstream issue #871).
+    - Fix temporary queue appearing as raw queue while CUPS is still polling
+      the capability information from the printer. This breaks print dialogs and
+      printing itself. Now queue creation is deleayed until the PPD is ready
+      (Upstream issue #347).
+
+ -- Till Kamppeter <[e-mail]>  Fri,  5 Apr 2024 22:48:19 +0200
+
+cups (2.4.7-1.2ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 07:31:09 +0000
+
+cups (2.4.7-1.2ubuntu2) noble; urgency=low
+
+  * Remove Debian's own (broken) cups.pc file, CUPS has it upstreanm from
+    2.4.6 on (LP: #2059157).
+
+ -- Till Kamppeter <[e-mail]>  Tue, 26 Mar 2024 23:17:19 +0100
+
+cups (2.4.7-1.2ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - In debian/rules updated ./configure arguments from --enable-gnutls to
+      --with-tls=gnutls. Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+
+ -- Till Kamppeter <[e-mail]>  Tue, 19 Mar 2024 10:46:19 +0100
+
+cups (2.4.7-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Wed, 28 Feb 2024 23:20:02 +0000
+
+cups (2.4.7-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libgnutls30t64
+
+ -- Steve Langasek <[e-mail]>  Sun, 10 Mar 2024 02:03:25 +0000
+
+cups (2.4.7-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - In debian/rules updated ./configure arguments from --enable-gnutls to
+      --with-tls=gnutls. Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+  * Removed patches included upstream:
+    - CVE-2023-4504.patch
+
+ -- Till Kamppeter <[e-mail]>  Wed, 28 Feb 2024 20:07:19 +0100
+
 cups (2.4.7-1) unstable; urgency=medium
 
   * Update to new upstream version 2.4.7.
@@ -114,6 +441,78 @@ cups (2.4.7-1) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Fri, 06 Oct 2023 20:16:49 +0200
 
+cups (2.4.6-0ubuntu3) mantic; urgency=medium
+
+  * Let pkg-config data file cups.pc get installed into
+    /usr/lib/<ARCH>/pkgconfig/
+  * Include pkg-config data file cups.pc in libcups2-dev
+
+ -- Till Kamppeter <[e-mail]>  Tue, 26 Sep 2023 14:56:43 +0200
+
+cups (2.4.6-0ubuntu2) mantic; urgency=medium
+
+  * SECURITY UPDATE: Postscript parsing heap overflow
+    - debian/patches/CVE-2023-4504.patch: properly check for end of buffer
+      in cups/raster-interpret.c.
+    - CVE-2023-4504
+
+ -- Marc Deslauriers <[e-mail]>  Wed, 20 Sep 2023 12:42:21 -0400
+
+cups (2.4.6-0ubuntu1) mantic; urgency=medium
+
+  * Update to new upstream version 2.4.6.
+    - Fix printing multiple files on specific printers (Upstream issue #643)
+
+ -- Till Kamppeter <[e-mail]>  Wed, 16 Aug 2023 21:53:43 +0200
+
+cups (2.4.5-0ubuntu2) mantic; urgency=medium
+
+  * SECURITY UPDATE: use-after-free in cupsdAcceptClient()
+    - debian/patches/CVE-2023-34241.patch: log result of httpGetHostname
+      BEFORE closing the connection in scheduler/client.c.
+    - CVE-2023-34241
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 22 Jun 2023 12:06:19 -0400
+
+cups (2.4.5-0ubuntu1) mantic; urgency=medium
+
+  * Update to new upstream version 2.4.5.
+    - Fixes color printing on printers with "CMYK" choice instead of "RGB"
+      in "ColorModel" option of their PPD (Upstream issues #451 and #500,
+      LP: 1971242).
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - In debian/rules updated ./configure arguments from --enable-gnutls to
+      --with-tls=gnutls. Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - When polling capabilities of a driverless printer via
+      get-printer-attributes IPP request, do a separate poll of the
+      media-col-database attribute in case it did not get obtained by the
+      first polls.
+    - In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+  * Manually refreshed patch 9100-ppd-cache-add-auto-presets.patch.
+  * Removed patches included upstream:
+    - 9110-create-local-printer-localhost-fix.patch
+    - CVE-2022-26691-2.patch
+    - snapd-glib-2.patch
+    - poll-media-col-database-separately.patch
+    - CVE-2023-32324.patch
+
+ -- Till Kamppeter <[e-mail]>  Wed, 14 Jun 2023 15:38:00 +0200
+
 cups (2.4.2-6) unstable; urgency=medium
 
   * CVE-2023-4504
@@ -138,6 +537,56 @@ cups (2.4.2-4) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Wed, 31 May 2023 21:30:27 +0200
 
+cups (2.4.2-3ubuntu3) mantic; urgency=medium
+
+  * SECURITY UPDATE: DoS via buffer overflow in format_log_line
+    - debian/patches/CVE-2023-32324.patch: check _cups_strlcpy size in
+      cups/string.c.
+    - CVE-2023-32324
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 25 May 2023 08:37:20 -0400
+
+cups (2.4.2-3ubuntu2) lunar; urgency=low
+
+  * In libcupsimage2 recommend libcupsfilters2 instead of libcupsfilters1.
+
+ -- Till Kamppeter <[e-mail]>  Mon, 27 Mar 2023 23:12:00 +0200
+
+cups (2.4.2-3ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - Fixed printing on temporary CUPS queues for local services, like
+      IPP-over-USB or Printer Applications. Especially when printing from
+      the GTK print dialog printing on such queues did not work (Upstream
+      pull request #353, LP: #1965112).
+    - Comment in CVE-2022-26691 patch fixed.
+    - In debian/rules updated ./configure arguments from --enable-gnutls to
+      --with-tls=gnutls. Now libcups has support for all hash types again,
+      especially can provide sha2-256 to PAPPL.
+    - When polling capabilities of a driverless printer via
+      get-printer-attributes IPP request, do a separate poll of the
+      media-col-database attribute in case it did not get obtained by the
+      first polls.
+    - Patch to build with snapd-glib-2
+  * Refreshed patches 9100-ppd-cache-add-auto-presets.patch and
+    9110-create-local-printer-localhost-fix.patch with quilt.
+
+ -- Till Kamppeter <[e-mail]>  Sun, 26 Mar 2023 21:01:00 +0200
+
 cups (2.4.2-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
@@ -165,6 +614,54 @@ cups (2.4.2-2) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Sun, 26 Feb 2023 12:54:05 +0100
 
+cups (2.4.2-1ubuntu4) lunar; urgency=medium
+
+  * In debian/rules updated ./configure arguments from --enable-gnutls to
+    --with-tls=gnutls. Now libcups has support for all hash types again,
+    especially can provide sha2-256 to PAPPL.
+
+ -- Till Kamppeter <[e-mail]>  Wed,  8 Feb 2023 00:07:31 +0100
+
+cups (2.4.2-1ubuntu3) kinetic; urgency=medium
+
+  * When polling capabilities of a driverless printer via
+    get-printer-attributes IPP request, do a separate poll
+    of the media-col-database attribute in case it did not
+    get obtained by the first polls.
+
+ -- Till Kamppeter <[e-mail]>  Sat, 21 Jan 2023 14:27:31 -0300
+
+cups (2.4.2-1ubuntu2) kinetic; urgency=medium
+
+  * Add patch to build with snapd-glib-2
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 25 Aug 2022 21:54:33 -0400
+
+cups (2.4.2-1ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+    - Fixed printing on temporary CUPS queues for local services, like
+      IPP-over-USB or Printer Applications. Especially when printing from
+      the GTK print dialog printing on such queues did not work (Upstream
+      pull request #353, LP: #1965112).
+    - Comment in CVE-2022-26691 patch fixed.
+
+ -- Till Kamppeter <[e-mail]>  Mon, 06 Jun 2022 20:20:31 +0200
+
 cups (2.4.2-1) unstable; urgency=medium
 
   * Update to new upstream version 2.4.2.
@@ -183,6 +680,67 @@ cups (2.4.1op1-2) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Mon, 07 Mar 2022 22:08:09 +0100
 
+cups (2.4.1op1-1ubuntu5) kinetic; urgency=medium
+
+  * SECURITY UPDATE: Local authorization cert bypass
+    - debian/patches/CVE-2022-26691-1.patch: fix string comparison in
+      scheduler/cert.c.
+    - debian/patches/CVE-2022-26691-2.patch: fix the comment in
+      scheduler/cert.c.
+    - CVE-2022-26691
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 27 May 2022 07:53:01 -0400
+
+cups (2.4.1op1-1ubuntu4) jammy; urgency=low
+
+  * Fixed PPD file auto-generation when a print queue is created with
+    a DNS-SD-service-name-based URI and "-m everywhere" backporting the
+    fix from upstream (Upstream issue #340, #343).
+
+ -- Till Kamppeter <[e-mail]>  Sat, 19 Mar 2022 00:07:00 +0100
+
+cups (2.4.1op1-1ubuntu3) jammy; urgency=low
+
+  * Fixed crasher in the patch for temporary queues for local services
+    in the previous release. Updated the patch and the upstream pull
+    request (LP: #1965112, Upstream pull request #353).
+
+ -- Till Kamppeter <[e-mail]>  Wed, 16 Mar 2022 18:24:08 +0100
+
+cups (2.4.1op1-1ubuntu2) jammy; urgency=low
+
+  * Fixed printing on temporary CUPS queues for local services, like
+    IPP-over-USB or Printer Applications. Especially when printing from
+    the GTK print dialog printing on such queues did not work (Upstream
+    pull request #353).
+
+ -- Till Kamppeter <[e-mail]>  Mon, 14 Mar 2022 09:13:08 +0100
+
+cups (2.4.1op1-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added "--enable-snapped-clients" to the "./configure" options to use
+      the correct Snap mediation mode for an unsnapped cupsd, like provided
+      by this package.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+    - In the AppArmor profile allow CUPS to access (/var)/run/snapd.socket
+      to allow cupsd to determine which interfaces a snapped client
+      is plugging.
+    - Build-depend on libapparmor-dev, libsnapd-glib-dev, needed for
+      Snap mediation.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+  * Updated 9100-ppd-cache-add-auto-presets.patch
+
+ -- Till Kamppeter <[e-mail]>  Tue, 22 Feb 2022 12:28:08 +0100
+
 cups (2.4.1op1-1) unstable; urgency=medium
 
   * new upstream release
@@ -196,6 +754,40 @@ cups (2.4.1op1-1) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Sun, 20 Feb 2022 20:08:09 +0100
 
+cups (2.3.3op2-7ubuntu2) impish; urgency=low
+
+  * Updated patch for auto-generation of PPD presets to patch proposed
+    upstream (Upstream pull request #236) due to added PPD options taken into
+    account.
+
+ -- Till Kamppeter <[e-mail]>  Fri, 10 Sep 2021 19:20:00 +0200
+
+cups (2.3.3op2-7ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) reach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+    - Added "--enable-snapped-clients"
+      to the "./configure" options to use the correct checking mode for an
+      unsnapped cupsd, like provided by this package.
+    - Added fully automatic generation of PPD option setting presets to
+      be applied depending on the settings of the job IPP attributes
+      "print-color-mode", "print-quality", and "print-content-optimize".
+      This allows easy control of any printer with only standard IPP
+      attributes, as for example from a phone (functionality overtaken
+      from cups-filters, mot (yet) upstream in CUPS).
+  * Updated patch for auto-generation of PPD presets to patch proposed
+    upstream (Upstream pull request #236).
+
+ -- Till Kamppeter <[e-mail]>  Mon, 06 Sep 2021 21:26:41 +0200
+
 cups (2.3.3op2-7) unstable; urgency=medium
 
   [ Didier Raboud ]
@@ -215,6 +807,30 @@ cups (2.3.3op2-6) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Tue, 24 Aug 2021 15:38:05 +0200
 
+cups (2.3.3op2-5ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) reach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+    - Added "--enable-snapped-clients"
+      to the "./configure" options to use the correct checking mode for an
+      unsnapped cupsd, like provided by this package.
+  * Added fully automatic generation of PPD option setting presets to
+    be applied depending on the settings of the job IPP attributes
+    "print-color-mode", "print-quality", and "print-content-optimize".
+    This allows easy control of any printer with only standard IPP
+    attributes, as for example from a phone (functionality overtaken
+    from cups-filters, mot (yet) upstream in CUPS).
+
+ -- Till Kamppeter <[e-mail]>  Tue, 17 Aug 2021 23:47:41 +0200
+
 cups (2.3.3op2-5) experimental; urgency=low
 
   * Backport 2 upstream USB backend fixes:
@@ -244,6 +860,45 @@ cups (2.3.3op2-3+deb11u1) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Thu, 27 May 2021 08:49:36 +0200
 
+cups (2.3.3op2-3ubuntu3) hirsute; urgency=low
+
+  * Updated AppArmor profile entries for CUPS accessing snapd to
+    check whether a client is a Snap and which interfaces it plugs to.
+
+ -- Till Kamppeter <[e-mail]>  Fri, 19 Mar 2021 18:26:41 +0100
+
+cups (2.3.3op2-3ubuntu2) hirsute; urgency=low
+
+  * Replaced patch for extra checking of admin requests from snapped
+    clients by the current upstream code. Added "--enable-snapped-clients"
+    to the "./configure" options to use the correct checking mode for an
+    unsnapped cupsd, like provided by this package.
+
+ -- Till Kamppeter <[e-mail]>  Fri, 19 Mar 2021 16:32:41 +0100
+
+cups (2.3.3op2-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) reach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+  * Clean up "Build-Depends:" to be in sync with Debian (delta overlooked
+    for near a decade when cups-filters was introduced in 2012), removing
+    the unneeded entries: ghostscript, libavahi-compat-libdnssd-dev,
+    libfontconfig1-dev, libfreetype6-dev, libijs-dev, libjpeg-dev,
+    libldap2-dev, libpng-dev, libtiff-dev, poppler-utils, sharutils
+  * Removed the changes on the machine-generated "configure" file in the
+    patch for checking snapped clients, the changes easily mis-match on
+    updates and we run "autoconf" in debian/rules anyway.
+
+ -- Till Kamppeter <[e-mail]>  Fri, 12 Feb 2021 20:44:41 +0100
+
 cups (2.3.3op2-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
@@ -290,6 +945,23 @@ cups (2.3.3op1-6) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Mon, 11 Jan 2021 08:31:58 +0100
 
+cups (2.3.3op1-5ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) reach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+  * In the AppArmor profile allow cupsd to write to /run/systemd/notify
+    to notify that it is up and running (systemd service type "notify").
+
+ -- Till Kamppeter <[e-mail]>  Fri, 08 Jan 2021 19:07:00 +0100
+
 cups (2.3.3op1-5) unstable; urgency=medium
 
   * Update Homepage and Source fields to point
@@ -305,6 +977,21 @@ cups (2.3.3op1-4) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Wed, 23 Dec 2020 14:53:09 +0100
 
+cups (2.3.3op1-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) rach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+    - Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+      default, as CUPS always worked this way but the new patch for
+      supporting the "cups-control" interface of Snaps does not allow
+      implicit permission to everything for root any more.
+
+ -- Till Kamppeter <[e-mail]>  Fri, 14 Dec 2020 12:47:34 +0100
+
 cups (2.3.3op1-3) unstable; urgency=medium
 
   [ Helge Kreutzmann ]
@@ -359,6 +1046,21 @@ cups (2.3.3-4) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Tue, 24 Nov 2020 08:49:46 +0100
 
+cups (2.3.3-3ubuntu1) groovy; urgency=medium
+
+  * Merged with Debian unstable. Remaining changes:
+    - Added extra checking when administrative requests (create queue,
+      remove someone else's job, ...) rach cupsd. If the client is a Snap,
+      it has to plug the cups-control interface to be allowed to do the
+      task. Added libapparmor-dev and libsnapd-glib-dev to the build
+      dependencies. Also added needed permissions to AppArmor profile.
+  * Build CUPS with "SystemGroup lpadmin root" in cups-files.conf by
+    defualt, as CUPS always worked this way but the new patch for
+    supporting the "cups-control" interface of Snaps does not allow
+    implicit permission to everything for root any more.
+
+ -- Till Kamppeter <[e-mail]>  Fri,  4 Sep 2020 19:00:00 +0200
+
 cups (2.3.3-3) unstable; urgency=medium
 
   [ Didier Raboud ]
@@ -379,6 +1081,51 @@ cups (2.3.3-3) unstable; urgency=medium
 
  -- Didier Raboud <[e-mail]>  Thu, 03 Sep 2020 09:27:04 +0200
 
+cups (2.3.3-2ubuntu5) groovy; urgency=medium
+
+  * In all autopkgtests modify set "LogLevel debug2" in cupsd.conf and
+    "SystemGroup lpadmin root" in cups-files.conf and restart cupsd,
+    the former change to more easily find out what failed and the latter
+    as the default configuration did not allow root to create queues,
+    making all tests fail.
+
+ -- Till Kamppeter <[e-mail]>  Thu, 27 Aug 2020 23:18:00 +0200
+
+cups (2.3.3-2ubuntu4) groovy; urgency=medium
+
+  * Let the rastertopwg filter check rounding errors when calculating the
+    page geometry.
+
+ -- Till Kamppeter <[e-mail]>  Wed, 27 Aug 2020 10:22:00 +0200
+
+cups (2.3.3-2ubuntu3) groovy; urgency=medium
+
+  * Do not choke if the GTK dialog sends "None" as phone number or pre-dial
+    prefix.
+
+ -- Till Kamppeter <[e-mail]>  Wed, 26 Aug 2020 22:33:00 +0200
+
+cups (2.3.3-2ubuntu2) groovy; urgency=medium
+
+  * Fix fax numbers supplied via GTK print dialog, removing a "Custom."
+    prefix.
+
+ -- Till Kamppeter <[e-mail]>  Wed, 26 Aug 2020 13:03:00 +0200
+
+cups (2.3.3-2ubuntu1) groovy; urgency=medium
+
+  * Added extra checking when administrative requests (create queue,
+    remove someone else's job, ...) rach cupsd. If the client is a Snap,
+    it has to plug the cups-control interface to be allowed to do the
+    task. Added libapparmor-dev and libsnapd-glib-dev to the build
+    dependencies. Also added needed permissions to AppArmor profile.
+  * Resolve DNS-SD-service-name-based URIs correctly also if they are from
+    a service from localhost (like IPP-over-USB, Printer Application, ...)
+  * Make lpoptions list a printer's options correctly also when CUPS is
+    running on an alternative port.
+
+ -- Till Kamppeter <[e-mail]>  Tue, 25 Aug 2020 21:34:00 +0200
+
 cups (2.3.3-2) unstable; urgency=medium
 
   * Add missing dh-strip-nondeterminism B-D
@@ -8932,3 +9679,4 @@ cupsys (1.0.1-1) unstable; urgency=low
   * Initial Release.
 
  -- Jeff Licquia <[e-mail]>  Sat, 06 Nov 1999 20:58:02 -0500
+
diff --git a/debian/control b/debian/control
index 1c295cb..27ce386 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: cups
-Maintainer: Debian Printing Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Printing Team <[e-mail]>
 Uploaders:
  Till Kamppeter <[e-mail]>,
  Thorsten Alteholz <[e-mail]>,
@@ -26,6 +27,8 @@ Build-Depends: dpkg-dev (>= 1.22.5),
  po-debconf,
  po4a,
  zlib1g-dev,
+ libapparmor-dev,
+ libsnapd-glib-dev (>= 1.61),
 Build-Depends-Arch: dpkg-dev (>= 1.22.5),
  dh-apparmor,
 # libgmp-dev is not GPL-2 compatible before it's 6 release, which makes it also GPL-2+
@@ -322,7 +325,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- libcupsfilters1,
+ libcupsfilters2,
 Pre-Depends:
  ${misc:Pre-Depends},
 Description: Common UNIX Printing System(tm) - Raster image library
diff --git a/debian/cups.pc.in b/debian/cups.pc.in
deleted file mode 100644
index 4fa0733..0000000
--- a/debian/cups.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: cups
-Description: cups application integration library
-URL: https://www.cups.org/
-Version: @DEB_VERSION_UPSTREAM@
-Cflags:
-Libs: -lcups
-Libs.private:
diff --git a/debian/libcups2-dev.install b/debian/libcups2-dev.install
index 4499457..5a27b61 100644
--- a/debian/libcups2-dev.install
+++ b/debian/libcups2-dev.install
@@ -17,3 +17,4 @@ usr/include/cups/transcode.h
 usr/include/cups/versioning.h
 usr/lib/*/libcups.a
 usr/lib/*/libcups.so
+usr/lib/*/pkgconfig/cups.pc
diff --git a/debian/local/apparmor-profile b/debian/local/apparmor-profile
index 947cbd8..7698725 100644
--- a/debian/local/apparmor-profile
+++ b/debian/local/apparmor-profile
@@ -47,6 +47,10 @@
   network econet dgram,
   network ash dgram,
 
+  # To allow cupsd to determine which interfaces a snapped client
+  # is plugging
+  /{,var/}run/snapd.socket rw,
+
   # CUPS is of systemd service type "notify" now, meaning that cupsd notifies
   # systemd when it is up and running, give CUPS access to systemd's
   # notification socket
@@ -81,9 +85,7 @@
   @{PROC}/*/auxv r,
   @{PROC}/sys/crypto/** r,
   /sys/** r,
-  /usr/bin/* ixr,
-  /usr/sbin/* ixr,
-  /{usr/,}bin/* ixr,
+  @{coreutil_dirs}* ixr,
   /{usr/,}sbin/* ixr,
   /usr/lib/** rm,
 
@@ -202,8 +204,9 @@
 
   /{usr/,}bin/dash ixr,
   /{usr/,}bin/bash ixr,
-  /{usr/,}bin/cp ixr,
+  @{coreutil_dirs}cp ixr,
   /etc/papersize r,
+  /etc/paperspecs r,
   /etc/cups/cups-pdf.conf r,
   /etc/cups/ppd/*.ppd r,
   /usr/bin/gs ixr,
diff --git a/debian/patches/9100-ppd-cache-add-auto-presets.patch b/debian/patches/9100-ppd-cache-add-auto-presets.patch
new file mode 100644
index 0000000..6c150ff
--- /dev/null
+++ b/debian/patches/9100-ppd-cache-add-auto-presets.patch
@@ -0,0 +1,1526 @@
+--- a/cups/ppd-cache.c
++++ b/cups/ppd-cache.c
+@@ -505,6 +505,8 @@
+   _pwg_print_color_mode_t print_color_mode;
+ 					/* Print color mode for preset */
+   _pwg_print_quality_t print_quality;	/* Print quality for preset */
++  _pwg_print_content_optimize_t print_content_optimize;
++                                        /* Content optimize for preset */
+ 
+ 
+   DEBUG_printf(("_ppdCacheCreateWithFile(filename=\"%s\")", filename));
+@@ -930,6 +932,28 @@
+           cupsParseOptions(valueptr, 0,
+ 	                   pc->presets[print_color_mode] + print_quality);
+     }
++    else if (!_cups_strcasecmp(line, "OptimizePreset"))
++    {
++     /*
++      * Preset print_content_optimize name=value ...
++      */
++
++      print_content_optimize = (_pwg_print_content_optimize_t)strtol(value, &valueptr, 10);
++
++      if (print_content_optimize < _PWG_PRINT_CONTENT_OPTIMIZE_AUTO ||
++          print_content_optimize >= _PWG_PRINT_CONTENT_OPTIMIZE_MAX ||
++	  valueptr == value || !*valueptr)
++      {
++        DEBUG_printf(("ppdCacheCreateWithFile: Bad Optimize Preset on line %d.",
++	              linenum));
++	_cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad PPD cache file."), 1);
++	goto create_error;
++      }
++
++      pc->num_optimize_presets[print_content_optimize] =
++          cupsParseOptions(valueptr, 0,
++	                   pc->optimize_presets + print_content_optimize);
++    }
+     else if (!_cups_strcasecmp(line, "SidesOption"))
+       pc->sides_option = strdup(value);
+     else if (!_cups_strcasecmp(line, "Sides1Sided"))
+@@ -1057,6 +1081,7 @@
+ 			*ppd_option;	/* Other PPD option */
+   ppd_choice_t		*choice;	/* Current InputSlot/MediaType */
+   pwg_map_t		*map;		/* Current source/type map */
++  int                   preset_added = 0; /* Preset definition found in PPD? */
+   ppd_attr_t		*ppd_attr;	/* Current PPD preset attribute */
+   int			num_options;	/* Number of preset options and props */
+   cups_option_t		*options;	/* Preset options and properties */
+@@ -1534,6 +1559,10 @@
+   if ((ppd_attr = ppdFindAttr(ppd, "APPrinterPreset", NULL)) != NULL)
+   {
+    /*
++    * "Classic" Mac OS approach
++    */
++
++   /*
+     * Copy and convert APPrinterPreset (output-mode + print-quality) data...
+     */
+ 
+@@ -1633,114 +1662,133 @@
+ 	      _ppdParseOptions(ppd_attr->value, 0,
+ 	                       pc->presets[pwg_print_color_mode] +
+ 			           pwg_print_quality, _PPD_PARSE_OPTIONS);
++	preset_added = 1;
+       }
+ 
+       cupsFreeOptions(num_options, options);
+     }
+     while ((ppd_attr = ppdFindNextAttr(ppd, "APPrinterPreset", NULL)) != NULL);
+-  }
+ 
+-  if (!pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_DRAFT] &&
+-      !pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_NORMAL] &&
+-      !pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_HIGH])
+-  {
+-   /*
+-    * Try adding some common color options to create grayscale presets.  These
+-    * are listed in order of popularity...
+-    */
+-
+-    const char	*color_option = NULL,	/* Color control option */
+-		*gray_choice = NULL;	/* Choice to select grayscale */
+-
+-    if ((color_model = ppdFindOption(ppd, "ColorModel")) != NULL &&
+-        ppdFindChoice(color_model, "Gray"))
+-    {
+-      color_option = "ColorModel";
+-      gray_choice  = "Gray";
+-    }
+-    else if ((color_model = ppdFindOption(ppd, "HPColorMode")) != NULL &&
+-             ppdFindChoice(color_model, "grayscale"))
+-    {
+-      color_option = "HPColorMode";
+-      gray_choice  = "grayscale";
+-    }
+-    else if ((color_model = ppdFindOption(ppd, "BRMonoColor")) != NULL &&
+-             ppdFindChoice(color_model, "Mono"))
+-    {
+-      color_option = "BRMonoColor";
+-      gray_choice  = "Mono";
+-    }
+-    else if ((color_model = ppdFindOption(ppd, "CNIJSGrayScale")) != NULL &&
+-             ppdFindChoice(color_model, "1"))
+-    {
+-      color_option = "CNIJSGrayScale";
+-      gray_choice  = "1";
+-    }
+-    else if ((color_model = ppdFindOption(ppd, "HPColorAsGray")) != NULL &&
+-             ppdFindChoice(color_model, "True"))
+-    {
+-      color_option = "HPColorAsGray";
+-      gray_choice  = "True";
+-    }
+-
+-    if (color_option && gray_choice)
++    if (preset_added &&
++	!pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_DRAFT] &&
++	!pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_NORMAL] &&
++	!pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][_PWG_PRINT_QUALITY_HIGH])
+     {
+      /*
+-      * Copy and convert ColorModel (output-mode) data...
++      * Try adding some common color options to create grayscale presets. These
++      * are listed in order of popularity...
+       */
+ 
+-      cups_option_t	*coption,	/* Color option */
+-			  *moption;	/* Monochrome option */
++      const char	*color_option = NULL,	/* Color control option */
++	                *gray_choice = NULL;	/* Choice to select grayscale */
+ 
+-      for (pwg_print_quality = _PWG_PRINT_QUALITY_DRAFT;
+-	   pwg_print_quality < _PWG_PRINT_QUALITY_MAX;
+-	   pwg_print_quality ++)
++      if ((color_model = ppdFindOption(ppd, "ColorModel")) != NULL &&
++	  ppdFindChoice(color_model, "Gray"))
+       {
+-	if (pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR][pwg_print_quality])
+-	{
+-	 /*
+-	  * Copy the color options...
+-	  */
++	color_option = "ColorModel";
++	gray_choice  = "Gray";
++      }
++      else if ((color_model = ppdFindOption(ppd, "HPColorMode")) != NULL &&
++	       ppdFindChoice(color_model, "grayscale"))
++      {
++	color_option = "HPColorMode";
++	gray_choice  = "grayscale";
++      }
++      else if ((color_model = ppdFindOption(ppd, "BRMonoColor")) != NULL &&
++	       ppdFindChoice(color_model, "Mono"))
++      {
++	color_option = "BRMonoColor";
++	gray_choice  = "Mono";
++      }
++      else if ((color_model = ppdFindOption(ppd, "CNIJSGrayScale")) != NULL &&
++	       ppdFindChoice(color_model, "1"))
++      {
++	color_option = "CNIJSGrayScale";
++	gray_choice  = "1";
++      }
++      else if ((color_model = ppdFindOption(ppd, "HPColorAsGray")) != NULL &&
++	       ppdFindChoice(color_model, "True"))
++      {
++	color_option = "HPColorAsGray";
++	gray_choice  = "True";
++      }
++
++      if (color_option && gray_choice)
++      {
++       /*
++	* Copy and convert ColorModel (output-mode) data...
++	*/
++
++	cups_option_t	*coption,	/* Color option */
++			*moption;	/* Monochrome option */
++
++	for (pwg_print_quality = _PWG_PRINT_QUALITY_DRAFT;
++	     pwg_print_quality < _PWG_PRINT_QUALITY_MAX;
++	     pwg_print_quality ++)
++        {
++	  if (pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR][pwg_print_quality])
++	  {
++	   /*
++	    * Copy the color options...
++	    */
++
++	    num_options = pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++	                                 [pwg_print_quality];
++	    options     = calloc(sizeof(cups_option_t), (size_t)num_options);
+ 
+-	  num_options = pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
+-					[pwg_print_quality];
+-	  options     = calloc((size_t)num_options, sizeof(cups_option_t));
+-
+-	  if (options)
+-	  {
+-	    for (i = num_options, moption = options,
+-		     coption = pc->presets[_PWG_PRINT_COLOR_MODE_COLOR]
+-					   [pwg_print_quality];
+-		 i > 0;
+-		 i --, moption ++, coption ++)
++	    if (options)
+ 	    {
+-	      moption->name  = _cupsStrRetain(coption->name);
+-	      moption->value = _cupsStrRetain(coption->value);
+-	    }
++	      for (i = num_options, moption = options,
++		       coption = pc->presets[_PWG_PRINT_COLOR_MODE_COLOR]
++					    [pwg_print_quality];
++		   i > 0;
++		   i --, moption ++, coption ++)
++	      {
++		moption->name  = _cupsStrRetain(coption->name);
++		moption->value = _cupsStrRetain(coption->value);
++	      }
+ 
+-	    pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
++	      pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
+ 		num_options;
+-	    pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
++	      pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
+ 		options;
++	    }
+ 	  }
+-	}
+-	else if (pwg_print_quality != _PWG_PRINT_QUALITY_NORMAL)
+-	  continue;
+-
+-       /*
+-	* Add the grayscale option to the preset...
+-	*/
++	  else if (pwg_print_quality != _PWG_PRINT_QUALITY_NORMAL)
++	    continue;
+ 
+-	pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
+-	    cupsAddOption(color_option, gray_choice,
+-			  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
+-					  [pwg_print_quality],
+-			  pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME] +
++	  /*
++	   * Add the grayscale option to the preset...
++	   */
++
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME][pwg_print_quality] =
++	      cupsAddOption(color_option, gray_choice,
++			    pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++					   [pwg_print_quality],
++			    pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME] +
+ 			      pwg_print_quality);
++	}
+       }
+     }
+   }
+ 
++  if (!preset_added)
++  {
++   /*
++    * Auto-association of PPD file option settings with the IPP job attributes
++    * print-color-mode, print-quality, and print-content-optimize
++    *
++    * This is used to retro-fit PPD files and classic CUPS drivers into
++    * Printer Applications, which are IPP printers for the clients and so
++    * should get controlled by standard IPP attributes as far as possible
++    *
++    * Note that settings assigned to print-content-optimize are only used
++    * when printing with "high" print-quality
++    */
++
++    _ppdCacheAssignPresets(ppd, pc);
++  }
++
+  /*
+   * Copy and convert Duplex (sides) data...
+   */
+@@ -2074,13 +2122,996 @@
+ 
+ 
+ /*
++ * '_ppdCacheAssignPresets()' - Go through all the options and choices in
++ *                              the PPD to find out which influence
++ *                              color/bw, print quality, and content
++ *                              optimizations to assign them to the prsets
++ *                              so that jobs can easily be controlled with
++ *                              standard IPP attributes
++ */
++
++void
++_ppdCacheAssignPresets(ppd_file_t *ppd,
++		       _ppd_cache_t *pc)
++{
++  /* properties and scores for each choice of the option under evaluation */
++  typedef struct choice_properties_s
++  {
++    int sets_mono,     /* Does this choice switch to monochrome printing? */
++        sets_color,    /*                     ... to color printing? */
++        sets_draft,    /*                     ... to draft/lower quality? */
++        sets_normal,   /*                     ... to standard/normal quality? */
++        sets_high,     /*                     ... to high/better quality? */
++        for_photo,     /* Does this choice improve photo printing? */
++        for_graphics,  /*                      ... graphics printing? */
++        for_text,      /*                      ... text printing? */
++        for_tg,        /*                      ... text & graphics printing? */
++        is_default;    /* Is this choice the PPD default? */
++    unsigned int res_x,/* Does this choice set resolution (0 if not)? */
++                 res_y;
++  } choice_properties_t;
++  int                    i, j, k, l;
++  unsigned int           m;                /* Ratio for lowering or improving
++					      resolution */
++  int                    pass;             /* Passes to go through to find best
++					      choice */
++  ppd_group_t            *group;           /* PPD option group */
++  ppd_option_t	         *option;          /* PPD option */
++  int                    is_color;         /* Is this PPD for a color printer */
++  unsigned int           base_res_x = 0,   /* Base resolution of the pPD file */
++                         base_res_y = 0;
++  cups_page_header2_t    header,           /* CUPS Raster header to investigate
++					      embedded code in PPD */
++                         optheader;        /* CUPS Raster header to investigate
++					      embedded code in one PPD option */
++  int                    preferred_bits;   /* for _cupsRasterExecPS() function
++					      call */
++  ppd_attr_t             *ppd_attr;        /* PPD attribute */
++  int                    res_factor = 1;   /* Weights of the scores for the */
++  int                    name_factor = 10; /* print quality */
++  int                    color_factor = 1000;
++
++  /* Do we have a color printer ? */
++  is_color = (ppd->color_device ? 1 : 0);
++
++  /* what is the base/default resolution for this PPD? */
++  ppdMarkDefaults(ppd);
++  cupsRasterInterpretPPD(&header, ppd, 0, NULL, NULL);
++  if (header.HWResolution[0] != 100 || header.HWResolution[1] != 100)
++  {
++    base_res_x = header.HWResolution[0];
++    base_res_y = header.HWResolution[1];
++  }
++  else if ((ppd_attr = ppdFindAttr(ppd, "DefaultResolution", NULL)) != NULL)
++  {
++    /* Use the PPD-defined default resolution... */
++    if (sscanf(ppd_attr->value, "%dx%d", &base_res_x, &base_res_y) == 1)
++      base_res_y = base_res_x;
++  }
++
++  /* Go through all options of the PPD file */
++  for (i = ppd->num_groups, group = ppd->groups;
++       i > 0;
++       i --, group ++)
++  {
++    /* Skip the "Installable Options" group */
++    if (_cups_strncasecmp(group->name, "Installable", 11) == 0)
++      continue;
++
++    for (j = group->num_options, option = group->options;
++         j > 0;
++         j --, option ++)
++    {
++      int sets_color_mode = 0,         /* Scores for current choice */
++	  sets_quality = 0,
++	  sets_optimization = 0;
++      int best_mono_draft = 0,         /* Best score for each preset for this
++				          option */
++          best_mono_normal = 0,
++          best_mono_high = 0,
++          best_color_draft = 0,
++          best_color_normal = 0,
++          best_color_high = 0,
++          best_photo = 0,
++          best_graphics = 0,
++          best_text = 0,
++	  best_tg = 0;
++      int default_ch = -1,             /* Index of default choice */
++	  best_mono_draft_ch = -1,     /* Index of choice with best score */
++          best_mono_normal_ch = -1,
++          best_mono_high_ch = -1,
++          best_color_draft_ch = -1,
++          best_color_normal_ch = -1,
++          best_color_high_ch = -1,
++          best_photo_ch = -1,
++          best_graphics_ch = -1,
++          best_text_ch = -1,
++	  best_tg_ch = -1;
++      cups_array_t *choice_properties; /* Array of properties of all choices
++					  of this option */
++      choice_properties_t *properties; /* Properties of current choice */
++      char *o,                         /* Name of current option */
++	   *c,                         /* Name of current choice */
++	   *p;                         /* Pointer into string */
++      int  score;                      /* Temp variable for score
++					  calculations */
++
++      o = option->keyword;
++
++      /* Skip options which do not change color mode and quality or
++         generally do not make sense in presets */
++      if (_cups_strcasecmp(o, "PageSize") == 0 ||
++	  _cups_strcasecmp(o, "PageRegion") == 0 ||
++	  _cups_strcasecmp(o, "InputSlot") == 0 ||
++	  _cups_strcasecmp(o, "MediaSource") == 0 ||
++	  _cups_strcasecmp(o, "MediaType") == 0 ||
++	  _cups_strcasecmp(o, "OutputBin") == 0 ||
++	  _cups_strcasecmp(o, "Duplex") == 0 ||
++	  _cups_strcasecmp(o, "JCLDuplex") == 0 ||
++	  _cups_strcasecmp(o, "EFDuplex") == 0 ||
++	  _cups_strcasecmp(o, "EFDuplexing") == 0 ||
++	  _cups_strcasecmp(o, "ARDuplex") == 0 ||
++	  _cups_strcasecmp(o, "KD03Duplex") == 0 ||
++	  _cups_strcasecmp(o, "Collate") == 0)
++	continue;
++
++      /* Set members options of composite options in Foomatic to stay
++         controlled by the composite option */
++
++      /* Composite options in Foomatic are options which set a number
++	 of other options, so each choice of them is the same as a
++	 preset in CUPS.  In addition, some PPDs in Foomatic have a
++	 composite option named "PrintoutMode" with 6 choices, exactly
++	 the 6 of the grid of CUPS presets, color/mono in draft,
++	 mediaum, and high quality. The composite options are created
++	 by hand, so they surely do for what they are intended for and
++	 so they are safer as this preset auto-generation
++	 algorithm. Therefore we only let the composite option be set
++	 in our presets and set the member options to leave the
++	 control at the composite option */
++
++      if (strstr(ppd->nickname, "Foomatic") &&
++	  !strncmp(option->choices[0].choice, "From", 4) &&
++	  ppdFindOption(ppd, option->choices[0].choice + 4))
++      {
++	for (k = 0; k < 2; k ++)
++	  for (l = 0; l < 3; l ++)
++	    if (cupsGetOption(option->choices[0].choice + 4,
++			      pc->num_presets[k][l], pc->presets[k][l]))
++	      pc->num_presets[k][l] =
++		cupsAddOption(o, option->choices[0].choice,
++			      pc->num_presets[k][l], &(pc->presets[k][l]));
++	for (k = 0; k < 5; k ++)
++	  if (cupsGetOption(option->choices[0].choice + 4,
++			    pc->num_optimize_presets[k],
++			    pc->optimize_presets[k]))
++	    pc->num_optimize_presets[k] =
++	      cupsAddOption(o, option->choices[0].choice,
++			    pc->num_optimize_presets[k],
++			    &(pc->optimize_presets[k]));
++	continue;
++      }
++
++      /* Array for properties of the choices */
++      choice_properties = cupsArrayNew(NULL, NULL);
++
++      /*
++       * Gather the data for each choice
++       */
++
++      for (k = 0; k < option->num_choices; k ++)
++      {
++	properties =
++	  (choice_properties_t *)calloc(1, sizeof(choice_properties_t));
++
++	c = option->choices[k].choice;
++
++	/* Is this the default choice? (preferred for "normal" quality,
++	   used for color if no choice name suggests being color */
++	if (strcmp(c, option->defchoice) == 0)
++	{
++	  properties->is_default = 1;
++	  default_ch = k;
++	}
++
++       /*
++	* Color/Gray - print-color-mode
++	*/
++
++	/* If we have a color device, check whether this option sets mono or
++	   color printing */
++	if (is_color)
++	{
++	  if (_cups_strcasecmp(o, "CNIJSGrayScale") == 0)
++	  {
++	    if (_cups_strcasecmp(c, "1") == 0)
++	      properties->sets_mono = 2;
++	    else
++	      properties->sets_color = 1;
++	  }
++	  else if (_cups_strcasecmp(o, "HPColorAsGray") == 0 ||  /* HP PostScript */
++		   _cups_strcasecmp(o, "HPPJLColorAsGray") == 0) /* HP PostScript */
++	  {
++	    if (_cups_strcasecmp(c, "True") == 0 ||
++		_cups_strcasecmp(c, "yes") == 0)
++	      properties->sets_mono = 2;
++	    else
++	      properties->sets_color = 1;
++	  }
++	  else if (_cups_strcasecmp(o, "ColorModel") == 0 ||
++		   _cups_strcasecmp(o, "ColorMode") == 0 ||
++		   _cups_strcasecmp(o, "OutputMode") == 0 ||
++		   _cups_strcasecmp(o, "PrintoutMode") == 0 ||
++		   _cups_strcasecmp(o, "ARCMode") == 0 || /* Sharp */
++		   _cups_strcasestr(o, "ColorMode") ||
++		   _cups_strcasecmp(o, "ColorResType") == 0 || /* Toshiba */
++		   _cups_strcasestr(o, "MonoColor")) /* Brother */
++	  {
++	    /* Monochrome/grayscale printing */
++	    if (_cups_strcasestr(c, "Mono") ||
++		_cups_strcasecmp(c, "Black") == 0 ||
++		((p = _cups_strcasestr(c, "Black")) && _cups_strcasestr(p, "White")) ||
++		(_cups_strncasecmp(c, "BW", 2) == 0 && !isalpha(c[2])))
++	      properties->sets_mono = 2;
++	    else if (_cups_strcasestr(c, "Gray") ||
++		     _cups_strcasestr(c, "Grey") ||
++		     _cups_strcasecmp(c, "BlackOnly") == 0) /* Lexmark */
++	      properties->sets_mono = 3;
++
++	    /* Color printing */
++	    if (((p = _cups_strcasestr(c, "CMY")) && !_cups_strcasestr(p, "Gray")) ||
++		_cups_strcasecmp(c, "ColorOnly") == 0 || /* Lexmark */
++		((p = _cups_strcasestr(c, "Adobe")) && _cups_strcasestr(p, "RGB")))
++	      properties->sets_color = 2;
++	    else if (_cups_strcasestr(c, "sRGB"))
++	      properties->sets_color = 4;
++	    else if (_cups_strcasestr(c, "RGB") ||
++		     _cups_strcasestr(c, "Color"))
++	      properties->sets_color = 3;
++	  }
++
++	  /* This option actually sets color mode */
++	  if (properties->sets_mono || properties->sets_color)
++	    sets_color_mode = 1;
++	}
++
++       /*
++	* Output Quality - print-quality
++	*/
++
++	/* check whether this option affects print quality or content
++	   optimization */
++
++	/* Determine influence of the options and choices on the print
++	   quality by their names */
++
++	/* Vendor-specific option and choice names */
++	if (_cups_strcasecmp(o, "ARCPPriority") == 0) /* Sharp */
++	{
++	  if (_cups_strcasecmp(c, "Quality") == 0)
++	    properties->sets_high = 10;
++	  else if (_cups_strcasecmp(c, "Speed") == 0)
++	    properties->sets_draft = 10;
++	}
++	else if (_cups_strcasecmp(o, "BRJpeg") == 0) /* Brother */
++	{
++	  if (_cups_strcasecmp(c, "QualityPrior") == 0)
++	    properties->sets_high = 10;
++	  else if (_cups_strcasecmp(c, "SpeedPrior") == 0)
++	    properties->sets_draft = 10;
++	}
++	else if (_cups_strcasecmp(o, "RIPrintMode") == 0) /* Ricoh & OEM */
++	{
++	  if (_cups_strcasecmp(c, "1rhit") == 0)
++	    properties->sets_high = 7;
++	  else if (_cups_strcasecmp(c, "6rhit") == 0)
++	    properties->sets_high = 10;
++	  else if (_cups_strcasecmp(c, "3rhit") == 0 ||
++		   _cups_strcasecmp(c, "4rhit") == 0 ||
++		   _cups_strcasecmp(c, "5rhit") == 0)
++	    properties->sets_draft = 10;
++	  else if (_cups_strcasecmp(c, "0rhit") == 0)
++	    properties->sets_normal = 10;
++	}
++	else if (_cups_strcasecmp(o, "EconoMode") == 0 || /* Foomatic */
++		 _cups_strcasecmp(o, "EconoFast") == 0)   /* Foomatic (HP PPA) */
++	{
++	  if (_cups_strcasecmp(c, "Off") == 0 ||
++	      _cups_strcasecmp(c, "False") == 0)
++	    properties->sets_high = 1;
++	  else if (_cups_strcasecmp(c, "On") == 0 ||
++		   _cups_strcasecmp(c, "True") == 0 ||
++		   _cups_strcasecmp(c, "Low") == 0)
++	    properties->sets_draft = 10;
++	  else if (_cups_strcasecmp(c, "High") == 0)
++	    properties->sets_draft = 11;
++	}
++	else if (_cups_strcasestr(o, "ColorPrecision")) /* Gutenprint */
++	{
++	  if (_cups_strcasecmp(c, "best") == 0)
++	    properties->sets_high = 10;
++	}
++	/* Generic boolean options which enhance quality if true */
++	else if (((p = _cups_strcasestr(o, "slow")) && _cups_strcasestr(p, "dry")) ||
++		 ((p = _cups_strcasestr(o, "color")) && _cups_strcasestr(p, "enhance")) ||
++		 ((p = _cups_strcasestr(o, "resolution")) &&
++		  !_cups_strcasestr(p, "enhance")) ||
++		 _cups_strcasecmp(o, "RET") == 0 ||
++		 _cups_strcasecmp(o, "Smoothing") == 0 || /* HPLIP */
++		 ((p = _cups_strcasestr(o, "uni")) && _cups_strcasestr(p, "direction")))
++	{
++	  if (_cups_strcasecmp(c, "True") == 0 ||
++	      _cups_strcasecmp(c, "On") == 0 ||
++	      _cups_strcasecmp(c, "Yes") == 0 ||
++	      _cups_strcasecmp(c, "1") == 0 ||
++	      _cups_strcasecmp(c, "Medium") == 0) /* Resolution Enhancement/RET (HP)*/
++	    properties->sets_high = 3;
++	  else if (_cups_strcasecmp(c, "False") == 0 ||
++		   _cups_strcasecmp(c, "Off") == 0 ||
++		   _cups_strcasecmp(c, "No") == 0 ||
++		   _cups_strcasecmp(c, "0") == 0)
++	    properties->sets_draft = 3;
++	}
++	/* Generic boolean options which reduce quality if true */
++	else if (_cups_strcasestr(o, "draft") ||
++		 _cups_strcasestr(o, "economy") ||
++		 ((p = _cups_strcasestr(o, "eco")) && _cups_strcasestr(p, "mode")) ||
++		 ((p = _cups_strcasestr(o, "toner")) && _cups_strcasestr(p, "sav")) ||
++		 ((p = _cups_strcasestr(o, "bi")) && _cups_strcasestr(p, "direction")) ||
++		 _cups_strcasecmp(o, "EcoBlack") == 0 || /* Foomatic (Alps) */
++		 _cups_strcasecmp(o, "bidi") == 0 ||
++		 _cups_strcasecmp(o, "bi-di") == 0)
++	{
++	  if (_cups_strcasecmp(c, "True") == 0 ||
++	      _cups_strcasecmp(c, "On") == 0 ||
++	      _cups_strcasecmp(c, "Yes") == 0 ||
++	      _cups_strcasecmp(c, "1") == 0 ||
++	      _cups_strcasecmp(c, "Medium") == 0) /* EconomyMode (Brother) */
++	    properties->sets_draft = 3;
++	  else if (_cups_strcasecmp(c, "False") == 0 ||
++		   _cups_strcasecmp(c, "Off") == 0 ||
++		   _cups_strcasecmp(c, "No") == 0 ||
++		   _cups_strcasecmp(c, "0") == 0)
++	    properties->sets_high = 3;
++	}
++	/* Generic enumerated choice option and choice names */
++	else if (_cups_strcasecmp(o, "ColorModel") == 0 ||
++		 _cups_strcasecmp(o, "ColorMode") == 0 ||
++		 _cups_strcasecmp(o, "OutputMode") == 0 || /* HPLIP hpcups */
++		 _cups_strcasecmp(o, "PrintoutMode") == 0 || /* Foomatic */
++		 _cups_strcasecmp(o, "PrintQuality") == 0 ||
++		 _cups_strcasecmp(o, "PrintMode") == 0 ||
++		 _cups_strcasestr(o, "ColorMode") ||
++		 _cups_strcasestr(o, "HalfTone") || /* HPLIP */
++		 _cups_strcasecmp(o, "ColorResType") == 0 || /* Toshiba */
++		 _cups_strcasestr(o, "MonoColor") || /* Brother */
++		 _cups_strcasestr(o, "Quality") ||
++		 _cups_strcasestr(o, "Resolution") ||
++		 _cups_strcasestr(o, "Precision") || /* ex. stpColorPrecision
++						  in Gutenprint */
++		 _cups_strcasestr(o, "PrintingDirection")) /* Gutenprint */
++	{
++	  /* High quality */
++	  if (_cups_strcasecmp(c, "Quality") == 0 ||
++	      _cups_strcasecmp(c, "5") == 0)
++	    properties->sets_high = 1;
++	  else if (_cups_strcasestr(c, "Photo") ||
++		   _cups_strcasestr(c, "Enhance") ||
++		   _cups_strcasestr(c, "slow") ||
++		   _cups_strncasecmp(c, "ProRes", 6) == 0 || /* HPLIP */
++		   _cups_strncasecmp(c, "ImageREt", 8) == 0 || /* HPLIP */
++		   ((p = _cups_strcasestr(c, "low")) && _cups_strcasestr(p, "speed")))
++	    properties->sets_high = 2;
++	  else if (_cups_strcasestr(c, "fine") ||
++		   _cups_strcasestr(c, "deep") ||
++		   ((p = _cups_strcasestr(c, "high")) && !_cups_strcasestr(p, "speed")) ||
++		   _cups_strcasestr(c, "HQ") ||
++		   _cups_strcasecmp(c, "ProRes600") == 0 || /* HPLIP */
++		   _cups_strcasecmp(c, "ImageREt1200") == 0 || /* HPLIP */
++		   _cups_strcasecmp(c, "Enhanced") == 0)
++	    properties->sets_high = 3;
++	  else if (_cups_strcasestr(c, "best") ||
++		   _cups_strcasecmp(c, "high") == 0 ||
++		   _cups_strcasecmp(c, "fine") == 0 ||
++		   _cups_strcasecmp(c, "HQ") == 0 ||
++		   _cups_strcasecmp(c, "CMYGray") == 0 || /* HPLIP */
++		   _cups_strcasecmp(c, "ProRes1200") == 0 || /* HPLIP */
++		   _cups_strcasecmp(c, "ImageREt2400") == 0 || /* HPLIP */
++		   _cups_strcasestr(c, "unidir"))
++	    properties->sets_high = 4;
++	  else if (_cups_strcasecmp(c, "best") == 0 ||
++		   _cups_strcasecmp(c, "ProRes2400") == 0 || /* HPLIP */
++		   _cups_strcasecmp(c, "monolowdetail") == 0) /* Toshiba */
++	    properties->sets_high = 5;
++
++	  /* Low/Draft quality */
++	  if (_cups_strcasecmp(c, "monolowdetail") == 0 || /* Toshiba */
++	      _cups_strcasecmp(c, "3") == 0)
++	    properties->sets_draft = 1;
++	  else if (((p = _cups_strcasestr(c, "fast")) && _cups_strcasestr(p, "draft")) ||
++		   ((p = _cups_strcasestr(c, "high")) && _cups_strcasestr(p, "speed")) ||
++		   (_cups_strcasestr(c, "speed") && !_cups_strcasestr(c, "low")))
++	    properties->sets_draft = 2;
++	  else if (_cups_strcasestr(c, "quick") ||
++		   (_cups_strcasestr(c, "fast") &&
++		    !(_cups_strncasecmp(c, "FastRes", 7) == 0 && isdigit(*(c + 7)))))
++	    /* HPLIP has FastRes600, FastRes1200, ... which are not draft */
++	    properties->sets_draft = 3;
++	  else if (_cups_strcasecmp(c, "quick") == 0 ||
++		   _cups_strcasecmp(c, "fast") == 0 ||
++		   _cups_strcasestr(c, "draft") ||
++		   (_cups_strcasestr(c, "low") && !_cups_strcasestr(c, "slow")) ||
++		   _cups_strcasestr(c, "coarse"))
++	    properties->sets_draft = 4;
++	  else if (_cups_strcasecmp(c, "draft") == 0 ||
++		   _cups_strcasecmp(c, "low") == 0 ||
++		   _cups_strcasecmp(c, "coarse") == 0 ||
++		   _cups_strcasestr(c, "bidir"))
++	    properties->sets_draft = 5;
++
++	  /* Use high or low quality but not the extremes */
++	  if (_cups_strcasestr(c, "ultra") ||
++	      _cups_strcasestr(c, "very") ||
++	      _cups_strcasestr(c, "super"))
++	  {
++	    if (properties->sets_high > 1)
++	      properties->sets_high --;
++	    if (properties->sets_draft > 1)
++	      properties->sets_draft --;
++	  }
++
++	  /* Normal quality */
++	  if (_cups_strcasestr(c, "automatic") ||
++	      _cups_strcasecmp(c, "none") == 0 ||
++	      _cups_strcasecmp(c, "4") == 0 ||
++	      _cups_strcasecmp(c, "FastRes1200") == 0) /* HPLIP */
++	    properties->sets_normal = 1;
++	  else if (_cups_strcasestr(c, "normal") ||
++		   _cups_strcasestr(c, "standard") ||
++		   _cups_strcasestr(c, "default") ||
++		   _cups_strcasecmp(c, "FastRes600") == 0) /* HPLIP */
++	    properties->sets_normal = 2;
++	  else if (_cups_strcasecmp(c, "normal") == 0 ||
++		   _cups_strcasecmp(c, "standard") == 0 ||
++		   _cups_strcasecmp(c, "default") == 0)
++	    properties->sets_normal = 4;
++	}
++
++	/* Apply the weight factor for option/choice-name-related scores */
++	properties->sets_high *= name_factor;
++	properties->sets_draft *= name_factor;
++	properties->sets_normal *= name_factor;
++
++	/* Determine influence of the options and choices on the print
++	   quality by how they change the output resolution compared to
++	   the base/default resolution */
++	if (base_res_x && base_res_y)
++	{
++	  /* First, analyse the code snippet (PostScript, PJL) assigned
++	     to each choice of the option whether it sets resolution */
++	  if (option->choices[k].code && option->choices[k].code[0])
++	  {
++	    /* Assume code to be PostScript (also used for CUPS Raster) */
++	    preferred_bits = 0;
++	    optheader = header;
++	    if (_cupsRasterExecPS(&optheader, &preferred_bits,
++				  option->choices[k].code) == 0)
++	    {
++	      properties->res_x = optheader.HWResolution[0];
++	      properties->res_y = optheader.HWResolution[1];
++	    }
++	    else
++	      properties->res_x = properties->res_y = 0; /* invalid */
++	    if (properties->res_x == 0 || properties->res_y == 0)
++	    {
++	      /* Now try PJL */
++	      if ((p = strstr(option->choices[k].code, "SET")) &&
++		  isspace(*(p + 3)) && (p = strstr(p + 4, "RESOLUTION=")))
++	      {
++		p += 11;
++		if (sscanf(p, "%dX%d",
++			   &(properties->res_x), &(properties->res_y)) == 1)
++		    properties->res_y = properties->res_x;
++	      }
++	    }
++	    if (properties->res_x == 100 && properties->res_y == 100)
++	      properties->res_x = properties->res_y = 0; /* Code does not
++							    set resolution */
++	  }
++	  else
++	    properties->res_x = properties->res_y = 0; /* invalid */
++
++	  /* Then parse the choice name whether it contains a
++	     resolution value (Must have "dpi", as otherwise can be
++	     something else, like a page size */
++	  if ((properties->res_x == 0 || properties->res_y == 0) &&
++	      (p = _cups_strcasestr(c, "dpi")) != NULL)
++	  {
++	    if (p > c)
++	    {
++	      p --;
++	      while (p > c && isspace(*p))
++		p --;
++	      if (p > c && isdigit(*p))
++	      {
++		char x;
++		while (p > c && isdigit(*p))
++		  p --;
++		if (p > c && (*p == 'x' || *p == 'X'))
++		  p --;
++		while (p > c && isdigit(*p))
++		  p --;
++		while (!isdigit(*p))
++		  p ++;
++		if (sscanf(p, "%d%c%d",
++			   &(properties->res_x), &x, &(properties->res_y)) == 2)
++		    properties->res_y = properties->res_x;
++	      }
++	    }
++	  }
++
++	  if (properties->res_x != 0 && properties->res_y != 0)
++	  {
++	    /* Choice suggests to set the resolution */
++	    /* Raising resolution compared to default? */
++	    m = (properties->res_x * properties->res_y) /
++	        (base_res_x * base_res_y);
++	    /* No or small change -> Normal quality */
++	    if (m == 1)
++	      properties->sets_normal += res_factor * 4;
++	    /* At least double the pixels -> High quality */
++	    else if (m == 2)
++	      properties->sets_high += res_factor * 3;
++	    else if (m > 2 && m <= 8)
++	      properties->sets_high += res_factor * 4;
++	    else if (m > 8 && m <= 32)
++	      properties->sets_high += res_factor * 2;
++	    else if (m > 32)
++	      properties->sets_high += res_factor * 1;
++	    else if (m < 1)
++	    {
++	      /* Reducing resolution compared to default? */
++	      m = (base_res_x * base_res_y) /
++		  (properties->res_x * properties->res_y);
++	      /* No or small change -> Normal quality */
++	      if (m == 1)
++		properties->sets_normal += res_factor * 1;
++	      /* At most half the pixels -> Draft quality */
++	      else if (m == 2)
++		properties->sets_draft += res_factor * 3;
++	      else if (m > 2 && m < 8)
++		properties->sets_draft += res_factor * 4;
++	      else if (m >= 8 && m < 32)
++		properties->sets_draft += res_factor * 2;
++	      else if (m >= 32)
++		properties->sets_draft += res_factor * 1;
++	    }
++	  }
++	}
++
++	/* This option actually sets print quality */
++	if (properties->sets_draft || properties->sets_high)
++	  sets_quality = 1;
++
++	/* Add the properties of this choice */
++	cupsArrayAdd(choice_properties, properties);
++      }
++
++     /*
++      * Find the best choice for each field of the color/quality preset
++      * grid
++      */
++
++      for (pass = 0; pass < 3; pass ++)
++      {
++	for (k = 0; k < option->num_choices; k ++)
++        {
++	  properties = cupsArrayIndex(choice_properties, k);
++
++	  /* presets[0][0]: Mono/Draft */
++	  if (best_mono_draft >= 0 &&
++	      !properties->sets_color &&
++	      (!properties->sets_high || pass > 0))
++	  {
++	    score = color_factor * properties->sets_mono +
++	      properties->sets_draft;
++	    if (score > best_mono_draft)
++	    {
++	      best_mono_draft = score;
++	      best_mono_draft_ch = k;
++	    }
++	  }
++
++	  /* presets[0][1]: Mono/Normal */
++	  if (best_mono_normal >= 0 &&
++	      !properties->sets_color &&
++	      (!properties->sets_draft || pass > 1) &&
++	      (!properties->sets_high  || pass > 0))
++	  {
++	    score = color_factor * properties->sets_mono +
++	      properties->sets_normal;
++	    if (score > best_mono_normal)
++	    {
++	      best_mono_normal = score;
++	      best_mono_normal_ch = k;
++	    }
++	  }
++
++	  /* presets[0][2]: Mono/High */
++	  if (best_mono_high >= 0 &&
++	      !properties->sets_color &&
++	      (!properties->sets_draft || pass > 0))
++	  {
++	    score = color_factor * properties->sets_mono +
++	      properties->sets_high;
++	    if (score > best_mono_high)
++	    {
++	      best_mono_high = score;
++	      best_mono_high_ch = k;
++	    }
++	  }
++
++	  /* presets[1][0]: Color/Draft */
++	  if (best_color_draft >= 0 &&
++	      !properties->sets_mono &&
++	      (!properties->sets_high || pass > 0))
++	  {
++	    score = color_factor * properties->sets_color +
++	      properties->sets_draft;
++	    if (score > best_color_draft)
++	    {
++	      best_color_draft = score;
++	      best_color_draft_ch = k;
++	    }
++	  }
++
++	  /* presets[1][1]: Color/Normal */
++	  if (best_color_normal >= 0 &&
++	      !properties->sets_mono &&
++	      (!properties->sets_draft || pass > 1) &&
++	      (!properties->sets_high  || pass > 0))
++	  {
++	    score = color_factor * properties->sets_color +
++	      properties->sets_normal;
++	    if (score > best_color_normal)
++	    {
++	      best_color_normal = score;
++	      best_color_normal_ch = k;
++	    }
++	  }
++
++	  /* presets[1][2]: Color/High */
++	  if (best_color_high >= 0 &&
++	      !properties->sets_mono &&
++	      (!properties->sets_draft || pass > 0))
++	  {
++	    score = color_factor * properties->sets_color +
++	      properties->sets_high;
++	    if (score > best_color_high)
++	    {
++	      best_color_high = score;
++	      best_color_high_ch = k;
++	    }
++	  }
++	}
++	/* Block next passes for the presets where we are done */
++	if (best_mono_draft_ch >= 0)
++	  best_mono_draft = -1;
++	if (best_mono_normal_ch >= 0)
++	  best_mono_normal = -1;
++	if (best_mono_high_ch >= 0)
++	  best_mono_high = -1;
++	if (best_color_draft_ch >= 0)
++	  best_color_draft = -1;
++	if (best_color_normal_ch >= 0)
++	  best_color_normal = -1;
++	if (best_color_high_ch >= 0)
++	  best_color_high = -1;
++      }
++
++     /*
++      * Content Optimization - print-content-optimize
++      */
++
++      for (k = 0; k < option->num_choices; k ++)
++      {
++	properties = cupsArrayIndex(choice_properties, k);
++	c = option->choices[k].choice;
++
++	/* Vendor-specific options */
++	if (_cups_strcasecmp(o, "ARCOType") == 0) /* Sharp */
++	{
++	  if (_cups_strcasecmp(c, "COTDrawing") == 0)
++	  {
++	    properties->for_text = 3;
++	    properties->for_graphics = 2;
++	    properties->for_tg = 2;
++	  }
++	  else if (_cups_strcasecmp(c, "COTGraphics") == 0)
++	  {
++	    properties->for_graphics = 3;
++	    properties->for_tg = 3;
++	  }
++	  else if (_cups_strcasecmp(c, "COTPhoto") == 0)
++	    properties->for_photo = 3;
++	}
++	else if (_cups_strcasecmp(o, "HPRGBEmulation") == 0) /* HP */
++	{
++	  if (_cups_strcasecmp(c, "DefaultSRGB") == 0)
++	    properties->for_text = 3;
++	  else if (_cups_strcasecmp(c, "VividSRGB") == 0)
++	  {
++	    properties->for_graphics = 3;
++	    properties->for_tg = 3;
++	  }
++	  else if (_cups_strcasecmp(c, "PhotoSRGB") == 0)
++	    properties->for_photo = 3;
++	}
++	else
++	/* Generic choice names */
++	{
++	  if (_cups_strcasestr(c, "photo"))
++	    properties->for_photo = 6;
++	  else if (_cups_strcasecmp(c, "photo") == 0)
++	    properties->for_photo = 7;
++
++	  if (_cups_strcasestr(c, "graphic"))
++	    properties->for_graphics = 6;
++	  else if (_cups_strcasecmp(c, "graphic") == 0 ||
++		   _cups_strcasecmp(c, "graphics") == 0)
++	    properties->for_graphics = 7;
++
++	  if (_cups_strcasestr(c, "text"))
++	  {
++	    if (_cups_strcasestr(c, "graphic"))
++	      properties->for_tg = 7;
++	    else
++	      properties->for_text = 6;
++	  }
++	  else if (_cups_strcasecmp(c, "text") == 0)
++	    properties->for_text = 7;
++
++	  if (_cups_strcasestr(c, "presentation"))
++	  {
++	    properties->for_text = 4;
++	    properties->for_graphics = 4;
++	    properties->for_tg = 4;
++	  }
++	  else if (_cups_strcasecmp(c, "presentation") == 0)
++	  {
++	    properties->for_text = 5;
++	    properties->for_graphics = 5;
++	    properties->for_tg = 5;
++	  }
++
++	  if (_cups_strcasestr(c, "lineart"))
++	  {
++	    properties->for_graphics = 2;
++	    properties->for_tg = 2;
++	  }
++	  else if (_cups_strcasecmp(c, "lineart") == 0)
++	  {
++	    properties->for_graphics = 3;
++	    properties->for_tg = 3;
++	  }
++
++	  if (_cups_strcasestr(c, "drawing"))
++	  {
++	    properties->for_graphics = 4;
++	    properties->for_tg = 4;
++	  }
++	  else if (_cups_strcasecmp(c, "drawing") == 0)
++	  {
++	    properties->for_graphics = 5;
++	    properties->for_tg = 5;
++	  }
++
++	  if (_cups_strcasestr(c, "natural"))
++	    properties->for_photo = 2;
++	  else if (_cups_strcasecmp(c, "natural") == 0)
++	    properties->for_photo = 3;
++
++	  if (_cups_strcasestr(c, "vivid"))
++	  {
++	    properties->for_text = 2;
++	    properties->for_graphics = 2;
++	    properties->for_tg = 2;
++	  }
++	  else if (_cups_strcasecmp(c, "vivid") == 0)
++	  {
++	    properties->for_text = 3;
++	    properties->for_graphics = 3;
++	    properties->for_tg = 3;
++	  }
++	}
++
++	/* We apply these optimizations only in high quality mode
++	   therefore we prefer settings for high quality */
++	if (properties->sets_high && !properties->sets_draft)
++	{
++	  if (properties->for_photo)
++	    properties->for_photo += 10;
++	  if (properties->for_graphics)
++	    properties->for_graphics += 10;
++	  if (properties->for_text)
++	    properties->for_text += 10;
++	  if (properties->for_tg)
++	    properties->for_tg += 10;
++	}
++
++       /*
++	* Find the best choice for each field of the content optimize presets
++	*/
++
++	/* Find best choice for each task */
++	/* optimize_presets[1]: Photo */
++	if (properties->for_photo > best_photo)
++	{
++	  best_photo = properties->for_photo;
++	  best_photo_ch = k;
++	}
++	/* optimize_presets[2]: Graphics */
++	if (properties->for_graphics > best_graphics)
++	{
++	  best_graphics = properties->for_graphics;
++	  best_graphics_ch = k;
++	}
++	/* optimize_presets[3]: Text */
++	if (properties->for_text > best_text)
++	{
++	  best_text = properties->for_text;
++	  best_text_ch = k;
++	}
++	/* optimize_presets[4]: Text and Graphics */
++	if (properties->for_tg > best_tg)
++	{
++	  best_tg = properties->for_tg;
++	  best_tg_ch = k;
++	}
++
++	/* This option actually does content optimization */
++	if (properties->for_text || properties->for_graphics ||
++	    properties->for_tg || properties->for_photo)
++	  sets_optimization = 1;
++      }
++
++     /*
++      * Fill in the presets
++      */
++
++      if (sets_color_mode || sets_quality)
++      {
++	/* presets[0][0]: Mono/Draft */
++	if (best_mono_draft_ch < 0)
++	  best_mono_draft_ch = default_ch;
++	if (best_mono_draft_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++	                 [_PWG_PRINT_QUALITY_DRAFT] =
++	    cupsAddOption(o, option->choices[best_mono_draft_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			                 [_PWG_PRINT_QUALITY_DRAFT],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			               [_PWG_PRINT_QUALITY_DRAFT]));
++
++	/* presets[0][1]: Mono/Normal */
++	if (best_mono_normal_ch < 0)
++	  best_mono_normal_ch = default_ch;
++	if (best_mono_normal_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++	                 [_PWG_PRINT_QUALITY_NORMAL] =
++	    cupsAddOption(o, option->choices[best_mono_normal_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			                 [_PWG_PRINT_QUALITY_NORMAL],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			               [_PWG_PRINT_QUALITY_NORMAL]));
++
++	/* presets[0][2]: Mono/High */
++	if (best_mono_high_ch < 0)
++	  best_mono_high_ch = default_ch;
++	if (best_mono_high_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++	                 [_PWG_PRINT_QUALITY_HIGH] =
++	    cupsAddOption(o, option->choices[best_mono_high_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			                 [_PWG_PRINT_QUALITY_HIGH],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_MONOCHROME]
++			               [_PWG_PRINT_QUALITY_HIGH]));
++
++	/* presets[1][0]: Color/Draft */
++	if (best_color_draft_ch < 0)
++	  best_color_draft_ch = default_ch;
++	if (best_color_draft_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++	                 [_PWG_PRINT_QUALITY_DRAFT] =
++	    cupsAddOption(o, option->choices[best_color_draft_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			                 [_PWG_PRINT_QUALITY_DRAFT],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			               [_PWG_PRINT_QUALITY_DRAFT]));
++
++	/* presets[1][1]: Color/Normal */
++	if (best_color_normal_ch < 0)
++	  best_color_normal_ch = default_ch;
++	if (best_color_normal_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++	                 [_PWG_PRINT_QUALITY_NORMAL] =
++	    cupsAddOption(o, option->choices[best_color_normal_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			                 [_PWG_PRINT_QUALITY_NORMAL],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			               [_PWG_PRINT_QUALITY_NORMAL]));
++
++	/* presets[1][2]: Color/High */
++	if (best_color_high_ch < 0)
++	  best_color_high_ch = default_ch;
++	if (best_color_high_ch >= 0)
++	  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++	                 [_PWG_PRINT_QUALITY_HIGH] =
++	    cupsAddOption(o, option->choices[best_color_high_ch].choice,
++			  pc->num_presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			                 [_PWG_PRINT_QUALITY_HIGH],
++			  &(pc->presets[_PWG_PRINT_COLOR_MODE_COLOR]
++			               [_PWG_PRINT_QUALITY_HIGH]));
++
++      }
++
++      if (sets_optimization)
++      {
++
++	/* optimize_presets[1]: Photo */
++	if (best_photo_ch >= 0)
++	  pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO] =
++	    cupsAddOption
++	      (o, option->choices[best_photo_ch].choice,
++	       pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO],
++	       &(pc->optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_PHOTO]));
++
++	/* optimize_presets[2]: Graphics */
++	if (best_graphics_ch >= 0)
++	  pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS] =
++	    cupsAddOption
++	      (o, option->choices[best_graphics_ch].choice,
++	       pc->num_optimize_presets
++	         [_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS],
++	       &(pc->optimize_presets
++		 [_PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS]));
++
++	/* optimize_presets[1]: Text */
++	if (best_text_ch >= 0)
++	  pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT] =
++	    cupsAddOption
++	      (o, option->choices[best_text_ch].choice,
++	       pc->num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT],
++	       &(pc->optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_TEXT]));
++
++	/* optimize_presets[1]: Text and Graphics */
++	if (best_tg_ch >= 0)
++	  pc->num_optimize_presets
++	    [_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS] =
++	    cupsAddOption
++	      (o, option->choices[best_tg_ch].choice,
++	       pc->num_optimize_presets
++	         [_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS],
++	       &(pc->optimize_presets
++		   [_PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS]));
++
++      }
++
++      for (k = 0; k < option->num_choices; k ++)
++	free(cupsArrayIndex(choice_properties, k));
++      cupsArrayDelete(choice_properties);
++    }
++  }
++}
++
++/*
+  * '_ppdCacheDestroy()' - Free all memory used for PWG mapping data.
+  */
+ 
+ void
+ _ppdCacheDestroy(_ppd_cache_t *pc)	/* I - PPD cache and mapping data */
+ {
+-  int		i;			/* Looping var */
++  int		i, j;			/* Looping vars */
+   pwg_map_t	*map;			/* Current map */
+   pwg_size_t	*size;			/* Current size */
+ 
+@@ -2159,6 +3190,15 @@
+ 
+   cupsArrayDelete(pc->strings);
+ 
++  for (i = _PWG_PRINT_COLOR_MODE_MONOCHROME; i < _PWG_PRINT_COLOR_MODE_MAX; i ++)
++    for (j = _PWG_PRINT_QUALITY_DRAFT; j < _PWG_PRINT_QUALITY_MAX; j ++)
++      if (pc->num_presets[i][j])
++	cupsFreeOptions(pc->num_presets[i][j], pc->presets[i][j]);
++
++  for (i = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO; i < _PWG_PRINT_CONTENT_OPTIMIZE_MAX; i ++)
++    if (pc->num_optimize_presets[i])
++      cupsFreeOptions(pc->num_optimize_presets[i], pc->optimize_presets[i]);
++
+   free(pc);
+ }
+ 
+@@ -3047,6 +4087,21 @@
+       }
+ 
+  /*
++  * Optimization Presets...
++  */
++
++  for (i = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO; i < _PWG_PRINT_CONTENT_OPTIMIZE_MAX; i ++)
++    if (pc->num_optimize_presets[i])
++    {
++      cupsFilePrintf(fp, "OptimizePreset %d", i);
++      for (k = pc->num_optimize_presets[i], option = pc->optimize_presets[i];
++	   k > 0;
++	   k --, option ++)
++	cupsFilePrintf(fp, " %s=%s", option->name, option->value);
++      cupsFilePutChar(fp, '\n');
++    }
++
++ /*
+   * Duplex/sides...
+   */
+ 
+--- a/cups/ppd-private.h
++++ b/cups/ppd-private.h
+@@ -36,7 +36,7 @@
+  * Constants...
+  */
+ 
+-#  define _PPD_CACHE_VERSION	11	/* Version number in cache file */
++#  define _PPD_CACHE_VERSION	12	/* Version number in cache file */
+ 
+ 
+ /*
+@@ -101,6 +101,16 @@
+   _PWG_PRINT_QUALITY_MAX
+ } _pwg_print_quality_t;
+ 
++typedef enum _pwg_print_content_optimize_e /** PWG print-content-optimize **/
++{
++  _PWG_PRINT_CONTENT_OPTIMIZE_AUTO = 0, /* print-content-optimize=auto */
++  _PWG_PRINT_CONTENT_OPTIMIZE_PHOTO,	/* print-content-optimize=photo */
++  _PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS, /* print-content-optimize=graphics */
++  _PWG_PRINT_CONTENT_OPTIMIZE_TEXT,	/* print-content-optimize=text */
++  _PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS, /* ...=text-and-graphics */
++  _PWG_PRINT_CONTENT_OPTIMIZE_MAX
++} _pwg_print_content_optimize_t;
++
+ typedef struct _pwg_finishings_s	/**** PWG finishings mapping data ****/
+ {
+   ipp_finishings_t	value;		/* finishings value */
+@@ -131,6 +141,11 @@
+ 					/* Number of print-color-mode/print-quality options */
+   cups_option_t	*presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
+ 					/* print-color-mode/print-quality options */
++  int		num_optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
++					/* Number of print-content-optimize
++					   options */
++  cups_option_t	*optimize_presets[_PWG_PRINT_CONTENT_OPTIMIZE_MAX];
++					/* print-content-optimize options */
+   char		*sides_option,		/* PPD option for sides */
+ 		*sides_1sided,		/* Choice for one-sided */
+ 		*sides_2sided_long,	/* Choice for two-sided-long-edge */
+@@ -214,6 +229,8 @@
+ extern const char	*_pwgPageSizeForMedia(pwg_media_t *media,
+ 			                      char *name, size_t namesize) _CUPS_PRIVATE;
+ 
++extern void             _ppdCacheAssignPresets(ppd_file_t *ppd, _ppd_cache_t *pc) _CUPS_PRIVATE;
++
+ 
+ /*
+  * C++ magic...
+--- a/cups/string-private.h
++++ b/cups/string-private.h
+@@ -151,6 +151,8 @@
+ 
+ extern int	_cups_strncasecmp(const char *, const char *, size_t n) _CUPS_PRIVATE;
+ 
++extern char	*_cups_strcasestr(const char *, const char *) _CUPS_PRIVATE;
++
+ #  ifndef HAVE_STRLCAT
+ extern size_t _cups_strlcat(char *, const char *, size_t) _CUPS_PRIVATE;
+ #    define strlcat _cups_strlcat
+--- a/cups/string.c
++++ b/cups/string.c
+@@ -671,6 +671,36 @@
+     return (-1);
+ }
+ 
++/*
++ * '_cups_strcasestr()' - Do a case-insensitive search for a sub-string.
++ */
++
++char *					/* O - Pointer to found sub-string  or
++					       NULL if not found */
++_cups_strcasestr(const char *haystack,	/* I - String in which to searh */
++                 const char *needle)	/* I - Sub-string */
++{
++  char     cn,  /* Character in needle */
++           ch;  /* Character in haystack */
++  size_t   len; /* Length of needle */
++
++  if ((cn = *needle++) != 0)
++  {
++    cn = _cups_tolower(cn);
++    len = strlen(needle);
++    do
++    {
++      do
++      {
++	if ((ch = *haystack++) == 0)
++	  return (NULL);
++      } while (_cups_tolower(ch) != cn);
++    } while (_cups_strncasecmp(haystack, needle, len) != 0);
++    haystack --;
++  }
++  return ((char *)haystack);
++}
++
+ 
+ #ifndef HAVE_STRLCAT
+ /*
+--- a/scheduler/job.c
++++ b/scheduler/job.c
+@@ -3669,9 +3669,13 @@
+   cups_option_t		*pwgppds,	/* PWG->PPD options */
+ 			*pwgppd,	/* Current PWG->PPD option */
+ 			*preset;	/* Current preset option */
+-  int			print_color_mode,
++  int			print_color_mode = _PWG_PRINT_COLOR_MODE_COLOR,
+ 					/* Output mode (if any) */
+-			print_quality;	/* Print quality (if any) */
++			print_quality = _PWG_PRINT_QUALITY_NORMAL,
++                                        /* Print quality (if any) */
++			print_content_optimize =
++                          _PWG_PRINT_CONTENT_OPTIMIZE_AUTO;
++                                        /* Print content type (if any)*/
+   const char		*ppd;		/* PPD option choice */
+   int			exact;		/* Did we get an exact match? */
+   static char		*options = NULL;/* Full list of options */
+@@ -3693,7 +3697,7 @@
+   if (pc &&
+       !ippFindAttribute(job->attrs, "com.apple.print.DocumentTicket.PMSpoolFormat", IPP_TAG_ZERO) &&
+       !ippFindAttribute(job->attrs, "APPrinterPreset", IPP_TAG_ZERO) &&
+-      (ippFindAttribute(job->attrs, "print-color-mode", IPP_TAG_ZERO) || ippFindAttribute(job->attrs, "print-quality", IPP_TAG_ZERO) || ippFindAttribute(job->attrs, "cupsPrintQuality", IPP_TAG_ZERO)))
++      (ippFindAttribute(job->attrs, "print-color-mode", IPP_TAG_ZERO) || ippFindAttribute(job->attrs, "print-quality", IPP_TAG_ZERO) || ippFindAttribute(job->attrs, "print-content-optimize", IPP_TAG_ZERO) || ippFindAttribute(job->attrs, "cupsPrintQuality", IPP_TAG_ZERO)))
+   {
+    /*
+     * Map print-color-mode and print-quality to a preset...
+@@ -3755,6 +3759,12 @@
+       }
+     }
+ 
++    cupsdLogJob(job, CUPSD_LOG_DEBUG,
++		"print-color-mode=%s, print-quality=%s",
++		print_color_mode == _PWG_PRINT_COLOR_MODE_MONOCHROME ?
++		"gray" : "color",
++		print_quality == _PWG_PRINT_QUALITY_DRAFT ? "draft" :
++		(print_quality == _PWG_PRINT_QUALITY_HIGH ? "high" : "normal"));
+     if (pc->num_presets[print_color_mode][print_quality] > 0)
+     {
+      /*
+@@ -3769,7 +3779,72 @@
+       {
+         if (!ippFindAttribute(job->attrs, preset->name, IPP_TAG_ZERO))
+         {
+-          cupsdLogJob(job, CUPSD_LOG_DEBUG2, "Adding preset option %s=%s", preset->name, preset->value);
++          cupsdLogJob(job, CUPSD_LOG_DEBUG, "Adding preset option %s=%s", preset->name, preset->value);
++
++	  num_pwgppds = cupsAddOption(preset->name, preset->value, num_pwgppds, &pwgppds);
++        }
++      }
++    }
++  }
++
++  if (pc &&
++      ippFindAttribute(job->attrs, "print-content-optimize", IPP_TAG_ZERO))
++  {
++   /*
++    * Map print-content-optimize to a preset...
++    */
++
++    if ((attr = ippFindAttribute(job->attrs, "print-content-optimize",
++				 IPP_TAG_KEYWORD)) != NULL)
++    {
++      if (!strcmp(attr->values[0].string.text, "auto"))
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO;
++      else if (!strcmp(attr->values[0].string.text, "photo"))
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_PHOTO;
++      else if (!strcmp(attr->values[0].string.text, "graphics") ||
++	       !strcmp(attr->values[0].string.text, "graphic"))
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS;
++      else if (!strcmp(attr->values[0].string.text, "text"))
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_TEXT;
++      else if (!strcmp(attr->values[0].string.text, "text-and-graphics") ||
++	       !strcmp(attr->values[0].string.text, "text-and-graphic"))
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_TEXT_AND_GRAPHICS;
++      else
++	print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO;
++    }
++    else
++      print_content_optimize = _PWG_PRINT_CONTENT_OPTIMIZE_AUTO;
++
++  cupsdLogJob(job, CUPSD_LOG_DEBUG,
++	      "print-content-optimize=%s",
++              (print_content_optimize == _PWG_PRINT_CONTENT_OPTIMIZE_AUTO ?
++	       "automatic" :
++               (print_content_optimize == _PWG_PRINT_CONTENT_OPTIMIZE_PHOTO ?
++		"photo" :
++                (print_content_optimize == _PWG_PRINT_CONTENT_OPTIMIZE_GRAPHICS ?
++		 "graphics" :
++                 (print_content_optimize == _PWG_PRINT_CONTENT_OPTIMIZE_TEXT ?
++		  "text" :
++                  "text and graphics")))));
++    if (pc->num_optimize_presets[print_content_optimize] > 0)
++    {
++     /*
++      * Copy the preset options as long as the corresponding names are not
++      * already defined in the IPP request and also if it does not change
++      * the print quality preset (as long as we do not print in high quality)
++      * ...
++      */
++
++      for (i = pc->num_optimize_presets[print_content_optimize],
++	       preset = pc->optimize_presets[print_content_optimize];
++	   i > 0;
++	   i --, preset ++)
++      {
++        if (!ippFindAttribute(job->attrs, preset->name, IPP_TAG_ZERO) &&
++	    (print_quality == _PWG_PRINT_QUALITY_HIGH ||
++	     cupsGetOption(preset->name, num_pwgppds, pwgppds) == NULL))
++        {
++          cupsdLogJob(job, CUPSD_LOG_DEBUG, "Adding content optimization preset option %s=%s", preset->name, preset->value);
+ 
+ 	  num_pwgppds = cupsAddOption(preset->name, preset->value, num_pwgppds, &pwgppds);
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 1e7b54a..ae5868f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,6 @@
 0014-Debian-Reproducibility-httpAddrGetHostname-test-fail.patch
 0015-Debian-Reproducibility-Do-not-run-stp-tests-as-root.patch
 0016-Debian-po4a-infrastructure-and-translations-for-manp.patch
+9100-ppd-cache-add-auto-presets.patch
 0012-add-pt.patch
 0013-let-WARNING-test-always-pass.patch
diff --git a/debian/rules b/debian/rules
index f751073..4e16f02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,10 +48,11 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		$(CUPS_CONFIGURE_DISTRO_OPTIONS) \
 		--with-docdir=/usr/share/cups/doc-root \
+		--with-pkgconfpath=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 		--localedir=/usr/share/cups/locale \
 		--enable-libpaper \
 		--enable-ssl \
-		--enable-gnutls \
+		--with-tls=gnutls \
 		--enable-threads \
 		--enable-static \
 		--enable-debug \
@@ -70,6 +71,7 @@ override_dh_auto_configure:
 		--with-error-policy=retry-job \
 		--enable-sync-on-close \
 		--with-max-log-size=0 \
+		--enable-snapped-clients \
 		$(CONFIG_LIBUSB)
 
 override_dh_auto_install:
@@ -222,9 +224,6 @@ endif
 ifneq (,$(filter libcups2-dev,$(shell dh_listpackages)))
 	# debian/libcups2-dev.install entry cannot rename files on-the-fly
 	cp cups/language-private.h debian/libcups2-dev/usr/include/cups/i18n.h
-	# debian/libcups2-dev.install cannot interpolate before compat 13
-	sed -e 's/@DEB_VERSION_UPSTREAM@/${DEB_VERSION_UPSTREAM}/' < debian/cups.pc.in > debian/cups.pc
-	install -D -m 644 debian/cups.pc debian/libcups2-dev/usr/lib/${DEB_HOST_GNU_TYPE}/pkgconfig/cups.pc
 endif
 
 ifneq (,$(filter cups-daemon,$(shell dh_listpackages)))