From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 007EB139085 for ; Thu, 19 Jan 2017 02:44:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 608C521C08F; Thu, 19 Jan 2017 02:44:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3104021C08F for ; Thu, 19 Jan 2017 02:44:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E992E341236 for ; Thu, 19 Jan 2017 02:44:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8582A289A for ; Thu, 19 Jan 2017 02:44:00 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1484793836.7ee57377c41da4814963ba9a162d03bc466448d8.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.2.2-r1.ebuild net-print/cups/cups-2.2.2.ebuild net-print/cups/files/cups-2.2.2-no_kerberos_config.patch X-VCS-Directories: net-print/cups/ net-print/cups/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7ee57377c41da4814963ba9a162d03bc466448d8 X-VCS-Branch: master Date: Thu, 19 Jan 2017 02:44:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 23606d54-006e-468c-b3a9-678eb442930c X-Archives-Hash: 02228192ff6acf1dc422583f23a46a00 commit: 7ee57377c41da4814963ba9a162d03bc466448d8 Author: Lars Wendler gentoo org> AuthorDate: Thu Jan 19 02:43:30 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jan 19 02:43:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee57377 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 .../{cups-2.2.2.ebuild => cups-2.2.2-r1.ebuild} | 6 +++ .../cups/files/cups-2.2.2-no_kerberos_config.patch | 57 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/net-print/cups/cups-2.2.2.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild similarity index 99% rename from net-print/cups/cups-2.2.2.ebuild rename to net-print/cups/cups-2.2.2-r1.ebuild index 047d637..0e8b61d 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 00000000..a26b399 --- /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 + + +- +-# Set the kerberized printer/job policies... +- +- # Job/subscription privacy... +- JobPrivateAccess default +- JobPrivateValues default +- SubscriptionPrivateAccess default +- SubscriptionPrivateValues default +- +- # Job-related operations must be done by the owner or an administrator... +- +- AuthType Negotiate +- Order deny,allow +- +- +- +- AuthType Negotiate +- Require user @OWNER @SYSTEM +- Order deny,allow +- +- +- # All administration operations require an administrator to authenticate... +- +- AuthType Default +- Require user @SYSTEM +- Order deny,allow +- +- +- # All printer operations require a printer operator to authenticate... +- +- AuthType Default +- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ +- Order deny,allow +- +- +- # Only the owner or an administrator can cancel or authenticate a job... +- +- AuthType Negotiate +- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@ +- Order deny,allow +- +- +- +- Order deny,allow +- +-