guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: gnu: cups-minimal: Never cupsAdminGetServerSettings.


From: guix-commits
Subject: 02/06: gnu: cups-minimal: Never cupsAdminGetServerSettings.
Date: Tue, 22 Jun 2021 21:27:51 -0400 (EDT)

nckx pushed a commit to branch core-updates
in repository guix.

commit 3b5297d975efd07e7819f671c14856fd0778870e
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jun 22 19:22:15 2021 +0200

    gnu: cups-minimal: Never cupsAdminGetServerSettings.
    
    * gnu/packages/cups.scm (cups-minimal)[arguments]: Add a new
    'never-cupsAdminGetServerSettings phase.
---
 gnu/packages/cups.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 1a071a1..959caa7 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -275,6 +275,18 @@ filters for the PDF-centric printing workflow introduced 
by OpenPrinting.")
        #:tests? #f
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'never-cupsAdminGetServerSettings
+           ;; Instead of querying the daemon directly, this part of CUPS 
assumes
+           ;; that (1) it has access to a cupsd.conf under CUPS_SERVERROOT, and
+           ;; (2) the file's contents apply to the running daemon.  (1) is 
false
+           ;; at least on Guix Systems resulting in extremely long delays when
+           ;; loading the Web interface's /admin page.  (2) isn't valid 
anywhere
+           ;; because it ignores, e.g., -c FILE.
+           ;; Upstream considers this code on ‘life support’ so just neuter it.
+          (lambda _
+            (substitute* "cgi-bin/admin.c"
+              (("!cupsAdminGetServerSettings" match)
+               (string-append "0 && " match)))))
          (add-before 'configure 'patch-makedefs
            (lambda _
              (substitute* "Makedefs.in"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]