rpms/cups/devel cups-lspp.patch, 1.5, 1.6 cups-str1881.patch, 1.3, 1.4 cups.spec, 1.253, 1.254

[fedora-cvs-commits redhat com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27569

Modified Files:
	cups-lspp.patch cups-str1881.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh redhat com>
- Fixed another LSPP patch problem (bug #203784).
- Updated fix for STR #1881 from upstream.


cups-lspp.patch:
 Makedefs.in                     |    2 
 config-scripts/cups-lspp.m4     |   36 +++++
 config.h.in                     |    7 +
 configure.in                    |    2 
 cups-1.2.2/scheduler/printers.c |   44 ++++++
 cups/cups.h                     |    8 +
 data/Makefile                   |    5 
 data/mls                        |  277 ++++++++++++++++++++++++++++++++++++++++
 data/selinux                    |  277 ++++++++++++++++++++++++++++++++++++++++
 data/te                         |  277 ++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile              |    6 
 scheduler/client.c              |  101 ++++++++++++++
 scheduler/client.h              |   14 ++
 scheduler/conf.c                |   46 ++++++
 scheduler/conf.h                |    8 +
 scheduler/ipp.c                 |  271 +++++++++++++++++++++++++++++++++++++++
 scheduler/job.c                 |  155 ++++++++++++++++++++++
 scheduler/job.h                 |   11 +
 scheduler/lspp-access.c         |   56 ++++++++
 scheduler/main.c                |   32 ++++
 20 files changed, 1629 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cups-lspp.patch	24 Aug 2006 11:40:19 -0000	1.5
+++ cups-lspp.patch	24 Aug 2006 15:50:51 -0000	1.6
@@ -1429,7 +1429,7 @@
 +      if (attr->num_values > 1)
 +        userfooter = strdup(attr->values[1].string.text);
 +  
-+      if ((strcmp(userheader, Classification) == 0)
++      if (Classification != NULL && (strcmp(userheader, Classification) == 0)
 +          && userfooter &&(strcmp(userfooter, Classification) == 0))
 +      {
 +       /*

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/devel/cups-str1881.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-str1881.patch	16 Aug 2006 09:08:21 -0000	1.3
+++ cups-str1881.patch	24 Aug 2006 15:50:51 -0000	1.4
@@ -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/devel/cups.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- cups.spec	24 Aug 2006 11:40:19 -0000	1.253
+++ cups.spec	24 Aug 2006 15:50:51 -0000	1.254
@@ -420,6 +420,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh redhat com>
+- Fixed another LSPP patch problem (bug #203784).
+- Updated fix for STR #1881 from upstream.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-16
 - Fixed another LSPP patch problem noted by Erwin Rol.