diff -Nru cups-pdf-3.0.1/debian/changelog cups-pdf-3.0.1/debian/changelog --- cups-pdf-3.0.1/debian/changelog 2018-02-17 11:20:04.000000000 +0000 +++ cups-pdf-3.0.1/debian/changelog 2019-09-18 08:09:02.000000000 +0000 @@ -1,3 +1,24 @@ +cups-pdf (3.0.1-6) unstable; urgency=medium + + * README.Debian: + = Changed UBUNTU to AppArmor for the caveat about configuration. + * Patches: + - Dropped 02_ubuntu_changes_to_cups-pdf_conf.patch + = Updated 01_debian_changes_to_cups-pdf_conf.patch + Changed note about Output path configuration to reflect that + this affects all systems that have AppArmor installed. + * Copyright: + = Updated the copyright year for Debian packaging. + = Updated the URL to use HTTPS transport. + * Watch: + = Updated the URL to use HTTPS transport. + * Compat,Control: + = Bumped debhelper to version 10. + * Control: + = Bumped Standards-Version to 4.4.0 (no change required). + + -- Martin-Éric Racine Wed, 18 Sep 2019 11:09:02 +0300 + cups-pdf (3.0.1-5) unstable; urgency=medium * Removed [examples]: upstream no longer ships contrib (see 3.0.1-1). diff -Nru cups-pdf-3.0.1/debian/compat cups-pdf-3.0.1/debian/compat --- cups-pdf-3.0.1/debian/compat 2015-05-06 13:33:08.000000000 +0000 +++ cups-pdf-3.0.1/debian/compat 2019-09-18 07:58:04.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru cups-pdf-3.0.1/debian/control cups-pdf-3.0.1/debian/control --- cups-pdf-3.0.1/debian/control 2017-11-19 22:56:14.000000000 +0000 +++ cups-pdf-3.0.1/debian/control 2019-09-18 08:08:05.000000000 +0000 @@ -4,8 +4,8 @@ Priority: optional Maintainer: Debian CUPS Maintainers Uploaders: Martin-Éric Racine -Build-Depends: debhelper (>= 9.0~), libcups2-dev -Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10), libcups2-dev +Standards-Version: 4.4.0 Package: printer-driver-cups-pdf Architecture: any diff -Nru cups-pdf-3.0.1/debian/copyright cups-pdf-3.0.1/debian/copyright --- cups-pdf-3.0.1/debian/copyright 2018-02-17 11:19:06.000000000 +0000 +++ cups-pdf-3.0.1/debian/copyright 2019-09-18 07:50:08.000000000 +0000 @@ -1,12 +1,12 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: http://www.cups-pdf.de +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://www.cups-pdf.de Files: * Copyright: © 2003-2017 Volker Christian Behr License: GPL-2+ Files: debian/* -Copyright: © 2004-2017 Martin-Éric Racine +Copyright: © 2004-2019 Martin-Éric Racine © 2009,2011 Till Kamppeter License: GPL-2+ diff -Nru cups-pdf-3.0.1/debian/patches/01_debian_changes_to_cups-pdf_conf.patch cups-pdf-3.0.1/debian/patches/01_debian_changes_to_cups-pdf_conf.patch --- cups-pdf-3.0.1/debian/patches/01_debian_changes_to_cups-pdf_conf.patch 2017-02-23 10:32:21.000000000 +0000 +++ cups-pdf-3.0.1/debian/patches/01_debian_changes_to_cups-pdf_conf.patch 2019-09-18 07:40:44.000000000 +0000 @@ -1,11 +1,18 @@ Description: Debian changes to the stock upstream configuration. Author: Martin-Éric Racine Index: cups-pdf-3.0.0/extra/cups-pdf.conf -=================================================================== ---- cups-pdf-3.0.0.orig/extra/cups-pdf.conf -+++ cups-pdf-3.0.0/extra/cups-pdf.conf -@@ -48,7 +48,7 @@ - ## root_squash! +--- cups-pdf-3.0.1.orig/extra/cups-pdf.conf 2019-09-18 10:28:01.000000000 +0300 ++++ cups-pdf-3.0.1/extra/cups-pdf.conf 2019-09-18 10:33:53.634170129 +0300 +@@ -45,10 +45,14 @@ + ## ${HOME} will be expanded to the user's home directory + ## ${USER} will be expanded to the user name + ## in case it is an NFS export make sure it is exported without +-## root_squash! ++## root_squash! ++## NOTE: if AppArmor is installed, the AppArmor profile must ++## be updated to match the output path below, otherwise file ++## writing will be denied by AppArmor. ++## See instructions on Ubuntu Launchpad in LP bug #147551. ### Default: /var/spool/cups-pdf/${USER} -#Out /var/spool/cups-pdf/${USER} @@ -13,7 +20,7 @@ ### Key: AnonDirName (config) ## ABSOLUTE path for anonymously created PDF files -@@ -190,7 +190,7 @@ +@@ -190,7 +194,7 @@ ## created directories and log files ### Default: lp @@ -22,7 +29,7 @@ ### Key: AllowUnsafeOptions (config) ## DON'T CHANGE THIS SETTING UNLESS YOU ABSOLUTELY KNOW WHAT YOU ARE DOING -@@ -290,7 +290,7 @@ +@@ -290,7 +294,7 @@ ## 0: disable, 1: enable ### Default: 0 diff -Nru cups-pdf-3.0.1/debian/patches/02_ubuntu_changes_to_cups-pdf_conf.patch cups-pdf-3.0.1/debian/patches/02_ubuntu_changes_to_cups-pdf_conf.patch --- cups-pdf-3.0.1/debian/patches/02_ubuntu_changes_to_cups-pdf_conf.patch 2017-02-23 11:25:11.000000000 +0000 +++ cups-pdf-3.0.1/debian/patches/02_ubuntu_changes_to_cups-pdf_conf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Ubuntu changes to the stock upstream configuration. -Author: Jani Uusitalo -Index: cups-pdf-3.0.0/extra/cups-pdf.conf -=================================================================== ---- cups-pdf-3.0.0.orig/extra/cups-pdf.conf -+++ cups-pdf-3.0.0/extra/cups-pdf.conf -@@ -45,7 +45,9 @@ - ## ${HOME} will be expanded to the user's home directory - ## ${USER} will be expanded to the user name - ## in case it is an NFS export make sure it is exported without --## root_squash! -+## root_squash! -+## on Ubuntu, the cupsd AppArmor profile needs to be updated -+## to match the output path as per instructions in LP:147551 - ### Default: /var/spool/cups-pdf/${USER} - - Out ${HOME}/PDF diff -Nru cups-pdf-3.0.1/debian/patches/series cups-pdf-3.0.1/debian/patches/series --- cups-pdf-3.0.1/debian/patches/series 2017-02-23 10:37:41.000000000 +0000 +++ cups-pdf-3.0.1/debian/patches/series 2019-09-18 07:36:18.000000000 +0000 @@ -1,2 +1 @@ 01_debian_changes_to_cups-pdf_conf.patch -02_ubuntu_changes_to_cups-pdf_conf.patch diff -Nru cups-pdf-3.0.1/debian/README.Debian cups-pdf-3.0.1/debian/README.Debian --- cups-pdf-3.0.1/debian/README.Debian 2016-02-23 13:00:09.000000000 +0000 +++ cups-pdf-3.0.1/debian/README.Debian 2019-09-18 08:09:02.000000000 +0000 @@ -9,12 +9,23 @@ The settings are fully configurable by editing using the system administrator's favorite text editor. - CAVEAT (UBUNTU) + CAVEAT AppArmor prevents outputting PDF documents to non-default directories so must also be edited, whenever the above defaults get changed in . + In cases where the system mounts home directories from paths other + than , edit instead. + + AppArmor issues appear in 'dmesg' in a format similar to this: + + audit[11578]: AVC apparmor="DENIED" operation="mknod" + profile="/usr/lib/cups/backend/cups-pdf" + name="/home/username/unexpectedpath/document.pdf" + pid=11578 comm="gs" requested_mask="c" denied_mask="c" + fsuid=1000 ouid=1000 + The optional GTK package is capable of detecting this CUPS backend as a suitable ready-to-use printer. @@ -31,4 +42,4 @@ tools used to generate the PDF might be. Therefore, avoid filing bugs related to those codebases against CUPS-PDF. - -- Martin-Éric Racine Sat, 10 Dec 2011 12:45:25 +0200 + -- Martin-Éric Racine Wed, 18 Sep 2019 10:19:01 +0300 diff -Nru cups-pdf-3.0.1/debian/watch cups-pdf-3.0.1/debian/watch --- cups-pdf-3.0.1/debian/watch 2017-02-28 06:59:41.000000000 +0000 +++ cups-pdf-3.0.1/debian/watch 2019-09-18 07:49:39.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ -http://www.cups-pdf.de/src/cups-pdf[_\-](\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) \ +https://www.cups-pdf.de/src/cups-pdf[_\-](\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) \ debian uupdate --no-symlink