Imported Upstream version 1.4.8upstream/1.4.8

9 files changed, 41 insertions, 26 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 92301c45..70e42ba4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
-CHANGES.txt - 2011-06-20
+CHANGES.txt - 2011-07-25
 ------------------------
 
+CHANGES IN CUPS V1.4.8
+
+	- The scheduler would delete job data files when restarted (STR #3880)
+	- The network backends could crash if a printer returned a value of 0
+	  for the maximum capacity for a supply (STR #3875)
+
+
 CHANGES IN CUPS V1.4.7
 
 	- Documentation changes (STR #3710, STR #3720, STR #3745, STR #3750,
diff --git a/INSTALL.txt b/INSTALL.txt
index fbec65e9..833acb9c 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.4.7 - 2011-01-06
+INSTALL - CUPS v1.4.8 - 2011-07-25
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
diff --git a/README.txt b/README.txt
index ab9ebdcc..bb45c8d5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v1.4.7 - 2011-01-06
+README - CUPS v1.4.8 - 2011-07-25
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index f7d79353..8d0dcd76 100644
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp-supplies.c 9592 2011-03-10 03:50:59Z mike $"
+ * "$Id: snmp-supplies.c 9853 2011-07-06 20:27:31Z mike $"
  *
  *   SNMP supplies functions for CUPS.
  *
@@ -233,7 +233,10 @@ backendSNMPSupplies(
 
     for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
     {
-      percent = 100 * supplies[i].level / supplies[i].max_capacity;
+      if (supplies[i].max_capacity > 0)
+	percent = 100 * supplies[i].level / supplies[i].max_capacity;
+      else
+        percent = 50;
 
       if (percent <= 10)
       {
@@ -986,5 +989,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id: snmp-supplies.c 9592 2011-03-10 03:50:59Z mike $".
+ * End of "$Id: snmp-supplies.c 9853 2011-07-06 20:27:31Z mike $".
  */
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index f43b8968..89a2860a 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 9482 2011-01-14 18:57:44Z mike $"
+dnl "$Id: cups-common.m4 9853 2011-07-06 20:27:31Z mike $"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION=1.4.7
+CUPS_VERSION=1.4.8
 CUPS_REVISION=
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -338,7 +338,7 @@ case $uname in
  		AC_ARG_WITH(operkey, [  --with-operkey          set the default operator @AUTHKEY value],
 			default_operkey="$withval",
 			default_operkey="default")
- 
+
 		AC_CHECK_HEADER(Security/Authorization.h, [
 			AC_DEFINE(HAVE_AUTHORIZATION_H)
 
@@ -371,5 +371,5 @@ AC_SUBST(FONTS)
 AC_SUBST(LEGACY_BACKENDS)
 
 dnl
-dnl End of "$Id: cups-common.m4 9482 2011-01-14 18:57:44Z mike $".
+dnl End of "$Id: cups-common.m4 9853 2011-07-06 20:27:31Z mike $".
 dnl
diff --git a/configure b/configure
index 8aefa951..df7bc90f 100755
--- a/configure
+++ b/configure
@@ -1989,7 +1989,7 @@ esac
 ac_config_headers="$ac_config_headers config.h"
 
 
-CUPS_VERSION=1.4.7
+CUPS_VERSION=1.4.8
 CUPS_REVISION=
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
diff --git a/cups/cups.h b/cups/cups.h
index 2eef92b1..5250adc1 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 9426 2011-01-06 22:48:42Z mike $"
+ * "$Id: cups.h 9853 2011-07-06 20:27:31Z mike $"
  *
  *   API definitions for CUPS.
  *
@@ -61,10 +61,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION		1.0407
+#  define CUPS_VERSION		1.0408
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	4
-#  define CUPS_VERSION_PATCH	7
+#  define CUPS_VERSION_PATCH	8
 
 #  define CUPS_BC_FD		3	/* Back-channel file descriptor for select/poll */
 #  define CUPS_DATE_ANY		(time_t)-1
@@ -336,5 +336,5 @@ extern http_status_t	cupsWriteRequestData(http_t *http, const char *buffer,
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 9426 2011-01-06 22:48:42Z mike $".
+ * End of "$Id: cups.h 9853 2011-07-06 20:27:31Z mike $".
  */
diff --git a/packaging/cups.spec b/packaging/cups.spec
index d1d84991..a2d6b38e 100644
--- a/packaging/cups.spec
+++ b/packaging/cups.spec
@@ -34,12 +34,12 @@
 
 Summary: CUPS
 Name: cups
-Version: 1.4.7
+Version: 1.4.8
 Release: 1
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: http://ftp.easysw.com/pub/cups/1.4.7/cups-1.4.7-source.tar.gz
+Source: http://ftp.easysw.com/pub/cups/1.4.8/cups-1.4.8-source.tar.bz2
 Url: http://www.cups.org
 Packager: Anonymous <anonymous@foo.com>
 Vendor: Apple Inc.
diff --git a/scheduler/job.c b/scheduler/job.c
index 8db3b824..b70527fb 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 9716 2011-04-22 22:38:01Z mike $"
+ * "$Id: job.c 9855 2011-07-14 15:43:07Z mike $"
  *
  *   Job management routines for the CUPS scheduler.
  *
@@ -291,7 +291,7 @@ cupsdCheckJobs(void)
 
     if (job->kill_time && job->kill_time <= curtime)
     {
-      cupsdLogMessage(CUPSD_LOG_ERROR, "[Job %d] Stopping unresponsive job!", 
+      cupsdLogMessage(CUPSD_LOG_ERROR, "[Job %d] Stopping unresponsive job!",
 		      job->id);
 
       stop_job(job, CUPSD_JOB_FORCE);
@@ -1274,14 +1274,19 @@ cupsdDeleteJob(cupsd_job_t       *job,	/* I - 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);
-      unlink(filename);
+      while (job->num_files > 0)
+      {
+	snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot,
+		 job->id, job->num_files);
+	unlink(filename);
 
-      job->num_files --;
+	job->num_files --;
+      }
     }
+    else
+      job->num_files = 0;
   }
 
   if (job->history)
@@ -3160,7 +3165,7 @@ get_options(cupsd_job_t *job,		/* I - Job */
 				 IPP_TAG_ZERO)) != NULL &&
 	(attr->value_tag == IPP_TAG_KEYWORD ||
 	 attr->value_tag == IPP_TAG_NAME) &&
-	(ppd = _pwgGetOutputBin(pwg, attr->values[0].string.text)) != NULL) 
+	(ppd = _pwgGetOutputBin(pwg, attr->values[0].string.text)) != NULL)
     {
      /*
       * Map output-bin to OutputBin option...
@@ -4606,5 +4611,5 @@ update_job_attrs(cupsd_job_t *job,	/* I - Job to update */
 
 
 /*
- * End of "$Id: job.c 9716 2011-04-22 22:38:01Z mike $".
+ * End of "$Id: job.c 9855 2011-07-14 15:43:07Z mike $".
  */