rpms/cups/devel cups-lspp.patch,1.4,1.5 cups.spec,1.252,1.253

[fedora-cvs-commits redhat com]

Author: twaugh

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

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-16
- Fixed another LSPP patch problem noted by Erwin Rol.


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-lspp.patch	24 Aug 2006 09:50:28 -0000	1.4
+++ cups-lspp.patch	24 Aug 2006 11:40:19 -0000	1.5
@@ -2058,8 +2058,8 @@
  	-$(RMDIR) $(STATEDIR)/certs
  	-$(RMDIR) $(STATEDIR)
  	-$(RMDIR) $(SERVERROOT)/ppd
---- cups-1.2.2-8/scheduler/printers.c	2006-08-10 11:43:02.000000000 -0400
-+++ cups-1.2.2/scheduler/printers.c	2006-08-14 06:09:33.000000000 -0400
+--- cups-1.2.2/scheduler/printers.c.lspp	2006-08-24 12:28:38.000000000 +0100
++++ cups-1.2.2/scheduler/printers.c	2006-08-24 12:30:49.000000000 +0100
 @@ -57,6 +57,8 @@
   *                                 printing desktop tools.
   */
@@ -2094,7 +2094,7 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1578,6 +1591,38 @@
+@@ -1579,6 +1592,37 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
@@ -2112,12 +2112,11 @@
 +            cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
 +        else
 +          printercon = context_new(devcon);
-+
-+        if (context_range_get(printercon))
-+          rangestr = strdup(context_range_get(printercon));
 +      }
 +
-+      if (rangestr == NULL)
++      if (printercon && context_range_get(printercon))
++	rangestr = strdup(context_range_get(printercon));
++      else
 +        rangestr = strdup("unknown");
 +
 +      cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s has range %s",


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- cups.spec	24 Aug 2006 09:50:28 -0000	1.252
+++ cups.spec	24 Aug 2006 11:40:19 -0000	1.253
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 15
+Release: 16
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-16
+- Fixed another LSPP patch problem noted by Erwin Rol.
+
 * Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-15
 - Fixed LSPP patch passing NULL to strcmp (bug #203784).