From 57543d87b632b2fdb44c7a1e56bf2c787ae49c85 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Tue, 18 Apr 2017 14:15:39 -0400
Subject: [PATCH] Fix regression in job file preservation (Issue #4987)

---
 CHANGES.txt     | 7 ++++++-
 INSTALL.txt     | 2 +-
 README.txt      | 2 +-
 configure.ac    | 2 +-
 cups/cups.h     | 4 ++--
 scheduler/job.c | 2 +-
 vcnet/config.h  | 4 ++--
 xcode/config.h  | 4 ++--
 8 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 769a61a8e..7e3afb26f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 2.2.3 - 2017-03-28
+CHANGES.txt - 2.2.4 - 2017-04-18
 --------------------------------
 
+CHANGES IN CUPS V2.2.4
+
+	- The scheduler did not remote old job files (Issue #4987)
+
+
 CHANGES IN CUPS V2.2.3
 
 	- The IPP backend could get into an infinite loop for certain errors,
diff --git a/INSTALL.txt b/INSTALL.txt
index b2996cd80..198937d64 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v2.2.3 - 2017-03-28
+INSTALL - CUPS v2.2.4 - 2017-04-18
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
diff --git a/README.txt b/README.txt
index a6a6079ac..f4ecdfa87 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v2.2.3 - 2017-03-28
+README - CUPS v2.2.4 - 2017-04-18
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
diff --git a/configure.ac b/configure.ac
index ad3ec8e36..b79a738f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl We need at least autoconf 2.60...
 AC_PREREQ(2.60)
 
 dnl Package name and version...
-AC_INIT([CUPS], [2.2.3], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
+AC_INIT([CUPS], [2.2.4], [https://github.com/apple/cups/issues], [cups], [https://www.cups.org/])
 
 sinclude(config-scripts/cups-opsys.m4)
 sinclude(config-scripts/cups-common.m4)
diff --git a/cups/cups.h b/cups/cups.h
index 3205dd82f..7e117bae6 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -47,10 +47,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			2.0203
+#  define CUPS_VERSION			2.0204
 #  define CUPS_VERSION_MAJOR		2
 #  define CUPS_VERSION_MINOR		2
-#  define CUPS_VERSION_PATCH		3
+#  define CUPS_VERSION_PATCH		4
 
 #  define CUPS_BC_FD			3
 					/* Back-channel file descriptor for
diff --git a/scheduler/job.c b/scheduler/job.c
index 782401555..a8ba54c33 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2745,7 +2745,7 @@ cupsdSetJobState(
 	  job->dirty = 1;
 	  cupsdMarkDirty(CUPSD_DIRTY_JOBS);
 	}
-	else if (!JobHistory && !job->printer)
+	else if (!job->printer)
 	{
 	 /*
 	  * Delete the job immediately if not actively printing...
diff --git a/vcnet/config.h b/vcnet/config.h
index 05fe9b2a0..ef4258533 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -94,8 +94,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2.3"
-#define CUPS_MINIMAL "CUPS/2.2.3"
+#define CUPS_SVERSION "CUPS v2.2.4"
+#define CUPS_MINIMAL "CUPS/2.2.4"
 
 
 /*
diff --git a/xcode/config.h b/xcode/config.h
index 26b12a71b..61593a9ac 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -22,8 +22,8 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.2.3"
-#define CUPS_MINIMAL "CUPS/2.2.3"
+#define CUPS_SVERSION "CUPS v2.2.4"
+#define CUPS_MINIMAL "CUPS/2.2.4"
 
 
 /*
-- 
2.39.2