From 0efd53c9f2e93e68db671c534f7748c9c5db633d Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Thu, 19 Jan 2017 13:46:03 +0000
Subject: Remove Kerberos related configuration from default cupsd.conf because
 Kerberos support is disabled and the configuration causes an error.

Reported by:	cpm
---
 print/cups/Makefile                       |  1 +
 print/cups/files/patch-conf_cupsd.conf.in | 52 +++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 print/cups/files/patch-conf_cupsd.conf.in

(limited to 'print')

diff --git a/print/cups/Makefile b/print/cups/Makefile
index c943d43f80ce..5d42abd696ff 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	cups
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	print
 
 MAINTAINER=	tijl@FreeBSD.org
diff --git a/print/cups/files/patch-conf_cupsd.conf.in b/print/cups/files/patch-conf_cupsd.conf.in
new file mode 100644
index 000000000000..90836e3c4b9a
--- /dev/null
+++ b/print/cups/files/patch-conf_cupsd.conf.in
@@ -0,0 +1,52 @@
+--- conf/cupsd.conf.in.orig	2017-01-17 19:27:22 UTC
++++ conf/cupsd.conf.in
+@@ -134,49 +134,3 @@ WebInterface @CUPS_WEBIF@
+     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>
-- 
cgit