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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74586158095 for ; Sat, 27 Aug 2022 23:12:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6603E09C4; Sat, 27 Aug 2022 23:10:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55AC2E09BC for ; Sat, 27 Aug 2022 23:10:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5676134125B for ; Sat, 27 Aug 2022 07:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 923F0558 for ; Sat, 27 Aug 2022 07:46:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661586408.ac8d965b745c52b54d542552776f350dba0fab7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.4.2-r2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ac8d965b745c52b54d542552776f350dba0fab7a X-VCS-Branch: master Date: Sat, 27 Aug 2022 07:46:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed0fc6cc-c6bf-46f7-aac5-6b1f41b4c2cb X-Archives-Hash: 2aa7e9b0040c0725767b88cf2c2b2d79 commit: ac8d965b745c52b54d542552776f350dba0fab7a Author: Sam James gentoo org> AuthorDate: Sat Aug 27 07:45:41 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 27 07:46:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8d965b net-print/cups: allow root to access web interface See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006853. Closes: https://bugs.gentoo.org/863221 Signed-off-by: Sam James gentoo.org> net-print/cups/{cups-9999.ebuild => cups-2.4.2-r2.ebuild} | 8 +++++++- net-print/cups/cups-9999.ebuild | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.4.2-r2.ebuild similarity index 97% copy from net-print/cups/cups-9999.ebuild copy to net-print/cups/cups-2.4.2-r2.ebuild index 8583dd21407e..164e525fb93c 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-2.4.2-r2.ebuild @@ -151,7 +151,8 @@ multilib_src_configure() { --with-cups-user=lp --with-cups-group=lp --with-docdir="${EPREFIX}"/usr/share/cups/html - --with-system-groups=lpadmin + # See bug #863221 for adding root + --with-system-groups="root lpadmin" --with-xinetd="${EPREFIX}"/etc/xinetd.d $(multilib_native_use_enable acl) $(use_enable dbus) @@ -188,6 +189,11 @@ multilib_src_configure() { # makes more sense when facing multilib support. sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die + # Don't use the libtool build + # https://bugs.gentoo.org/843638 + # https://github.com/OpenPrinting/cups/pull/394 + unset LIBTOOL + econf "${myeconfargs[@]}" sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 8583dd21407e..014eb56e0751 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -151,7 +151,8 @@ multilib_src_configure() { --with-cups-user=lp --with-cups-group=lp --with-docdir="${EPREFIX}"/usr/share/cups/html - --with-system-groups=lpadmin + # See bug #863221 for adding root + --with-system-groups="root lpadmin" --with-xinetd="${EPREFIX}"/etc/xinetd.d $(multilib_native_use_enable acl) $(use_enable dbus)