rpms/cups/FC-6 cups-lspp.patch,1.11,1.12 cups.spec,1.273,1.274

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Tue Oct 17 2006 Tim Waugh <twaugh at redhat.com>
- Feature-complete LSPP patch from Matt Anderson (bug #210542).
- Resolves: rhbz#210542


cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++
 config.h.in                 |    7 
 configure.in                |    2 
 cups/cups.h                 |    9 
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++
 scheduler/client.c          |  170 ++++++++++++++++
 scheduler/client.h          |   14 +
 scheduler/conf.c            |   46 ++++
 scheduler/conf.h            |    7 
 scheduler/ipp.c             |  452 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  245 +++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/main.c            |   32 +++
 scheduler/printers.c        |   49 ++++
 18 files changed, 1915 insertions(+), 3 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups-lspp.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cups-lspp.patch	13 Oct 2006 15:12:51 -0000	1.11
+++ cups-lspp.patch	17 Oct 2006 10:34:15 -0000	1.12
@@ -955,7 +955,7 @@
  OPTIONS		=
  PAMLIBS		=	@PAMLIBS@
 --- cups-1.2.4-orig/scheduler/client.c	2006-09-19 16:44:07.000000000 -0400
-+++ cups-1.2.4/scheduler/client.c	2006-10-11 17:44:43.000000000 -0400
++++ cups-1.2.4/scheduler/client.c	2006-10-16 15:30:02.000000000 -0400
 @@ -44,12 +44,17 @@
   *   make_certificate()      - Make a self-signed SSL/TLS certificate.
   *   pipe_command()          - Pipe the output of a command to the remote client.
@@ -1037,7 +1037,7 @@
 +  }
 +  else
 +  {
-+    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: skipping getpeercon()");
++    cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()");
 +    cupsdSetString(&con->scon, UNKNOWN_SL);
 +  }
 +#endif /* WITH_LSPP */
@@ -1336,7 +1336,7 @@
  /*
   * End of "$Id$".
 --- cups-1.2.4-orig/scheduler/ipp.c	2006-09-28 11:38:08.000000000 -0400
-+++ cups-1.2.4/scheduler/ipp.c	2006-10-09 12:16:35.000000000 -0400
++++ cups-1.2.4/scheduler/ipp.c	2006-10-16 15:30:02.000000000 -0400
 @@ -96,6 +96,9 @@
   *   validate_user()             - Validate the user for the request.
   */
@@ -1426,7 +1426,7 @@
 +                      printerfile);
 +
 +      tclass = SECCLASS_FILE;
-+      avr = FILE__WRITE;
++      avr = CHR_FILE__WRITE;
 +      avc_init("cupsd_enqueue_", NULL, NULL, NULL, NULL);
 +      avc_entry_ref_init(&avcref);
 +      if (avc_context_to_sid(con->scon, &clisid) != 0)
@@ -1477,7 +1477,7 @@
 +   /*
 +    * Fill in the security context of the job as unlabeled
 +    */
-+    cupsdLogMessage(CUPSD_LOG_INFO, "add_job: setting context of job to %s", UNKNOWN_SL);
++    cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: setting context of job to %s", UNKNOWN_SL);
 +    cupsdSetString(&job->scon, UNKNOWN_SL);
 +  }
 +#endif /* WITH_LSPP */
@@ -1923,7 +1923,7 @@
    * Check the username against the owner...
    */
 --- cups-1.2.4-orig/scheduler/job.c	2006-09-28 11:38:08.000000000 -0400
-+++ cups-1.2.4/scheduler/job.c	2006-10-09 12:16:35.000000000 -0400
++++ cups-1.2.4/scheduler/job.c	2006-10-16 15:30:02.000000000 -0400
 @@ -68,6 +68,9 @@
   *   unload_job()               - Unload a job from memory.
   */
@@ -2100,7 +2100,7 @@
 +      cupsdLogMessage(CUPSD_LOG_DEBUG,
 +                      "StartJob: Attempting to check access on printer device %s", printerfile);
 +      tclass = SECCLASS_FILE;
-+      avr = FILE__WRITE;
++      avr = CHR_FILE__WRITE;
 +      avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL);
 +      avc_entry_ref_init(&avcref);
 +      if (avc_context_to_sid(job->scon, &clisid) != 0)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- cups.spec	13 Oct 2006 15:12:51 -0000	1.273
+++ cups.spec	17 Oct 2006 10:34:15 -0000	1.274
@@ -415,7 +415,7 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Fri Oct 13 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Oct 17 2006 Tim Waugh <twaugh at redhat.com>
 - Feature-complete LSPP patch from Matt Anderson (bug #210542).
 
 * Thu Oct  5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.4-9