diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-01-19 03:43:30 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-01-19 03:43:56 +0100 |
| commit | 7ee57377c41da4814963ba9a162d03bc466448d8 (patch) | |
| tree | 3e50ee7e2e1a751dc7395d55b6cd03e3baef0ae1 | |
| parent | base/package.use.mask: Masked "system-heimdal" flag for net-fs/samba. (diff) | |
| download | gentoo-7ee57377c41da4814963ba9a162d03bc466448d8.tar.gz gentoo-7ee57377c41da4814963ba9a162d03bc466448d8.tar.bz2 gentoo-7ee57377c41da4814963ba9a162d03bc466448d8.zip | |
net-print/cups: Revbump to fix cupsd startup error with USE="-kerberos".
This fixes Gentoo bug #606472.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| -rw-r--r-- | net-print/cups/cups-2.2.2-r1.ebuild (renamed from net-print/cups/cups-2.2.2.ebuild) | 6 | ||||
| -rw-r--r-- | net-print/cups/files/cups-2.2.2-no_kerberos_config.patch | 57 |
2 files changed, 63 insertions, 0 deletions
diff --git a/net-print/cups/cups-2.2.2.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild index 047d637b6b20..0e8b61de1195 100644 --- a/net-print/cups/cups-2.2.2.ebuild +++ b/net-print/cups/cups-2.2.2-r1.ebuild @@ -145,6 +145,12 @@ pkg_setup() { } src_prepare() { + if ! use kerberos ; then + PATCHES+=( + "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch" + ) + fi + default # Remove ".SILENT" rule for verbose output (bug 524338). diff --git a/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch b/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch new file mode 100644 index 000000000000..a26b3995c52c --- /dev/null +++ b/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch @@ -0,0 +1,57 @@ +Don't add kerberos policies into cupsd config when no kerberos support was +compiled in. + +https://bugs.gentoo.org/606472 + +--- cups-2.2.2/conf/cupsd.conf.in ++++ cups-2.2.2/conf/cupsd.conf.in +@@ -134,49 +134,3 @@ + Order deny,allow + </Limit> + </Policy> +- +-# Set the kerberized printer/job policies... +-<Policy kerberos> +- # Job/subscription privacy... +- JobPrivateAccess default +- JobPrivateValues default +- SubscriptionPrivateAccess default +- SubscriptionPrivateValues default +- +- # Job-related operations must be done by the owner or an administrator... +- <Limit Create-Job Print-Job Print-URI Validate-Job> +- AuthType Negotiate +- Order deny,allow +- </Limit> +- +- <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document> +- AuthType Negotiate +- Require user @OWNER @SYSTEM +- Order deny,allow +- </Limit> +- +- # All administration operations require an administrator to authenticate... +- <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default> +- AuthType Default +- Require user @SYSTEM +- Order deny,allow +- </Limit> +- +- # All printer operations require a printer operator to authenticate... +- <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs> +- AuthType Default +- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ +- Order deny,allow +- </Limit> +- +- # Only the owner or an administrator can cancel or authenticate a job... +- <Limit Cancel-Job CUPS-Authenticate-Job> +- AuthType Negotiate +- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ +- Order deny,allow +- </Limit> +- +- <Limit All> +- Order deny,allow +- </Limit> +-</Policy> |