diff --git a/cups-str3880.patch b/cups-str3880.patch new file mode 100644 index 0000000..514fc84 --- /dev/null +++ b/cups-str3880.patch @@ -0,0 +1,34 @@ +diff -up cups-1.5rc1/scheduler/job.c.str3880 cups-1.5rc1/scheduler/job.c +--- cups-1.5rc1/scheduler/job.c.str3880 2011-07-20 13:25:04.830715537 +0100 ++++ cups-1.5rc1/scheduler/job.c 2011-07-20 13:25:33.637200511 +0100 +@@ -1407,17 +1407,22 @@ cupsdDeleteJob(cupsd_job_t *job, / + free(job->compressions); + free(job->filetypes); + +- while (job->num_files > 0) ++ if (action == CUPSD_JOB_PURGE) + { +- snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, +- job->id, job->num_files); +- if (Classification) +- cupsdRemoveFile(filename); +- else +- unlink(filename); ++ while (job->num_files > 0) ++ { ++ snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, ++ job->id, job->num_files); ++ if (Classification) ++ cupsdRemoveFile(filename); ++ else ++ unlink(filename); + +- job->num_files --; ++ job->num_files --; ++ } + } ++ else ++ job->num_files = 0; + } + + if (job->history) diff --git a/cups.spec b/cups.spec index 2dcc908..1d8e1c9 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.5 -Release: 0.15.%{alphatag}%{?dist} +Release: 0.16.%{alphatag}%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2 @@ -67,6 +67,7 @@ Patch29: cups-ricoh-deviceid-oid.patch Patch31: cups-avahi.patch Patch32: cups-icc.patch Patch33: cups-systemd-socket.patch +Patch34: cups-str3880.patch Patch100: cups-lspp.patch @@ -279,6 +280,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results. # Poettering). %patch33 -p1 -b .systemd-socket +# Don't delete job data files when restarted (STR #3880). +%patch34 -p1 -b .str3880 + %if %lspp # LSPP support. %patch100 -p1 -b .lspp @@ -625,6 +629,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/ipptool.1.gz %changelog +* Wed Jul 20 2011 Tim Waugh 1:1.5-0.16.rc1 +- Don't delete job data files when restarted (STR #3880). + * Fri Jul 15 2011 Tim Waugh 1:1.5-0.15.rc1 - Ship an rpm macro for where to put driver executables.