|
|
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11139
Modified Files:
cups-str1881.patch cups.spec
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh@xxxxxxxxxx>
- Updated fix for STR #1881 from upstream.
cups-str1881.patch:
backend/ipp.c | 3 +++
scheduler/job.c | 22 +++++++---------------
scheduler/printers.c | 12 ++++++++----
scheduler/printers.h | 1 +
4 files changed, 19 insertions(+), 19 deletions(-)
Index: cups-str1881.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-str1881.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-str1881.patch 16 Aug 2006 09:14:46 -0000 1.2
+++ cups-str1881.patch 24 Aug 2006 16:18:46 -0000 1.3
@@ -1,5 +1,5 @@
---- cups-1.2.2/scheduler/job.c.str1881 2006-08-16 09:42:32.000000000 +0100
-+++ cups-1.2.2/scheduler/job.c 2006-08-16 09:43:26.000000000 +0100
+--- cups-1.2.2/scheduler/job.c.str1881 2006-08-24 16:05:14.000000000 +0100
++++ cups-1.2.2/scheduler/job.c 2006-08-24 16:05:46.000000000 +0100
@@ -2425,7 +2425,6 @@
/* PRINTER env variable */
rip_max_cache[255];
@@ -45,17 +45,16 @@
{
for (i = 0; i < job->num_files; i ++)
{
-@@ -3018,7 +3010,8 @@
- envp[envc ++] = device_uri;
- envp[envc ++] = printer_name;
-
-- if ((filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
-+ if (!printer->remote &&
-+ (filter = (mime_filter_t *)cupsArrayLast(filters)) != NULL)
+@@ -3022,7 +3014,7 @@
{
snprintf(final_content_type, sizeof(final_content_type),
"FINAL_CONTENT_TYPE=%s/%s",
-@@ -3059,7 +3052,7 @@
+- filter->src->super, filter->src->type);
++ filter->dst->super, filter->dst->type);
+ envp[envc ++] = final_content_type;
+ }
+
+@@ -3059,7 +3051,7 @@
cupsdLogMessage(CUPSD_LOG_DEBUG, "[Job %d] envp[%d]=\"DEVICE_URI=%s\"",
job->id, i, sani_uri);
@@ -64,7 +63,7 @@
job->current_file = job->num_files;
else
job->current_file ++;
-@@ -3401,7 +3394,7 @@
+@@ -3401,7 +3393,7 @@
slot, filterfds[slot][0], filterfds[slot][1]);
cupsdClosePipe(filterfds[slot]);
@@ -73,7 +72,7 @@
{
for (i = 0; i < job->num_files; i ++)
free(argv[i + 6]);
-@@ -3445,7 +3438,7 @@
+@@ -3445,7 +3437,7 @@
cupsArrayDelete(filters);
@@ -83,7 +82,7 @@
for (i = 0; i < job->num_files; i ++)
free(argv[i + 6]);
--- cups-1.2.2/scheduler/printers.h.str1881 2006-03-23 21:07:20.000000000
+0000
-+++ cups-1.2.2/scheduler/printers.h 2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/scheduler/printers.h 2006-08-24 16:05:14.000000000 +0100
@@ -66,6 +66,7 @@
char *device_uri; /* Device URI */
char *port_monitor; /* Port monitor */
@@ -92,8 +91,8 @@
mime_type_t *filetype; /* Pseudo-filetype for printer */
cups_array_t *filetypes; /* Supported file types */
void *job; /* Current job in queue */
---- cups-1.2.2/scheduler/printers.c.str1881 2006-08-16 09:42:32.000000000
+0100
-+++ cups-1.2.2/scheduler/printers.c 2006-08-16 09:42:48.000000000 +0100
+--- cups-1.2.2/scheduler/printers.c.str1881 2006-08-24 16:05:14.000000000
+0100
++++ cups-1.2.2/scheduler/printers.c 2006-08-24 16:05:14.000000000 +0100
@@ -1502,7 +1502,8 @@
else
snprintf(resource, sizeof(resource), "/printers/%s", p->name);
@@ -135,7 +134,7 @@
else
{
--- cups-1.2.2/backend/ipp.c.str1881 2006-07-12 20:42:35.000000000 +0100
-+++ cups-1.2.2/backend/ipp.c 2006-08-16 09:42:48.000000000 +0100
++++ cups-1.2.2/backend/ipp.c 2006-08-24 16:05:14.000000000 +0100
@@ -214,6 +214,9 @@
if ((content_type = getenv("CONTENT_TYPE")) == NULL)
content_type = "application/octet-stream";
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- cups.spec 18 Aug 2006 14:54:27 -0000 1.211
+++ cups.spec 24 Aug 2006 16:18:46 -0000 1.212
@@ -415,6 +415,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh@xxxxxxxxxx>
+- Updated fix for STR #1881 from upstream.
+
* Fri Aug 18 2006 Tim Waugh <twaugh@xxxxxxxxxx>
- Own notifier directory (bug #203085).
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|