[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: cups-minimal: Remove the server settings from the /admin Web
From: |
guix-commits |
Subject: |
03/06: gnu: cups-minimal: Remove the server settings from the /admin Web UI. |
Date: |
Tue, 22 Jun 2021 21:27:51 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit a437bd9180d1af0f84229d4ae3e9cd0ab93d9fa0
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jun 22 19:23:29 2021 +0200
gnu: cups-minimal: Remove the server settings from the /admin Web UI.
* gnu/packages/cups.scm (cups-minimal)[arguments]: Add a new
'remove-Web-UI-server-settings phase.
---
gnu/packages/cups.scm | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 959caa7..8301802 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -287,6 +287,19 @@ filters for the PDF-centric printing workflow introduced
by OpenPrinting.")
(substitute* "cgi-bin/admin.c"
(("!cupsAdminGetServerSettings" match)
(string-append "0 && " match)))))
+ (add-after 'unpack 'remove-Web-UI-server-settings
+ ;; The /admin page's server configuration form is questionable for
+ ;; the same reason as cupsAdminGetServerSettings, and won't work at
+ ;; all on Guix Systems. Remove it entirely.
+ (lambda _
+ ;; SUBSTITUTE* and a patch both have (dis)advantages. This is
+ ;; shorter & should ensure that no translation is forgotten.
+ (substitute* (find-files "templates" "^admin\\.tmpl$")
+ ((" class=\"halves\"") "")
+ (("<FORM.* ACTION=\"/jobs.*</FORM>" match)
+ (string-append match "</P>{BROKEN? "))
+ (("</FORM>}" match)
+ (string-append match "}")))))
(add-before 'configure 'patch-makedefs
(lambda _
(substitute* "Makedefs.in"
- branch core-updates updated (7931883 -> c655bbb), guix-commits, 2021/06/22
- 01/06: gnu: cups: Inherit & modify cups-minimal arguments., guix-commits, 2021/06/22
- 04/06: gnu: cups: Fetch source directly from the Git repository., guix-commits, 2021/06/22
- 03/06: gnu: cups-minimal: Remove the server settings from the /admin Web UI.,
guix-commits <=
- 05/06: gnu: cups: Update to 2.3.3op2 [fixes CVE-2020-10001]., guix-commits, 2021/06/22
- 06/06: services: cups: Support CUPS 2.3.3op2's LogFileGroup directive., guix-commits, 2021/06/22
- 02/06: gnu: cups-minimal: Never cupsAdminGetServerSettings., guix-commits, 2021/06/22