Compare commits
2 Commits
6388fa51b8
...
150bc4863f
Author | SHA1 | Date | |
---|---|---|---|
|
150bc4863f | ||
|
e7f50abf2a |
1
.cups.metadata
Normal file
1
.cups.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
23108e0f6ca7d8caa1a6a6224f5322e21ba0a27d cups-2.3.3op2-source.tar.gz
|
@ -0,0 +1,32 @@
|
|||||||
|
From 8ae6eb11184dcbd9eaf3c6badd4fad59fcc3863a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Mon, 15 Aug 2022 17:38:12 +0200
|
||||||
|
Subject: [PATCH] cups/dest.c: Write data into /etc/cups/lpoptions if we're
|
||||||
|
root
|
||||||
|
|
||||||
|
Fixes #454 , the patch is created by Yair Yarom
|
||||||
|
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008053).
|
||||||
|
---
|
||||||
|
cups/dest.c | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cups/dest.c b/cups/dest.c
|
||||||
|
index f563ce226..a9273ff93 100644
|
||||||
|
--- a/cups/dest.c
|
||||||
|
+++ b/cups/dest.c
|
||||||
|
@@ -2080,7 +2080,11 @@ cupsSetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_
|
||||||
|
|
||||||
|
snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot);
|
||||||
|
|
||||||
|
- if (cg->home)
|
||||||
|
+ if (cg->home
|
||||||
|
+#ifndef _WIN32
|
||||||
|
+ && getuid() != 0
|
||||||
|
+#endif /* !_WIN32 */
|
||||||
|
+ )
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Create ~/.cups subdirectory...
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
64
0001-scheduler-Fix-sending-response-headers-to-client.patch
Normal file
64
0001-scheduler-Fix-sending-response-headers-to-client.patch
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
From d60341b3355fd8825bec00792f301ef99d715a93 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Wed, 3 Apr 2024 10:39:24 +0200
|
||||||
|
Subject: [PATCH] scheduler: Fix sending response headers to client
|
||||||
|
|
||||||
|
Sometimes headers are not correctly copied into response to the client
|
||||||
|
(some are missing). It happens because `sent_header` is set prematurely
|
||||||
|
before the actual send happens. The present code in affected `cupsdWriteClient`
|
||||||
|
scope looks like code remains from CUPS 1.6.3.
|
||||||
|
|
||||||
|
With the change, testing via curl gives reliable results all time.
|
||||||
|
---
|
||||||
|
scheduler/client.c | 15 ++++-----------
|
||||||
|
1 file changed, 4 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scheduler/client.c b/scheduler/client.c
|
||||||
|
index 62ac21c69..e7e312b8e 100644
|
||||||
|
--- a/scheduler/client.c
|
||||||
|
+++ b/scheduler/client.c
|
||||||
|
@@ -2400,23 +2400,12 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */
|
||||||
|
httpSetField(con->http, field, value);
|
||||||
|
|
||||||
|
if (field == HTTP_FIELD_LOCATION)
|
||||||
|
- {
|
||||||
|
con->pipe_status = HTTP_STATUS_SEE_OTHER;
|
||||||
|
- con->sent_header = 2;
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- con->sent_header = 1;
|
||||||
|
}
|
||||||
|
else if (!_cups_strcasecmp(con->header, "Status") && value)
|
||||||
|
- {
|
||||||
|
con->pipe_status = (http_status_t)atoi(value);
|
||||||
|
- con->sent_header = 2;
|
||||||
|
- }
|
||||||
|
else if (!_cups_strcasecmp(con->header, "Set-Cookie") && value)
|
||||||
|
- {
|
||||||
|
httpSetCookie(con->http, value);
|
||||||
|
- con->sent_header = 1;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -2451,6 +2440,8 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */
|
||||||
|
cupsdCloseClient(con);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ con->sent_header = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -2459,6 +2450,8 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */
|
||||||
|
cupsdCloseClient(con);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ con->sent_header = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
17
cups.spec
17
cups.spec
@ -24,7 +24,7 @@ Summary: CUPS printing system
|
|||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.3.3%{OP_VER}
|
Version: 2.3.3%{OP_VER}
|
||||||
Release: 24%{?dist}
|
Release: 26%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
||||||
@ -132,6 +132,11 @@ Patch37: cups-preservejobfiles-leak.patch
|
|||||||
Patch38: 0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch
|
Patch38: 0001-scheduler-conf.c-Print-to-stderr-if-we-don-t-open-cu.patch
|
||||||
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
||||||
Patch39: 0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch
|
Patch39: 0001-httpAddrConnect2-Check-for-error-if-POLLHUP-is-in-va.patch
|
||||||
|
# https://github.com/OpenPrinting/cups/pull/927
|
||||||
|
Patch40: 0001-scheduler-Fix-sending-response-headers-to-client.patch
|
||||||
|
# RHEL-32727 lpoptions with root writes to ~/.cups/lpoptions
|
||||||
|
# https://github.com/OpenPrinting/cups/pull/456
|
||||||
|
Patch41: 0001-cups-dest.c-Write-data-into-etc-cups-lpoptions-if-we.patch
|
||||||
|
|
||||||
|
|
||||||
##### Patches removed because IMHO they aren't no longer needed
|
##### Patches removed because IMHO they aren't no longer needed
|
||||||
@ -393,6 +398,10 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
|
|||||||
%patch38 -p1 -b .log-stderr
|
%patch38 -p1 -b .log-stderr
|
||||||
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
# RHEL-19495 cupsGetJobs fails to connect if poll() gets POLLOUT|POLLHUP in revents
|
||||||
%patch39 -p1 -b .cupsgetjobs-pollhup
|
%patch39 -p1 -b .cupsgetjobs-pollhup
|
||||||
|
# https://github.com/OpenPrinting/cups/pull/927
|
||||||
|
%patch40 -p1 -b .sent-headers
|
||||||
|
# RHEL-32727 lpoptions with root writes to ~/.cups/lpoptions
|
||||||
|
%patch41 -p1 -b .root-lpoptions
|
||||||
|
|
||||||
%if %{lspp}
|
%if %{lspp}
|
||||||
# LSPP support.
|
# LSPP support.
|
||||||
@ -827,6 +836,12 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man7/ippeveps.7.gz
|
%{_mandir}/man7/ippeveps.7.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 15 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-26
|
||||||
|
- RHEL-32727 lpoptions with root writes to ~/.cups/lpoptions
|
||||||
|
|
||||||
|
* Fri Apr 05 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-25
|
||||||
|
- RHEL-29764 cups doesn't send Content-Type header back to client when Set-Cookie is seen first
|
||||||
|
|
||||||
* Mon Feb 26 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-24
|
* Mon Feb 26 2024 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-24
|
||||||
- revert RHEL-19205 - new packages are not needed
|
- revert RHEL-19205 - new packages are not needed
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user