commit:     ac8d965b745c52b54d542552776f350dba0fab7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 07:45:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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)

Reply via email to