| 1 |
commit: ac8d965b745c52b54d542552776f350dba0fab7a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 07:45:41 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 07:46:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8d965b |
| 7 |
|
| 8 |
net-print/cups: allow root to access web interface |
| 9 |
|
| 10 |
See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006853. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/863221 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
net-print/cups/{cups-9999.ebuild => cups-2.4.2-r2.ebuild} | 8 +++++++- |
| 16 |
net-print/cups/cups-9999.ebuild | 3 ++- |
| 17 |
2 files changed, 9 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.4.2-r2.ebuild |
| 20 |
similarity index 97% |
| 21 |
copy from net-print/cups/cups-9999.ebuild |
| 22 |
copy to net-print/cups/cups-2.4.2-r2.ebuild |
| 23 |
index 8583dd21407e..164e525fb93c 100644 |
| 24 |
--- a/net-print/cups/cups-9999.ebuild |
| 25 |
+++ b/net-print/cups/cups-2.4.2-r2.ebuild |
| 26 |
@@ -151,7 +151,8 @@ multilib_src_configure() { |
| 27 |
--with-cups-user=lp |
| 28 |
--with-cups-group=lp |
| 29 |
--with-docdir="${EPREFIX}"/usr/share/cups/html |
| 30 |
- --with-system-groups=lpadmin |
| 31 |
+ # See bug #863221 for adding root |
| 32 |
+ --with-system-groups="root lpadmin" |
| 33 |
--with-xinetd="${EPREFIX}"/etc/xinetd.d |
| 34 |
$(multilib_native_use_enable acl) |
| 35 |
$(use_enable dbus) |
| 36 |
@@ -188,6 +189,11 @@ multilib_src_configure() { |
| 37 |
# makes more sense when facing multilib support. |
| 38 |
sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die |
| 39 |
|
| 40 |
+ # Don't use the libtool build |
| 41 |
+ # https://bugs.gentoo.org/843638 |
| 42 |
+ # https://github.com/OpenPrinting/cups/pull/394 |
| 43 |
+ unset LIBTOOL |
| 44 |
+ |
| 45 |
econf "${myeconfargs[@]}" |
| 46 |
|
| 47 |
sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die |
| 48 |
|
| 49 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
| 50 |
index 8583dd21407e..014eb56e0751 100644 |
| 51 |
--- a/net-print/cups/cups-9999.ebuild |
| 52 |
+++ b/net-print/cups/cups-9999.ebuild |
| 53 |
@@ -151,7 +151,8 @@ multilib_src_configure() { |
| 54 |
--with-cups-user=lp |
| 55 |
--with-cups-group=lp |
| 56 |
--with-docdir="${EPREFIX}"/usr/share/cups/html |
| 57 |
- --with-system-groups=lpadmin |
| 58 |
+ # See bug #863221 for adding root |
| 59 |
+ --with-system-groups="root lpadmin" |
| 60 |
--with-xinetd="${EPREFIX}"/etc/xinetd.d |
| 61 |
$(multilib_native_use_enable acl) |
| 62 |
$(use_enable dbus) |
Archives