rpms/cups/devel cups-str3425.patch,1.1,1.2 cups.spec,1.567,1.568

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9187

Modified Files:
	cups-str3425.patch cups.spec 
Log Message:
* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
- Fixed patch for STR #3425 by adding in back-ported change from svn
  revision 8936 (bug #548904).


cups-str3425.patch:
 job.c  |    8 +++-----
 main.c |   21 +++++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3425.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3425.patch	8 Dec 2009 12:26:48 -0000	1.1
+++ cups-str3425.patch	19 Dec 2009 13:03:41 -0000	1.2
@@ -1,7 +1,16 @@
 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-08 12:23:15.694500898 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-08 12:23:35.005500733 +0000
-@@ -444,11 +444,11 @@ cupsdCleanJobs(void)
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+@@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
+       if (purge)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
+ 	                 "Job purged by user.");
+-      else
++      else if (job->state_value < IPP_JOB_CANCELED)
+ 	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_DEFAULT,
+ 			 "Job canceled by user.");
+     }
+@@ -433,11 +433,11 @@ cupsdCleanJobs(void)
    cupsd_job_t	*job;			/* Current job */
  
  
@@ -15,7 +24,7 @@ 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);
-@@ -2670,8 +2670,6 @@ cupsdSetJobState(
+@@ -2498,8 +2498,6 @@ cupsdSetJobState(
  	  job->dirty = 1;
  	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
  	}
@@ -25,9 +34,9 @@ diff -up cups-1.4.2/scheduler/job.c.str3
    }
  
 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-08 12:23:15.695501397 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-08 12:23:35.007501250 +0000
-@@ -397,7 +397,7 @@ main(int  argc,				/* I - Number of comm
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+@@ -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.
      */
@@ -36,7 +45,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
      _thread_sys_closefrom(0);
  #endif /* __OpenBSD__ */
  
-@@ -844,8 +844,8 @@ main(int  argc,				/* I - Number of comm
+@@ -817,8 +817,8 @@ main(int  argc,				/* I - Number of comm
  
      if (timeout == 86400 && Launchd && LaunchdTimeout && !NumPolled &&
          !cupsArrayCount(ActiveJobs) &&
@@ -47,7 +56,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  	  (!NumBrowsers || !BrowseLocalProtocols ||
  	   cupsArrayCount(Printers) == 0))))
      {
-@@ -1073,6 +1073,7 @@ main(int  argc,				/* I - Number of comm
+@@ -1046,6 +1046,7 @@ main(int  argc,				/* I - Number of comm
      if ((current_time - senddoc_time) >= 10)
      {
        cupsdCheckJobs();
@@ -55,7 +64,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
        senddoc_time = current_time;
      }
  
-@@ -1231,8 +1232,8 @@ main(int  argc,				/* I - Number of comm
+@@ -1204,8 +1205,8 @@ main(int  argc,				/* I - Number of comm
  #endif /* HAVE_GSSAPI */
  
  #if defined(__APPLE__) && defined(HAVE_DLFCN_H)
@@ -66,7 +75,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
    */
  
    PSQUpdateQuotaProc = NULL;
-@@ -1594,13 +1595,13 @@ launchd_checkin(void)
+@@ -1562,13 +1563,13 @@ launchd_checkin(void)
  
  	if (lis)
  	{
@@ -82,7 +91,7 @@ diff -up cups-1.4.2/scheduler/main.c.str
  		  "launchd_checkin: Adding new listener %s with fd %d...",
  		  httpAddrString(&addr, s, sizeof(s)), fd);
  
-@@ -1654,12 +1655,12 @@ launchd_checkout(void)
+@@ -1622,12 +1623,12 @@ launchd_checkout(void)
  
   /*
    * Create or remove the launchd KeepAlive file based on whether


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -p -r1.567 -r1.568
--- cups.spec	11 Dec 2009 08:31:07 -0000	1.567
+++ cups.spec	19 Dec 2009 13:03:41 -0000	1.568
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -541,6 +541,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Sat Dec 19 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
+- Fixed patch for STR #3425 by adding in back-ported change from svn
+  revision 8936 (bug #548904).
+
 * Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-17
 - Fixed invalid read in cupsAddDest (bug #537460).