cgi script creates a bad uri in web ui

This commit is contained in:
Zdenek Dohnal 2020-06-11 09:04:31 +02:00
parent fb0beccc59
commit 5e54701556
2 changed files with 18 additions and 0 deletions

13
cups-webui-uri.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index a87e6be..4600d33 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -974,6 +974,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
cgiSetVariable("TEMPLATE_NAME", template);
}
+
+ cgiSetVariable("DEVICE_URI", var);
}
}

View File

@ -103,6 +103,9 @@ Patch25: cups-rastertopwg-crash.patch
# job for disconnected devices are processing for eternity # job for disconnected devices are processing for eternity
# https://github.com/apple/cups/pull/5782 # https://github.com/apple/cups/pull/5782
Patch26: cups-etimedout.patch Patch26: cups-etimedout.patch
# cgi script creates a bad uri in web ui
# https://github.com/apple/cups/pull/5792
Patch27: cups-webui-uri.patch
# selinux and audit enablement for CUPS - needs work and CUPS upstream wants # selinux and audit enablement for CUPS - needs work and CUPS upstream wants
# to have these features implemented their way in the future # to have these features implemented their way in the future
@ -319,6 +322,7 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
# job for disconnected devices are processing for eternity # job for disconnected devices are processing for eternity
# https://github.com/apple/cups/pull/5782 # https://github.com/apple/cups/pull/5782
%patch26 -p1 -b .etimedout %patch26 -p1 -b .etimedout
%patch27 -p1 -b .webui-uri
#### UPSTREAMED PATCHES #### #### UPSTREAMED PATCHES ####
@ -749,6 +753,7 @@ rm -f %{cups_serverbin}/backend/smb
%changelog %changelog
* Thu Jun 11 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-6 * Thu Jun 11 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-6
- fix patch errors in failover patch - fix patch errors in failover patch
- cgi script creates a bad uri in web ui
* Tue Jun 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-5 * Tue Jun 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-5
- remove os ci tests, we use baseos ci - remove os ci tests, we use baseos ci