rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.4.8

Browse Source
This commit is contained in:
Jiri Popelka 2011-07-26 11:06:18 +02:00
parent 39d7e8f15b
commit ccb8206c51
6 changed files with 18 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -46,3 +46,4 @@ cups-1.4.4-source.tar.bz2
/cups-1.4.5-source.tar.bz2
/cups-1.4.6-source.tar.bz2
/cups-1.4.7-source.tar.bz2
/cups-1.4.8-source.tar.bz2

18
cups-snmp-quirks.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-supplies.c
--- cups-1.4.7/backend/snmp-supplies.c.snmp-quirks 2011-03-10 04:50:59.000000000 +0100
+++ cups-1.4.7/backend/snmp-supplies.c 2011-06-28 11:11:57.944155996 +0200
diff -up cups-1.4.8/backend/snmp-supplies.c.snmp-quirks cups-1.4.8/backend/snmp-supplies.c
--- cups-1.4.8/backend/snmp-supplies.c.snmp-quirks 2011-07-06 22:27:31.000000000 +0200
+++ cups-1.4.8/backend/snmp-supplies.c 2011-07-26 11:02:14.709121584 +0200
@@ -49,6 +49,13 @@
@ -59,10 +59,10 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
+ if (quirks & QUIRK_CAPACITY)
+ supplies[i].max_capacity = 100;
+
percent = 100 * supplies[i].level / supplies[i].max_capacity;
if (percent <= 10)
@@ -406,6 +432,7 @@ backend_init_supplies(
if (supplies[i].max_capacity > 0)
percent = 100 * supplies[i].level / supplies[i].max_capacity;
else
@@ -409,6 +435,7 @@ backend_init_supplies(
http_addr_t *addr) /* I - Printer address */
{
int i, /* Looping var */
@ -70,7 +70,7 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
type; /* Current marker type */
cups_file_t *cachefile; /* Cache file */
const char *cachedir; /* CUPS_CACHEDIR value */
@@ -467,6 +494,7 @@ backend_init_supplies(
@@ -470,6 +497,7 @@ backend_init_supplies(
current_state = -1;
num_supplies = -1;
charset = -1;
@ -78,7 +78,7 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
memset(supplies, 0, sizeof(supplies));
@@ -482,6 +510,34 @@ backend_init_supplies(
@@ -485,6 +513,34 @@ backend_init_supplies(
return;
}

15
cups-str3875.patch
View File

@ -1,15 +0,0 @@
diff -up cups-1.4.7/backend/snmp-supplies.c.str3875 cups-1.4.7/backend/snmp-supplies.c
--- cups-1.4.7/backend/snmp-supplies.c.str3875 2011-07-07 16:44:41.000000000 +0200
+++ cups-1.4.7/backend/snmp-supplies.c 2011-07-07 16:48:19.201008765 +0200
@@ -259,7 +259,10 @@ backendSNMPSupplies(
if (quirks & QUIRK_CAPACITY)
supplies[i].max_capacity = 100;
- 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)
{

46
cups-str3880.patch
View File

@ -1,46 +0,0 @@
diff -up cups-1.4.7/scheduler/job.c.str3880 cups-1.4.7/scheduler/job.c
--- cups-1.4.7/scheduler/job.c.str3880 2011-07-20 13:19:38.280543190 +0100
+++ cups-1.4.7/scheduler/job.c 2011-07-20 13:20:01.691126073 +0100
@@ -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);
@@ -1338,14 +1338,19 @@ 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);
- 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)
@@ -3224,7 +3229,7 @@ get_options(cupsd_job_t *job, /* I - Jo
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...

17
cups.spec
View File

@ -7,8 +7,8 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.7
Release: 8%{?dist}
Version: 1.4.8
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -65,9 +65,7 @@ Patch30: cups-hp-deviceid-oid.patch
Patch31: cups-dnssd-deviceid.patch
Patch32: cups-ricoh-deviceid-oid.patch
Patch33: cups-texttops-rotate-page.patch
Patch34: cups-str3875.patch
Patch35: cups-polld-busy-loop.patch
Patch36: cups-str3880.patch
Patch34: cups-polld-busy-loop.patch
Patch100: cups-lspp.patch
@ -266,12 +264,8 @@ module.
# This fixes page-label orientation when texttops is used in the
# filter chain (bug #572338).
%patch33 -p1 -b .texttops-rotate-page
# Fix SNMP supply level crasher (STR #3875, bug #719057).
%patch34 -p1 -b .str3875
# Avoid busy loop in cups-polld (bug #720921).
%patch35 -p1 -b .polld-busy-loop
# Don't delete job data files when restarted (STR #3880).
%patch36 -p1 -b .str3880
%patch34 -p1 -b .polld-busy-loop
%if %lspp
# LSPP support.
@ -580,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Tue Jul 26 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.8-1
- 1.4.8
* Wed Jul 20 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-8
- Don't delete job data files when restarted (STR #3880).

2
sources
View File

@ -1 +1 @@
1590033ab4c739b859aeb672fe849089 cups-1.4.7-source.tar.bz2
0ec52d3f3c69bc2ab5ed70c594edbce6 cups-1.4.8-source.tar.bz2