Commit 9102683f authored by Apertis CI's avatar Apertis CI

Merge updates from debian/buster

parents 6e49b9e2 effb7feb
Pipeline #93898 waiting for manual action with stages
in 1 minute and 27 seconds
# see git-dpm(1) from git-dpm package
57a0cde2777b4e316f65a2ee7198ab529acfa733
57a0cde2777b4e316f65a2ee7198ab529acfa733
9615ef5f2b8374bfe2816f8ff4314234362ce841
9615ef5f2b8374bfe2816f8ff4314234362ce841
25b2338346ef3abbb93ea88476887cba7b2b86f8
25b2338346ef3abbb93ea88476887cba7b2b86f8
cups_2.2.10.orig.tar.gz
......
cups (2.2.10-6) unstable; urgency=medium
* Backport patch from upstream's 2.2 "stable" branch:
- Fix an issue with `PreserveJobHistory` and time values (Issue #5538)
(Closes: #921741)
-- Didier Raboud <odyx@debian.org> Tue, 23 Apr 2019 08:33:01 +0200
cups (2.2.10-5) unstable; urgency=medium
[ Helge Kreutzmann ]
* Correct error in german manpage translation
[ Didier Raboud ]
* Backport patches from upstream's 2.2 "stable" branch:
- Add USB quirks rule for Xerox printers (Issue #5523)
- Add a USB quirks rule for the DYMO 450 Turbo (Issue #5521)
-- Didier Raboud <odyx@debian.org> Wed, 27 Mar 2019 17:13:07 +0100
cups (2.2.10-4) unstable; urgency=low
* Backport patches from upstream's 2.2 "stable" branch:
- Protect against continuing to read from a file at EOF (Issue #5473)
- Use the same requested-attributes values for all IPP Everywhere setup
requests (Issue #5484)
- Add a USB quirk rule for the Lexmark E120n (Issue #5478)
- Updated the USB quirks rule for Zebra label printers (Issue #5395)
- Fix compile error on Linux (Issue #5483)
- Stop parsing the Emulators keywords in PPD files (Issue #5475)
- Fix potential unaligned accesses in the string pool (Issue #5474)
-- Didier Raboud <odyx@debian.org> Sat, 16 Feb 2019 14:48:42 +0100
cups (2.2.10-3) unstable; urgency=medium
* reprotest errors; cleanup patches:
......
......@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cups man pages 2.2.7-5\n"
"POT-Creation-Date: 2018-12-08 12:54+0100\n"
"PO-Revision-Date: 2018-12-09 06:47+0100\n"
"PO-Revision-Date: 2019-03-03 07:38+0100\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
......@@ -2210,7 +2210,7 @@ msgid ""
msgstr ""
"Die Datei I<cupsd.conf> konfiguriert den CUPS-Auftragsplaner (Scheduler), "
"B<cupsd>(8). Sie befindet sich normalerweise in dem Verzeichnis I</etc/"
"cups>. B<Hinweis:> Datei, Verzeichnis und Benutzerkonfigurationsdirektiven, "
"cups>. B<Hinweis:> Datei-, Verzeichnis- und Benutzerkonfigurationsdirektiven, "
"die früher in der Datei B<cupsd.conf> erlaubt wurden, werden jetzt "
"stattdessen in der Datei B<cups-files.conf>(5) gespeichert, um bestimmte "
"Arten von Angriffen zur Rechteerweiterung zu vermeiden."
......
From 5b2890774c0879bd62ee4abb6c8d87e5c6abcb36 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 9 Jan 2019 13:26:37 -0500
Subject: Protect against continuing to read from a file at EOF (Issue #5473)
Fixed a potential memory leak when reading at the end of a file
---
cups/file.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/cups/file.c b/cups/file.c
index 5c9ddf8fe..f67a6668e 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -679,6 +679,12 @@ cupsFileGetChar(cups_file_t *fp) /* I - CUPS file */
return (-1);
}
+ if (fp->eof)
+ {
+ DEBUG_puts("5cupsFileGetChar: End-of-file!");
+ return (-1);
+ }
+
/*
* If the input buffer is empty, try to read more data...
*/
@@ -1651,6 +1657,12 @@ cupsFileRead(cups_file_t *fp, /* I - CUPS file */
if (bytes == 0)
return (0);
+ if (fp->eof)
+ {
+ DEBUG_puts("5cupsFileRead: End-of-file!");
+ return (-1);
+ }
+
/*
* Loop until all bytes are read...
*/
From 2f25fc8b426f4b97f549d8ad2b84be9850aa709a Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 11:28:24 -0500
Subject: Use the same requested-attributes values for all IPP Everywhere setup
requests (Issue #5484)
The lpadmin command, web interface, and scheduler all queried an IPP
Everywhere printer differently, resulting in different PPDs for the same
printer
Switch to using "all" and "media-col-database" because some vendors apparently
do not know how to read
---
cgi-bin/admin.c | 10 ++++++++--
scheduler/ipp.c | 9 +++++++--
systemv/lpadmin.c | 6 ++----
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 00830e486..690fbbc73 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,8 +1,8 @@
/*
* Administration CGI for CUPS.
*
- * Copyright 2007-2018 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
@@ -4224,6 +4224,11 @@ get_printer_ppd(const char *uri, /* I - Printer URI */
host[256], /* Hostname */
resource[256]; /* Resource path */
int port; /* Port number */
+ static const char * const pattrs[] = /* Printer attributes we need */
+ {
+ "all",
+ "media-col-database"
+ };
/*
@@ -4264,6 +4269,7 @@ get_printer_ppd(const char *uri, /* I - Printer URI */
request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
response = cupsDoRequest(http, request, resource);
if (!_ppdCreateFromIPP(buffer, bufsize, response))
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 6ea3e37f2..e00275b09 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,7 +1,7 @@
/*
* IPP routines for the CUPS scheduler.
*
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
* Copyright © 1997-2007 by Easy Software Products, all rights reserved.
*
* This file contains Kerberos support code, copyright 2006 by
@@ -5279,6 +5279,11 @@ create_local_bg_thread(
*response; /* Response from printer */
ipp_attribute_t *attr; /* Attribute in response */
ipp_status_t status; /* Status code */
+ static const char * const pattrs[] = /* Printer attributes we need */
+ {
+ "all",
+ "media-col-database"
+ };
/*
@@ -5313,7 +5318,7 @@ create_local_bg_thread(
request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippSetVersion(request, 2, 0);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, printer->device_uri);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", NULL, "all");
+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
response = cupsDoRequest(http, request, resource);
status = cupsLastError();
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index ee2438c1d..e979e56c4 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1,7 +1,7 @@
/*
* "lpadmin" command for CUPS.
*
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
* Copyright © 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -1194,9 +1194,7 @@ get_printer_ppd(
int port; /* Port number */
static const char * const pattrs[] = /* Attributes to use */
{
- "job-template",
- "printer-defaults",
- "printer-description",
+ "all",
"media-col-database"
};
From 62283fab59e63c2be87171bc36c00717a91b7663 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 11:32:42 -0500
Subject: Add a USB quirk rule for the Lexmark E120n (Issue #5478)
---
backend/org.cups.usb-quirks | 3 +++
1 file changed, 3 insertions(+)
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 3f99f60de..00d3b2545 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -293,3 +293,6 @@
# Zebra ZD420 (Issue #5395)
0x0a5f 0x0120 unidir no-reattach
+
+# Lexmark E120n (Issue #5478)
+0x043d 0x00cc no-reattach
From d218d3e75bea23c39ab48cb44799db13267b9c94 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 23 Jan 2019 11:15:29 -0500
Subject: Updated the USB quirks rule for Zebra label printers (Issue #5395)
Now all Zebra label printers use unidir and no-reattach.
---
backend/org.cups.usb-quirks | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 00d3b2545..0586602ab 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -140,8 +140,8 @@
# Samsung ML-2160 Series (https://bugzilla.redhat.com/show_bug.cgi?id=873123)
0x04e8 0x330f unidir
-# All Zebra devices (https://bugs.launchpad.net/bugs/1001028)
-0x0a5f unidir
+# All Zebra devices (https://bugs.launchpad.net/bugs/1001028) (Issue #5395)
+0x0a5f unidir no-reattach
# Canon CP-10
0x04a9 0x304a blacklist
@@ -291,8 +291,5 @@
# Star TSP743 (Issue #5443)
0x0519 0x0001 delay-close
-# Zebra ZD420 (Issue #5395)
-0x0a5f 0x0120 unidir no-reattach
-
# Lexmark E120n (Issue #5478)
0x043d 0x00cc no-reattach
From f8eac850dfbdb4a8d6a02f4d5eb2a473e7b088b4 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 19 Feb 2019 11:11:54 -0500
Subject: Add USB quirks rule for Xerox printers (Issue #5523)
---
backend/org.cups.usb-quirks | 3 +++
1 file changed, 3 insertions(+)
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 0586602ab..77233ea18 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -293,3 +293,6 @@
# Lexmark E120n (Issue #5478)
0x043d 0x00cc no-reattach
+
+# All Xerox printers (Issue #5523)
+0x0924 no-reattach
From d4d7ff4dad47ad4d278ca2c84efd602354a4e627 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 21 Feb 2019 09:54:59 -0500
Subject: Add a USB quirks rule for the DYMO 450 Turbo (Issue #5521)
---
backend/org.cups.usb-quirks | 3 +++
1 file changed, 3 insertions(+)
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 77233ea18..44d6bb8cb 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -296,3 +296,6 @@
# All Xerox printers (Issue #5523)
0x0924 no-reattach
+
+# Dymo 450 Turbo (Issue #5521)
+0x0922 0x0021 unidir
From 6f2402e51d47e9cebe27eec5bfdb0e5543127e2a Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 11:54:58 -0500
Subject: Fix compile error on Linux (Issue #5483)
---
cups/hash.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cups/hash.c b/cups/hash.c
index 50dc5fb30..a31372595 100644
--- a/cups/hash.c
+++ b/cups/hash.c
@@ -1,7 +1,7 @@
/*
* Hashing function for CUPS.
*
- * Copyright © 2015-2018 by Apple Inc.
+ * Copyright © 2015-2019 by Apple Inc.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
@@ -235,7 +235,7 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */
gnutls_hash_fast(alg, data, datalen, hash);
- return (gnutls_hash_get_len(alg));
+ return ((ssize_t)gnutls_hash_get_len(alg));
}
#else
From fb2f9b86fabc11f9b0fad804199064bdd555201e Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Jan 2019 13:44:43 -0500
Subject: Stop parsing the Emulators keywords in PPD files (Issue #5475)
This also addresses a potential memory leak...
---
cups/ppd.c | 76 ++----------------------------------------------------
cups/ppd.h | 8 +++---
2 files changed, 6 insertions(+), 78 deletions(-)
diff --git a/cups/ppd.c b/cups/ppd.c
index 5f27484aa..968ea8bf3 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,8 +1,8 @@
/*
* PPD file routines for CUPS.
*
- * Copyright 2007-2018 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
@@ -117,7 +117,6 @@ void
ppdClose(ppd_file_t *ppd) /* I - PPD file record */
{
int i; /* Looping var */
- ppd_emul_t *emul; /* Current emulation */
ppd_group_t *group; /* Current group */
char **font; /* Current font */
ppd_attr_t **attr; /* Current attribute */
@@ -144,21 +143,6 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */
_cupsStrFree(ppd->jcl_end);
_cupsStrFree(ppd->jcl_ps);
- /*
- * Free any emulations...
- */
-
- if (ppd->num_emulations > 0)
- {
- for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++)
- {
- _cupsStrFree(emul->start);
- _cupsStrFree(emul->stop);
- }
-
- ppd_free(ppd->emulations);
- }
-
/*
* Free any UI groups, subgroups, and options...
*/
@@ -443,7 +427,6 @@ _ppdOpen(
_ppd_localization_t localization) /* I - Localization to load */
{
int i, j, k; /* Looping vars */
- int count; /* Temporary count */
_ppd_line_t line; /* Line buffer */
ppd_file_t *ppd; /* PPD file record */
ppd_group_t *group, /* Current group */
@@ -461,7 +444,6 @@ _ppdOpen(
/* Human-readable text from file */
*string, /* Code/text from file */
*sptr, /* Pointer into string */
- *nameptr, /* Pointer into name */
*temp, /* Temporary string pointer */
**tempfonts; /* Temporary fonts pointer */
float order; /* Order dependency number */
@@ -1203,60 +1185,6 @@ _ppdOpen(
else if (!strcmp(string, "Plus90"))
ppd->landscape = 90;
}
- else if (!strcmp(keyword, "Emulators") && string)
- {
- for (count = 1, sptr = string; sptr != NULL;)
- if ((sptr = strchr(sptr, ' ')) != NULL)
- {
- count ++;
- while (*sptr == ' ')
- sptr ++;
- }
-
- ppd->num_emulations = count;
- if ((ppd->emulations = calloc((size_t)count, sizeof(ppd_emul_t))) == NULL)
- {
- pg->ppd_status = PPD_ALLOC_ERROR;
-
- goto error;
- }
-
- for (i = 0, sptr = string; i < count; i ++)
- {
- for (nameptr = ppd->emulations[i].name;
- *sptr != '\0' && *sptr != ' ';
- sptr ++)
- if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))
- *nameptr++ = *sptr;
-
- *nameptr = '\0';
-
- while (*sptr == ' ')
- sptr ++;
- }
- }
- else if (!strncmp(keyword, "StartEmulator_", 14))
- {
- ppd_decode(string);
-
- for (i = 0; i < ppd->num_emulations; i ++)
- if (!strcmp(keyword + 14, ppd->emulations[i].name))
- {
- ppd->emulations[i].start = string;
- string = NULL;
- }
- }
- else if (!strncmp(keyword, "StopEmulator_", 13))
- {
- ppd_decode(string);
-
- for (i = 0; i < ppd->num_emulations; i ++)
- if (!strcmp(keyword + 13, ppd->emulations[i].name))
- {
- ppd->emulations[i].stop = string;
- string = NULL;
- }
- }
else if (!strcmp(keyword, "JobPatchFile"))
{
/*
diff --git a/cups/ppd.h b/cups/ppd.h
index 6e628cb60..ae63c0d66 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -5,8 +5,8 @@
* -D_PPD_DEPRECATED="" TO YOUR COMPILE OPTIONS. THIS HEADER AND THESE
* FUNCTIONS WILL BE REMOVED IN A FUTURE RELEASE OF CUPS.
*
- * Copyright 2007-2015 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright © 2007-2019 by Apple Inc.
+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
@@ -304,8 +304,8 @@ typedef struct ppd_file_s /**** PPD File ****/
int throughput; /* Pages per minute */
ppd_cs_t colorspace; /* Default colorspace */
char *patches; /* Patch commands to be sent to printer */
- int num_emulations; /* Number of emulations supported */
- ppd_emul_t *emulations; /* Emulations and the code to invoke them */
+ int num_emulations; /* Number of emulations supported (no longer supported) @private@ */
+ ppd_emul_t *emulations; /* Emulations and the code to invoke them (no longer supported) @private@ */
char *jcl_begin; /* Start JCL commands */
char *jcl_ps; /* Enter PostScript interpreter */
char *jcl_end; /* End JCL commands */
From 917e6f4ff70eed933c80d21eed4c6bfeb2cb68b7 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 11 Mar 2019 13:54:46 -0400
Subject: Fix an issue with `PreserveJobHistory` and time values (Issue #5538)
Closes: #921741
---
scheduler/job.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/scheduler/job.c b/scheduler/job.c
index cc9283fb8..d4793cbb1 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -437,10 +437,20 @@ cupsdCleanJobs(void)
curtime = time(NULL);
JobHistoryUpdate = 0;
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: curtime=%d", (int)curtime);
+
for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
job;
job = (cupsd_job_t *)cupsArrayNext(Jobs))
{
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdCleanJobs: Job %d, state=%d, printer=%p, history_time=%d, file_time=%d", job->id, (int)job->state_value, (void *)job->printer, (int)job->history_time, (int)job->file_time);
+
+ if ((job->history_time && job->history_time) < JobHistoryUpdate || !JobHistoryUpdate)
+ JobHistoryUpdate = job->history_time;
+
+ if ((job->file_time && job->file_time < JobHistoryUpdate) || !JobHistoryUpdate)
+ JobHistoryUpdate = job->file_time;
+
if (job->state_value >= IPP_JOB_CANCELED && !job->printer)
{
/*
@@ -456,21 +466,9 @@ cupsdCleanJobs(void)
else if (job->file_time && job->file_time <= curtime)
{
cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files.");
- cupsdLogJob(job, CUPSD_LOG_DEBUG2, "curtime=%ld, job->file_time=%ld", (long)curtime, (long)job->file_time);
remove_job_files(job);
cupsdMarkDirty(CUPSD_DIRTY_JOBS);
-
- if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate)
- JobHistoryUpdate = job->history_time;
- }
- else
- {
- if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate)
- JobHistoryUpdate = job->history_time;
-
- if (job->file_time < JobHistoryUpdate || !JobHistoryUpdate)
- JobHistoryUpdate = job->file_time;
}
}
}
@@ -1729,7 +1727,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */
job->completed_time = attr->values[0].integer;
if (JobHistory < INT_MAX)
- job->history_time = attr->values[0].integer + JobHistory;
+ job->history_time = job->completed_time + JobHistory;
else
job->history_time = INT_MAX;
@@ -1740,7 +1738,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */
JobHistoryUpdate = job->history_time;
if (JobFiles < INT_MAX)
- job->file_time = attr->values[0].integer + JobFiles;
+ job->file_time = job->completed_time + JobFiles;
else
job->file_time = INT_MAX;
@@ -2862,8 +2860,10 @@ cupsdUpdateJobs(void)
* Update history/file expiration times...
*/
+ job->completed_time = attr->values[0].integer;
+
if (JobHistory < INT_MAX)
- job->history_time = attr->values[0].integer + JobHistory;
+ job->history_time = job->completed_time + JobHistory;
else
job->history_time = INT_MAX;
@@ -2877,7 +2877,7 @@ cupsdUpdateJobs(void)
JobHistoryUpdate = job->history_time;
if (JobFiles < INT_MAX)
- job->file_time = attr->values[0].integer + JobFiles;
+ job->file_time = job->completed_time + JobFiles;
else
job->file_time = INT_MAX;
@@ -4693,7 +4693,7 @@ set_time(cupsd_job_t *job, /* I - Job to update */
job->completed_time = curtime;
if (JobHistory < INT_MAX && attr)
- job->history_time = attr->values[0].integer + JobHistory;
+ job->history_time = job->completed_time + JobHistory;
else
job->history_time = INT_MAX;
@@ -4701,7 +4701,7 @@ set_time(cupsd_job_t *job, /* I - Job to update */
JobHistoryUpdate = job->history_time;
if (JobFiles < INT_MAX && attr)
- job->file_time = curtime + JobFiles;
+ job->file_time = job->completed_time + JobFiles;
else
job->file_time = INT_MAX;
From 57a0cde2777b4e316f65a2ee7198ab529acfa733 Mon Sep 17 00:00:00 2001
From 9615ef5f2b8374bfe2816f8ff4314234362ce841 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 9 Aug 2016 18:11:50 +0200
Subject: po4a infrastructure and translations for manpages.
......
......@@ -33,4 +33,14 @@ man-cups-lpd-drop-dangling-references.patch
debianize_cups-config.patch
0034-Build-mantohtml-with-the-build-architecture-compiler.patch
0035-The-lp-and-lpr-commands-now-provide-better-error-mes.patch
0036-Protect-against-continuing-to-read-from-a-file-at-EO.patch
0037-Use-the-same-requested-attributes-values-for-all-IPP.patch
0038-Add-a-USB-quirk-rule-for-the-Lexmark-E120n-Issue-547.patch
0039-Updated-the-USB-quirks-rule-for-Zebra-label-printers.patch
0040-Add-USB-quirks-rule-for-Xerox-printers-Issue-5523.patch
0041-Add-a-USB-quirks-rule-for-the-DYMO-450-Turbo-Issue-5.patch
0042-Fix-compile-error-on-Linux-Issue-5483.patch
0043-Stop-parsing-the-Emulators-keywords-in-PPD-files-Iss.patch
0044-Fix-potential-unaligned-accesses-in-the-string-pool-.patch
0045-Fix-an-issue-with-PreserveJobHistory-and-time-values.patch
manpage-translations.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment