rpms/cups/F-12 cups-str3425.patch,1.3,1.4 cups.spec,1.579,1.580

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31514

Modified Files:
	cups-str3425.patch cups.spec 
Log Message:
* Wed Mar 10 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-29
- Fixed (for the third time) patch for STR #3425 to correctly
  remove job info files in /var/spool/cups (bug #571830).


cups-str3425.patch:
 job.c  |   29 +++++++++++++++++++----------
 main.c |   21 +++++++++++----------
 2 files changed, 30 insertions(+), 20 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3425.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- cups-str3425.patch	23 Dec 2009 11:11:36 -0000	1.3
+++ cups-str3425.patch	10 Mar 2010 11:07:48 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-23 11:00:06.070056898 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-23 11:02:22.889056232 +0000
+--- cups-1.4.2/scheduler/job.c.str3425	2010-03-09 16:59:12.000000000 +0100
++++ cups-1.4.2/scheduler/job.c	2010-03-09 17:02:57.000000000 +0100
 @@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
        if (purge)
  	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
@@ -24,27 +24,54 @@ diff -up cups-1.4.2/scheduler/job.c.str3
         job = (cupsd_job_t *)cupsArrayNext(Jobs))
      if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
        cupsdDeleteJob(job, CUPSD_JOB_PURGE);
-@@ -2498,8 +2498,6 @@ cupsdSetJobState(
- 	  job->dirty = 1;
+@@ -2286,12 +2286,14 @@ cupsdSetJobState(
+   if (!cupsdLoadJob(job))
+     return;
+ 
+- /*
+-  * Don't do anything if the state is unchanged...
+-  */
+-
+-  if (newstate == (oldstate = job->state_value))
+-    return;
++  /*
++   * Don't do anything if the state is unchanged and we aren't purging the
++   * job...
++   */
++
++   oldstate = job->state_value;
++   if (newstate == oldstate && action != CUPSD_JOB_PURGE)
++     return;
+ 
+  /*
+   * Stop any processes that are working on the current job...
+@@ -2499,7 +2501,14 @@ cupsdSetJobState(
  	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
  	}
--	else if (!job->printer)
--	  cupsdDeleteJob(job, CUPSD_JOB_PURGE);
+ 	else if (!job->printer)
++	{
++	 /*
++	  * Delete the job immediately if not actively printing...
++	  */
++
+ 	  cupsdDeleteJob(job, CUPSD_JOB_PURGE);
++	  job = NULL;
++	}
  	break;
    }
  
-@@ -2507,7 +2505,7 @@ cupsdSetJobState(
+@@ -2507,7 +2516,7 @@ cupsdSetJobState(
    * Finalize the job immediately if we forced things...
    */
  
 -  if (action == CUPSD_JOB_FORCE)
-+  if (action >= CUPSD_JOB_FORCE && job->printer)
++  if (action >= CUPSD_JOB_FORCE && job && job->printer)
      finalize_job(job);
  
   /*
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-23 11:00:05.687056970 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-23 11:00:06.156057773 +0000
+--- cups-1.4.2/scheduler/main.c.str3425	2010-03-09 16:59:12.000000000 +0100
++++ cups-1.4.2/scheduler/main.c	2010-03-09 16:59:12.000000000 +0100
 @@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -p -r1.579 -r1.580
--- cups.spec	5 Mar 2010 10:53:16 -0000	1.579
+++ cups.spec	10 Mar 2010 11:07:48 -0000	1.580
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -562,6 +562,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Mar 10 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-29
+- Fixed (for the third time) patch for STR #3425 to correctly
+  remove job info files in /var/spool/cups (bug #571830).
+
 * Fri Mar  5 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-28
 - Applied patch for CVE-2010-0302 (incomplete fix for CVE-2009-3553,
   bug #557775).