rpms/cups/F-11 cups-str3292.patch,1.1,1.2 cups.spec,1.510,1.511

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups-str3292.patch cups.spec 
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed buggy JobKillDelay handling fix (STR #3292).


cups-str3292.patch:
 job.c  |   14 +++++++++-----
 main.c |    7 +++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

Index: cups-str3292.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-str3292.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3292.patch	19 Aug 2009 14:08:51 -0000	1.1
+++ cups-str3292.patch	26 Aug 2009 16:42:54 -0000	1.2
@@ -1,23 +1,25 @@
-diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.cancel-job	2009-08-19 14:48:55.733825903 +0100
-+++ cups-1.4rc1/scheduler/job.c	2009-08-19 14:49:01.813826101 +0100
-@@ -2359,19 +2359,21 @@ cupsdSetJobState(
+diff -up cups-1.4rc1/scheduler/job.c.str3292 cups-1.4rc1/scheduler/job.c
+--- cups-1.4rc1/scheduler/job.c.str3292	2009-08-26 17:01:19.442314736 +0100
++++ cups-1.4rc1/scheduler/job.c	2009-08-26 17:03:51.993190253 +0100
+@@ -2359,19 +2359,23 @@ cupsdSetJobState(
          break;
  
      case IPP_JOB_ABORTED :
 -    case IPP_JOB_CANCELED :
      case IPP_JOB_COMPLETED :
++    case IPP_JOB_CANCELED :
         /*
 -        * Expire job subscriptions since the job is now "completed"...
-+	* Remove the job from the active list...
++	* Remove the job from the active list if there are no
++	* processes still running for it...
  	*/
  
 -        cupsdExpireSubscriptions(NULL, job);
-+	cupsArrayRemove(ActiveJobs, job);
-+
-+	/* fall through... */
++	for (i = 0; job->filters[i] < 0; i++);
++	if (newstate != IPP_JOB_CANCELED ||
++	    (!job->filters[i] && job->backend <= 0))
++	    cupsArrayRemove(ActiveJobs, job);
  
-+    case IPP_JOB_CANCELED :
         /*
 -	* Remove the job from the active list...
 +        * Expire job subscriptions since the job is now "completed"...
@@ -28,9 +30,9 @@ diff -up cups-1.4rc1/scheduler/job.c.can
  
  #ifdef __APPLE__
         /*
-diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.cancel-job	2009-08-19 14:48:55.451701014 +0100
-+++ cups-1.4rc1/scheduler/main.c	2009-08-19 14:49:01.817825841 +0100
+diff -up cups-1.4rc1/scheduler/main.c.str3292 cups-1.4rc1/scheduler/main.c
+--- cups-1.4rc1/scheduler/main.c.str3292	2009-08-26 17:01:19.084319753 +0100
++++ cups-1.4rc1/scheduler/main.c	2009-08-26 17:03:52.005190304 +0100
 @@ -1803,6 +1803,13 @@ process_children(void)
  	    cupsdContinueJob(job);
  	  }
@@ -39,7 +41,7 @@ diff -up cups-1.4rc1/scheduler/main.c.ca
 +	{
 +	  for (i = 0; job->filters[i] < 0; i++);
 +
-+	  if (!job->filters[i] && job->backend < 0)
++	  if (!job->filters[i] && job->backend <= 0)
 +	    cupsArrayRemove(ActiveJobs, job);
 +	}
        }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- cups.spec	21 Aug 2009 14:51:20 -0000	1.510
+++ cups.spec	26 Aug 2009 16:42:54 -0000	1.511
@@ -531,7 +531,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed buggy JobKillDelay handling fix (STR #3292).
 - Prevent infinite loop in ppdc (STR #3293).
 
 * Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.17