Commit e844a8b6 authored by Didier Raboud's avatar Didier Raboud

Merge 2.0.3-10 from unstable

parents a99a16c6 91e0246f
......@@ -37,6 +37,28 @@ cups (2.1~b1-1) experimental; urgency=low
-- Didier Raboud <odyx@debian.org> Thu, 09 Jul 2015 13:36:17 +0200
cups (2.0.3-10) unstable; urgency=medium
* Backport upstream patches:
- Fix redirections from CGI scripts (STR: #4538)
- Fix the active jobs loop (STR: #4646)
-- Didier Raboud <odyx@debian.org> Tue, 21 Jul 2015 16:15:03 +0200
cups (2.0.3-9) unstable; urgency=medium
[ Helge Kreutzmann ]
* Update German man page (1606t320f184u)
[ Didier Raboud ]
* Add patch to relax socket access checking to only check read-and-write, not
execution (Closes: #792730)
* Add maintscript stanzas to properly remove the mime.convs and mime.types
conffiles in /etc/cups that are not shipped in this path since
1.4.0~svn8773-1~ (Closes: #792731, LP: #1475683)
-- Didier Raboud <odyx@debian.org> Mon, 20 Jul 2015 17:38:49 +0200
cups (2.0.3-8) unstable; urgency=medium
* Mark the libsystemd as reported (and fixed) upstream
......
# These two were removed in 1.4.0~svn8773-1~, but we're only finally doing this in 2.0.3-9~
rm_conffile /etc/cups/mime.convs 2.0.3-9~
rm_conffile /etc/cups/mime.types 2.0.3-9~
rm_conffile /etc/cups/acroread.conf 1.6.2-9~
rm_conffile /etc/cups/pdftops.conf 1.6.2-9~
rm_conffile /etc/modprobe.d/blacklist-cups-usblp.conf 1.5.3-2.1~
......
This diff is collapsed.
......@@ -17,7 +17,7 @@ Last-Update: 2015-02-10
/*
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2182,7 +2182,7 @@
@@ -2184,7 +2184,7 @@
strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
......
......@@ -37,7 +37,7 @@ Last-Update: 2015-02-10
cupsDirClose(dir);
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1231,7 +1231,7 @@
@@ -1233,7 +1233,7 @@
else if (stat(command, &backinfo))
backroot = 0;
else
......
# patches accepted and committed upstream
str4538-fix-redirection-from-cgi-scripts.patch
str4646-fix-the-activejobs-loop-in-cupsdcheckjobs.patch
# patches sent upstream
pwg-raster-attributes.patch
......@@ -7,6 +9,7 @@ rootbackends-worldreadable.patch
fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
libsystemd.patch
cupsd-logs-manpage-in-section-5.patch
str4679-fix-local-domainsocket-access-checking.patch
# patches which should go upstream
cupsd-upstart-support.patch
......
Description: Fix redirection from CGI scripts
Author: Mike Sweet <msweet@apple.com>
Origin: upstream
Bug: https://cups.org/str.php?L4538
Last-Update: 2015-06-24
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2159,6 +2159,9 @@
http_status_t code, /* I - Error code */
int auth_type)/* I - Authentication type */
{
+ char location[HTTP_MAX_VALUE]; /* Location field */
+
+
cupsdLogClient(con, CUPSD_LOG_DEBUG2, "cupsdSendError code=%d, auth_type=%d",
code, auth_type);
@@ -2191,8 +2194,12 @@
* never disable it in that case.
*/
+ strlcpy(location, httpGetField(con->http, HTTP_FIELD_LOCATION), sizeof(location));
+
httpClearFields(con->http);
+ httpSetField(con->http, HTTP_FIELD_LOCATION, location);
+
if (code >= HTTP_STATUS_BAD_REQUEST && con->type != CUPSD_AUTH_NEGOTIATE)
httpSetKeepAlive(con->http, HTTP_KEEPALIVE_OFF);
Description: Fix the ActiveJobs loop in cupsdCheckJobs()
When looping over the active jobs, if a pending job is started it will
have looped through the ActiveJobs array, meaning further pending
active jobs will be skipped for another 10 seconds (the senddoc
delay).
Author: Tim Waugh <twaugh@redhat.com>
Origin: upstream
Bug: https://cups.org/str.php?L4646
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -392,7 +392,9 @@
* Start the job...
*/
+ cupsArraySave(ActiveJobs);
start_job(job, printer);
+ cupsArrayRestore(ActiveJobs);
}
}
}
Description: In absence of client.conf configuration, the default domain socket
(/var/run/cups/cups.sock) will get checked for read, write and execution bits,
but the latter doesn't make sense
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Bug: https://www.cups.org/str.php?L4679
Bug-Debian: https://bugs.debian.org/792730
Last-Update: 2015-07-18
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1017,7 +1017,7 @@
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+ (sockinfo.st_mode & (S_IROTH | S_IWOTH) ) == (S_IROTH | S_IWOTH))
cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
......@@ -3,3 +3,6 @@
set -e -u
/usr/share/cups/test-drivers
echo "Check that the default hostname is the socket"
test "`lpstat -H`" = "/var/run/cups/cups.sock"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment