rpms/cups/FC-6 cups.spec,1.282,1.283 cups-lspp.patch,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec cups-lspp.patch 
Log Message:
* Wed Nov  1 2006 Tim Waugh <twaugh at redhat.com>
- LSPP patch fix (bug #213498).
- Resolves: rhbz#213498



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- cups.spec	1 Nov 2006 17:52:28 -0000	1.282
+++ cups.spec	1 Nov 2006 18:37:56 -0000	1.283
@@ -148,6 +148,7 @@
 %patch19 -p1 -b .str2056
 %patch20 -p1 -b .str2061
 %patch21 -p1 -b .eggcups
+exit 1
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -426,6 +427,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Nov  1 2006 Tim Waugh <twaugh at redhat.com>
+- LSPP patch fix (bug #213498).
+
 * Wed Nov  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-2.4
 - Send QueueChanged D-Bus signal on all job state changes.
 

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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cups-lspp.patch	17 Oct 2006 10:34:15 -0000	1.12
+++ cups-lspp.patch	1 Nov 2006 18:37:56 -0000	1.13
@@ -1992,7 +1992,7 @@
    fchown(cupsFileNumber(fp), RunUser, Group);
  
 +#ifdef WITH_LSPP
-+  if (strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
++  if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
 +  {
 +    if (getfilecon(filename, &spoolcon) == -1)
 +    {