2.2.8, removing several downstream patches, adding some upstream patches
This commit is contained in:
parent
0733cdc407
commit
ce18aa9213
1
.gitignore
vendored
1
.gitignore
vendored
@ -86,3 +86,4 @@ cups-1.4.4-source.tar.bz2
|
|||||||
/cups-2.2.5-source.tar.gz
|
/cups-2.2.5-source.tar.gz
|
||||||
/cups-2.2.6-source.tar.gz
|
/cups-2.2.6-source.tar.gz
|
||||||
/cups-2.2.7-source.tar.gz
|
/cups-2.2.7-source.tar.gz
|
||||||
|
/cups-2.2.8-source.tar.gz
|
||||||
|
BIN
cups-2.2.8-source.tar.gz.sig
Normal file
BIN
cups-2.2.8-source.tar.gz.sig
Normal file
Binary file not shown.
13
cups-accesslog-null.patch
Normal file
13
cups-accesslog-null.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/scheduler/log.c b/scheduler/log.c
|
||||||
|
index 74790dc35..b6226201f 100644
|
||||||
|
--- a/scheduler/log.c
|
||||||
|
+++ b/scheduler/log.c
|
||||||
|
@@ -1046,7 +1047,7 @@ cupsdLogRequest(cupsd_client_t *con, /* I - Request to log */
|
||||||
|
* Filter requests as needed...
|
||||||
|
*/
|
||||||
|
|
||||||
|
- if (AccessLogLevel == CUPSD_ACCESSLOG_NONE)
|
||||||
|
+ if (AccessLogLevel == CUPSD_ACCESSLOG_NONE || !AccessLog)
|
||||||
|
return (1);
|
||||||
|
else if (AccessLogLevel < CUPSD_ACCESSLOG_ALL)
|
||||||
|
{
|
13
cups-epson-A6-crash.patch
Normal file
13
cups-epson-A6-crash.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
|
||||||
|
index 73e8d0600..4522e6b48 100644
|
||||||
|
--- a/filter/rastertoepson.c
|
||||||
|
+++ b/filter/rastertoepson.c
|
||||||
|
@@ -301,7 +302,7 @@ StartPage(
|
||||||
|
|
||||||
|
if (DotBytes)
|
||||||
|
{
|
||||||
|
- if ((LineBuffers[0] = calloc((size_t)DotBytes, header->cupsWidth * (size_t)(Shingling + 1))) == NULL)
|
||||||
|
+ if ((LineBuffers[0] = calloc((size_t)DotBytes, (header->cupsWidth + 7) * (size_t)(Shingling + 1))) == NULL)
|
||||||
|
{
|
||||||
|
fputs("ERROR: Unable to allocate memory\n", stderr);
|
||||||
|
exit(1);
|
124
cups-ippeve-webui.patch
Normal file
124
cups-ippeve-webui.patch
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
diff --git a/backend/dnssd.c b/backend/dnssd.c
|
||||||
|
index 34781d5ce..7074f4294 100644
|
||||||
|
--- a/backend/dnssd.c
|
||||||
|
+++ b/backend/dnssd.c
|
||||||
|
@@ -1252,6 +1252,13 @@ query_callback(
|
||||||
|
strlcat(make_and_model, " ", sizeof(make_and_model));
|
||||||
|
strlcat(make_and_model, model, sizeof(make_and_model));
|
||||||
|
|
||||||
|
+ if (!_cups_strncasecmp(make_and_model, "EPSON EPSON ", 12))
|
||||||
|
+ _cups_strcpy(make_and_model, make_and_model + 6);
|
||||||
|
+ else if (!_cups_strncasecmp(make_and_model, "HP HP ", 6))
|
||||||
|
+ _cups_strcpy(make_and_model, make_and_model + 3);
|
||||||
|
+ else if (!_cups_strncasecmp(make_and_model, "Lexmark International Lexmark ", 30))
|
||||||
|
+ _cups_strcpy(make_and_model, make_and_model + 22);
|
||||||
|
+
|
||||||
|
device->make_and_model = strdup(make_and_model);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
|
||||||
|
index f788083fb..a3b5057b0 100644
|
||||||
|
--- a/cgi-bin/admin.c
|
||||||
|
+++ b/cgi-bin/admin.c
|
||||||
|
@@ -928,6 +929,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||||
|
else if (!file &&
|
||||||
|
(!cgiGetVariable("PPD_NAME") || cgiGetVariable("SELECT_MAKE")))
|
||||||
|
{
|
||||||
|
+ int ipp_everywhere = !strncmp(var, "ipp://", 6) || !strncmp(var, "ipps://", 7) || (!strncmp(var, "dnssd://", 8) && (strstr(var, "_ipp._tcp") || strstr(var, "_ipps._tcp")));
|
||||||
|
+
|
||||||
|
if (modify && !cgiGetVariable("SELECT_MAKE"))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
@@ -1076,6 +1079,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||||
|
if (!modify)
|
||||||
|
cgiSetVariable("CURRENT_MAKE_AND_MODEL",
|
||||||
|
cgiGetArray("PPD_MAKE_AND_MODEL", 0));
|
||||||
|
+ if (ipp_everywhere)
|
||||||
|
+ cgiSetVariable("SHOW_IPP_EVERYWHERE", "1");
|
||||||
|
cgiCopyTemplateLang("choose-model.tmpl");
|
||||||
|
cgiEndHTML();
|
||||||
|
}
|
||||||
|
diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl
|
||||||
|
index ee9338cc5..d72534236 100644
|
||||||
|
--- a/templates/choose-model.tmpl
|
||||||
|
+++ b/templates/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Current Driver - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/de/choose-model.tmpl b/templates/de/choose-model.tmpl
|
||||||
|
index cb9b6f3bc..a08a8e3e0 100644
|
||||||
|
--- a/templates/de/choose-model.tmpl
|
||||||
|
+++ b/templates/de/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@ Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk fr
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Aktueller Treiber - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/es/choose-model.tmpl b/templates/es/choose-model.tmpl
|
||||||
|
index 8a5a4ba90..74f0a9bb9 100644
|
||||||
|
--- a/templates/es/choose-model.tmpl
|
||||||
|
+++ b/templates/es/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Controlador actual - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl
|
||||||
|
index 1e154f18a..3038b3fe3 100644
|
||||||
|
--- a/templates/fr/choose-model.tmpl
|
||||||
|
+++ b/templates/fr/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Pilote actuel - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/ja/choose-model.tmpl b/templates/ja/choose-model.tmpl
|
||||||
|
index daf1375fd..b3c286b11 100644
|
||||||
|
--- a/templates/ja/choose-model.tmpl
|
||||||
|
+++ b/templates/ja/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>現在のドライバー - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/pt_BR/choose-model.tmpl b/templates/pt_BR/choose-model.tmpl
|
||||||
|
index 55d8bd8d5..a5939ee9c 100644
|
||||||
|
--- a/templates/pt_BR/choose-model.tmpl
|
||||||
|
+++ b/templates/pt_BR/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Driver atual - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
||||||
|
diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl
|
||||||
|
index 2f0d6d9ba..86507814d 100644
|
||||||
|
--- a/templates/ru/choose-model.tmpl
|
||||||
|
+++ b/templates/ru/choose-model.tmpl
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
<TD>
|
||||||
|
<SELECT NAME="PPD_NAME" SIZE="10">
|
||||||
|
{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Текущий драйвер - {current_make_and_model}</OPTION>:}
|
||||||
|
+{show_ipp_everywhere?<OPTION VALUE="everywhere" SELECTED>IPP Everywhere ™</OPTION>:}
|
||||||
|
{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language})
|
||||||
|
}</SELECT>
|
||||||
|
</TD>
|
63
cups-ippvalidateattr-regression.patch
Normal file
63
cups-ippvalidateattr-regression.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
diff --git a/cups/ipp.c b/cups/ipp.c
|
||||||
|
index 95d53cc44..325de02b9 100644
|
||||||
|
--- a/cups/ipp.c
|
||||||
|
+++ b/cups/ipp.c
|
||||||
|
@@ -5033,16 +5033,19 @@ ippValidateAttribute(
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (*ptr < ' ' || *ptr == 0x7f)
|
||||||
|
- {
|
||||||
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
|
||||||
|
- return (0);
|
||||||
|
- }
|
||||||
|
- else if (*ptr)
|
||||||
|
- {
|
||||||
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
|
||||||
|
- return (0);
|
||||||
|
- }
|
||||||
|
+ if (*ptr)
|
||||||
|
+ {
|
||||||
|
+ if (*ptr < ' ' || *ptr == 0x7f)
|
||||||
|
+ {
|
||||||
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1))
|
||||||
|
{
|
||||||
|
@@ -5091,16 +5094,19 @@ ippValidateAttribute(
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (*ptr < ' ' || *ptr == 0x7f)
|
||||||
|
- {
|
||||||
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
|
||||||
|
- return (0);
|
||||||
|
- }
|
||||||
|
- else if (*ptr)
|
||||||
|
+ if (*ptr)
|
||||||
|
{
|
||||||
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
|
||||||
|
- return (0);
|
||||||
|
- }
|
||||||
|
+ if (*ptr < ' ' || *ptr == 0x7f)
|
||||||
|
+ {
|
||||||
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
|
||||||
|
+ return (0);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1))
|
||||||
|
{
|
@ -1,10 +1,12 @@
|
|||||||
diff -up cups-2.2.6/scheduler/log.c.journal-history cups-2.2.6/scheduler/log.c
|
diff --git a/scheduler/log.c b/scheduler/log.c
|
||||||
--- cups-2.2.6/scheduler/log.c.journal-history 2018-06-11 16:39:09.323688006 +0200
|
index b6226201f..cdb5437dc 100644
|
||||||
+++ cups-2.2.6/scheduler/log.c 2018-06-11 17:08:17.393764901 +0200
|
--- a/scheduler/log.c
|
||||||
@@ -598,48 +598,17 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
|
+++ b/scheduler/log.c
|
||||||
|
@@ -565,56 +565,15 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
|
||||||
|
if (level > LogLevel && LogDebugHistory <= 0)
|
||||||
return (1);
|
return (1);
|
||||||
|
|
||||||
#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
-#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
||||||
- if (!strcmp(ErrorLog, "syslog"))
|
- if (!strcmp(ErrorLog, "syslog"))
|
||||||
- {
|
- {
|
||||||
- cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
- cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
||||||
@ -47,21 +49,21 @@ diff -up cups-2.2.6/scheduler/log.c.journal-history cups-2.2.6/scheduler/log.c
|
|||||||
-
|
-
|
||||||
- return (1);
|
- return (1);
|
||||||
- }
|
- }
|
||||||
+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
-#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
||||||
+ static const char * const job_states[] =
|
-
|
||||||
+ { /* job-state strings */
|
|
||||||
+ "Pending",
|
|
||||||
+ "PendingHeld",
|
|
||||||
+ "Processing",
|
|
||||||
+ "ProcessingStopped",
|
|
||||||
+ "Canceled",
|
|
||||||
+ "Aborted",
|
|
||||||
+ "Completed"
|
|
||||||
+ };
|
|
||||||
#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -705,7 +674,29 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
|
* Format and write the log message...
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
||||||
|
+ if (job && strcmp(ErrorLog, "syslog"))
|
||||||
|
+#else
|
||||||
|
if (job)
|
||||||
|
+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
||||||
|
snprintf(jobmsg, sizeof(jobmsg), "[Job %d] %s", job->id, message);
|
||||||
|
else
|
||||||
|
strlcpy(jobmsg, message, sizeof(jobmsg));
|
||||||
|
@@ -673,7 +632,43 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
else if (level <= LogLevel)
|
else if (level <= LogLevel)
|
||||||
@ -69,23 +71,37 @@ diff -up cups-2.2.6/scheduler/log.c.journal-history cups-2.2.6/scheduler/log.c
|
|||||||
+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H
|
||||||
+ if (!strcmp(ErrorLog, "syslog"))
|
+ if (!strcmp(ErrorLog, "syslog"))
|
||||||
+ {
|
+ {
|
||||||
+ if (job)
|
+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
|
||||||
+ sd_journal_send("MESSAGE=%s", log_line,
|
+ static const char * const job_states[] =
|
||||||
+ "PRIORITY=%i", log_levels[level],
|
+ { /* job-state strings */
|
||||||
+ PWG_Event"=JobStateChanged",
|
+ "Pending",
|
||||||
+ PWG_ServiceURI"=%s", printer ? printer->uri : "",
|
+ "PendingHeld",
|
||||||
+ PWG_JobID"=%d", job->id,
|
+ "Processing",
|
||||||
+ PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING],
|
+ "ProcessingStopped",
|
||||||
+ PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0),
|
+ "Canceled",
|
||||||
+ NULL);
|
+ "Aborted",
|
||||||
+ else
|
+ "Completed"
|
||||||
+ sd_journal_send("MESSAGE=%s", log_line,
|
+ };
|
||||||
+ "PRIORITY=%i", log_levels[level],
|
+
|
||||||
+ NULL);
|
+ if (job)
|
||||||
+
|
+ sd_journal_send("MESSAGE=%s", log_line,
|
||||||
+ return (1);
|
+ "PRIORITY=%i", log_levels[level],
|
||||||
|
+ PWG_Event"=JobStateChanged",
|
||||||
|
+ PWG_ServiceURI"=%s", printer ? printer->uri : "",
|
||||||
|
+ PWG_JobID"=%d", job->id,
|
||||||
|
+ PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING],
|
||||||
|
+ PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0),
|
||||||
|
+ NULL);
|
||||||
|
+ else
|
||||||
|
+ sd_journal_send("MESSAGE=%s", log_line,
|
||||||
|
+ "PRIORITY=%i", log_levels[level],
|
||||||
|
+ NULL);
|
||||||
|
+
|
||||||
|
+ return (1);
|
||||||
+ }
|
+ }
|
||||||
|
+ else
|
||||||
+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
|
||||||
|
+
|
||||||
return (cupsdWriteErrorLog(level, log_line));
|
return (cupsdWriteErrorLog(level, log_line));
|
||||||
+ }
|
+ }
|
||||||
else
|
else
|
||||||
|
172
cups-lspp.patch
172
cups-lspp.patch
@ -1,6 +1,6 @@
|
|||||||
diff -up cups-2.2.5/config.h.in.lspp cups-2.2.5/config.h.in
|
diff -up cups-2.2.8/config.h.in.lspp cups-2.2.8/config.h.in
|
||||||
--- cups-2.2.5/config.h.in.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/config.h.in.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/config.h.in 2017-10-17 19:06:19.640228964 +0200
|
+++ cups-2.2.8/config.h.in 2018-06-08 17:34:38.682653959 +0200
|
||||||
@@ -730,4 +730,11 @@ static __inline int _cups_abs(int i) { r
|
@@ -730,4 +730,11 @@ static __inline int _cups_abs(int i) { r
|
||||||
# endif /* __GNUC__ || __STDC_VERSION__ */
|
# endif /* __GNUC__ || __STDC_VERSION__ */
|
||||||
#endif /* !HAVE_ABS && !abs */
|
#endif /* !HAVE_ABS && !abs */
|
||||||
@ -13,9 +13,9 @@ diff -up cups-2.2.5/config.h.in.lspp cups-2.2.5/config.h.in
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
#endif /* !_CUPS_CONFIG_H_ */
|
#endif /* !_CUPS_CONFIG_H_ */
|
||||||
diff -up cups-2.2.5/config-scripts/cups-lspp.m4.lspp cups-2.2.5/config-scripts/cups-lspp.m4
|
diff -up cups-2.2.8/config-scripts/cups-lspp.m4.lspp cups-2.2.8/config-scripts/cups-lspp.m4
|
||||||
--- cups-2.2.5/config-scripts/cups-lspp.m4.lspp 2017-10-17 19:06:19.640228964 +0200
|
--- cups-2.2.8/config-scripts/cups-lspp.m4.lspp 2018-06-08 17:34:38.682653959 +0200
|
||||||
+++ cups-2.2.5/config-scripts/cups-lspp.m4 2017-10-17 19:06:19.640228964 +0200
|
+++ cups-2.2.8/config-scripts/cups-lspp.m4 2018-06-08 17:34:38.682653959 +0200
|
||||||
@@ -0,0 +1,36 @@
|
@@ -0,0 +1,36 @@
|
||||||
+dnl
|
+dnl
|
||||||
+dnl LSPP code for the Common UNIX Printing System (CUPS).
|
+dnl LSPP code for the Common UNIX Printing System (CUPS).
|
||||||
@ -53,9 +53,9 @@ diff -up cups-2.2.5/config-scripts/cups-lspp.m4.lspp cups-2.2.5/config-scripts/c
|
|||||||
+ ;;
|
+ ;;
|
||||||
+ esac
|
+ esac
|
||||||
+fi
|
+fi
|
||||||
diff -up cups-2.2.5/configure.ac.lspp cups-2.2.5/configure.ac
|
diff -up cups-2.2.8/configure.ac.lspp cups-2.2.8/configure.ac
|
||||||
--- cups-2.2.5/configure.ac.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/configure.ac.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/configure.ac 2017-10-17 19:06:19.640228964 +0200
|
+++ cups-2.2.8/configure.ac 2018-06-08 17:34:38.682653959 +0200
|
||||||
@@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4)
|
@@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4)
|
||||||
sinclude(config-scripts/cups-defaults.m4)
|
sinclude(config-scripts/cups-defaults.m4)
|
||||||
sinclude(config-scripts/cups-scripting.m4)
|
sinclude(config-scripts/cups-scripting.m4)
|
||||||
@ -65,9 +65,9 @@ diff -up cups-2.2.5/configure.ac.lspp cups-2.2.5/configure.ac
|
|||||||
INSTALL_LANGUAGES=""
|
INSTALL_LANGUAGES=""
|
||||||
UNINSTALL_LANGUAGES=""
|
UNINSTALL_LANGUAGES=""
|
||||||
LANGFILES=""
|
LANGFILES=""
|
||||||
diff -up cups-2.2.5/filter/common.c.lspp cups-2.2.5/filter/common.c
|
diff -up cups-2.2.8/filter/common.c.lspp cups-2.2.8/filter/common.c
|
||||||
--- cups-2.2.5/filter/common.c.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/filter/common.c.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/filter/common.c 2017-10-17 19:06:19.640228964 +0200
|
+++ cups-2.2.8/filter/common.c 2018-06-08 17:34:38.682653959 +0200
|
||||||
@@ -17,6 +17,12 @@
|
@@ -17,6 +17,12 @@
|
||||||
* Include necessary headers...
|
* Include necessary headers...
|
||||||
*/
|
*/
|
||||||
@ -236,9 +236,9 @@ diff -up cups-2.2.5/filter/common.c.lspp cups-2.2.5/filter/common.c
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
diff -up cups-2.2.5/filter/pstops.c.lspp cups-2.2.5/filter/pstops.c
|
diff -up cups-2.2.8/filter/pstops.c.lspp cups-2.2.8/filter/pstops.c
|
||||||
--- cups-2.2.5/filter/pstops.c.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/filter/pstops.c.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/filter/pstops.c 2017-10-17 19:06:19.641228955 +0200
|
+++ cups-2.2.8/filter/pstops.c 2018-06-08 17:34:38.683653951 +0200
|
||||||
@@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc, /*
|
@@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc, /*
|
||||||
{
|
{
|
||||||
const char *classification; /* CLASSIFICATION environment variable */
|
const char *classification; /* CLASSIFICATION environment variable */
|
||||||
@ -394,9 +394,9 @@ diff -up cups-2.2.5/filter/pstops.c.lspp cups-2.2.5/filter/pstops.c
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
diff -up cups-2.2.5/Makedefs.in.lspp cups-2.2.5/Makedefs.in
|
diff -up cups-2.2.8/Makedefs.in.lspp cups-2.2.8/Makedefs.in
|
||||||
--- cups-2.2.5/Makedefs.in.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/Makedefs.in.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/Makedefs.in 2017-10-17 19:06:19.641228955 +0200
|
+++ cups-2.2.8/Makedefs.in 2018-06-08 17:34:38.683653951 +0200
|
||||||
@@ -161,7 +161,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
|
@@ -161,7 +161,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
|
||||||
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
||||||
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
|
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
|
||||||
@ -406,9 +406,9 @@ diff -up cups-2.2.5/Makedefs.in.lspp cups-2.2.5/Makedefs.in
|
|||||||
ONDEMANDFLAGS = @ONDEMANDFLAGS@
|
ONDEMANDFLAGS = @ONDEMANDFLAGS@
|
||||||
ONDEMANDLIBS = @ONDEMANDLIBS@
|
ONDEMANDLIBS = @ONDEMANDLIBS@
|
||||||
OPTIM = @OPTIM@
|
OPTIM = @OPTIM@
|
||||||
diff -up cups-2.2.5/scheduler/client.c.lspp cups-2.2.5/scheduler/client.c
|
diff -up cups-2.2.8/scheduler/client.c.lspp cups-2.2.8/scheduler/client.c
|
||||||
--- cups-2.2.5/scheduler/client.c.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/scheduler/client.c.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/client.c 2017-10-17 19:06:19.689228556 +0200
|
+++ cups-2.2.8/scheduler/client.c 2018-06-08 17:34:38.729653586 +0200
|
||||||
@@ -22,12 +22,20 @@
|
@@ -22,12 +22,20 @@
|
||||||
#define _HTTP_NO_PRIVATE
|
#define _HTTP_NO_PRIVATE
|
||||||
#include "cupsd.h"
|
#include "cupsd.h"
|
||||||
@ -504,7 +504,7 @@ diff -up cups-2.2.5/scheduler/client.c.lspp cups-2.2.5/scheduler/client.c
|
|||||||
|
|
||||||
|
|
||||||
status = HTTP_STATUS_CONTINUE;
|
status = HTTP_STATUS_CONTINUE;
|
||||||
@@ -1926,6 +1994,73 @@ cupsdReadClient(cupsd_client_t *con) /*
|
@@ -1938,6 +2006,73 @@ cupsdReadClient(cupsd_client_t *con) /*
|
||||||
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
|
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -578,7 +578,7 @@ diff -up cups-2.2.5/scheduler/client.c.lspp cups-2.2.5/scheduler/client.c
|
|||||||
if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
|
if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
|
||||||
{
|
{
|
||||||
if (!httpWait(con->http, 0))
|
if (!httpWait(con->http, 0))
|
||||||
@@ -3456,6 +3591,49 @@ is_path_absolute(const char *path) /* I
|
@@ -3485,6 +3620,49 @@ is_path_absolute(const char *path) /* I
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -628,9 +628,9 @@ diff -up cups-2.2.5/scheduler/client.c.lspp cups-2.2.5/scheduler/client.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* 'pipe_command()' - Pipe the output of a command to the remote client.
|
* 'pipe_command()' - Pipe the output of a command to the remote client.
|
||||||
diff -up cups-2.2.5/scheduler/client.h.lspp cups-2.2.5/scheduler/client.h
|
diff -up cups-2.2.8/scheduler/client.h.lspp cups-2.2.8/scheduler/client.h
|
||||||
--- cups-2.2.5/scheduler/client.h.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/scheduler/client.h.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/client.h 2017-10-17 19:06:19.690228548 +0200
|
+++ cups-2.2.8/scheduler/client.h 2018-06-08 17:34:38.729653586 +0200
|
||||||
@@ -16,6 +16,13 @@
|
@@ -16,6 +16,13 @@
|
||||||
#endif /* HAVE_AUTHORIZATION_H */
|
#endif /* HAVE_AUTHORIZATION_H */
|
||||||
|
|
||||||
@ -645,7 +645,7 @@ diff -up cups-2.2.5/scheduler/client.h.lspp cups-2.2.5/scheduler/client.h
|
|||||||
/*
|
/*
|
||||||
* HTTP client structure...
|
* HTTP client structure...
|
||||||
*/
|
*/
|
||||||
@@ -65,6 +72,10 @@ struct cupsd_client_s
|
@@ -66,6 +73,10 @@ struct cupsd_client_s
|
||||||
#ifdef HAVE_AUTHORIZATION_H
|
#ifdef HAVE_AUTHORIZATION_H
|
||||||
AuthorizationRef authref; /* Authorization ref */
|
AuthorizationRef authref; /* Authorization ref */
|
||||||
#endif /* HAVE_AUTHORIZATION_H */
|
#endif /* HAVE_AUTHORIZATION_H */
|
||||||
@ -656,7 +656,7 @@ diff -up cups-2.2.5/scheduler/client.h.lspp cups-2.2.5/scheduler/client.h
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define HTTP(con) ((con)->http)
|
#define HTTP(con) ((con)->http)
|
||||||
@@ -138,6 +149,9 @@ extern void cupsdStartListening(void);
|
@@ -139,6 +150,9 @@ extern void cupsdStartListening(void);
|
||||||
extern void cupsdStopListening(void);
|
extern void cupsdStopListening(void);
|
||||||
extern void cupsdUpdateCGI(void);
|
extern void cupsdUpdateCGI(void);
|
||||||
extern void cupsdWriteClient(cupsd_client_t *con);
|
extern void cupsdWriteClient(cupsd_client_t *con);
|
||||||
@ -666,9 +666,9 @@ diff -up cups-2.2.5/scheduler/client.h.lspp cups-2.2.5/scheduler/client.h
|
|||||||
|
|
||||||
#ifdef HAVE_SSL
|
#ifdef HAVE_SSL
|
||||||
extern int cupsdEndTLS(cupsd_client_t *con);
|
extern int cupsdEndTLS(cupsd_client_t *con);
|
||||||
diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
|
diff -up cups-2.2.8/scheduler/conf.c.lspp cups-2.2.8/scheduler/conf.c
|
||||||
--- cups-2.2.5/scheduler/conf.c.lspp 2017-10-17 19:06:19.637228989 +0200
|
--- cups-2.2.8/scheduler/conf.c.lspp 2018-06-08 17:34:38.676654007 +0200
|
||||||
+++ cups-2.2.5/scheduler/conf.c 2017-10-17 19:06:19.691228540 +0200
|
+++ cups-2.2.8/scheduler/conf.c 2018-06-08 17:34:38.730653578 +0200
|
||||||
@@ -40,6 +40,9 @@
|
@@ -40,6 +40,9 @@
|
||||||
# define INADDR_NONE 0xffffffff
|
# define INADDR_NONE 0xffffffff
|
||||||
#endif /* !INADDR_NONE */
|
#endif /* !INADDR_NONE */
|
||||||
@ -700,7 +700,7 @@ diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -866,6 +876,25 @@ cupsdReadConfiguration(void)
|
@@ -863,6 +873,25 @@ cupsdReadConfiguration(void)
|
||||||
|
|
||||||
RunUser = getuid();
|
RunUser = getuid();
|
||||||
|
|
||||||
@ -726,7 +726,7 @@ diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
|
|||||||
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
|
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
|
||||||
RemotePort ? "enabled" : "disabled");
|
RemotePort ? "enabled" : "disabled");
|
||||||
|
|
||||||
@@ -1286,7 +1315,19 @@ cupsdReadConfiguration(void)
|
@@ -1274,7 +1303,19 @@ cupsdReadConfiguration(void)
|
||||||
cupsdClearString(&Classification);
|
cupsdClearString(&Classification);
|
||||||
|
|
||||||
if (Classification)
|
if (Classification)
|
||||||
@ -746,7 +746,7 @@ diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Check the MaxClients setting, and then allocate memory for it...
|
* Check the MaxClients setting, and then allocate memory for it...
|
||||||
@@ -3770,6 +3811,18 @@ read_location(cups_file_t *fp, /* I - C
|
@@ -3832,6 +3873,18 @@ read_location(cups_file_t *fp, /* I - C
|
||||||
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
|
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -765,10 +765,10 @@ diff -up cups-2.2.5/scheduler/conf.c.lspp cups-2.2.5/scheduler/conf.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* 'read_policy()' - Read a <Policy name> definition.
|
* 'read_policy()' - Read a <Policy name> definition.
|
||||||
diff -up cups-2.2.5/scheduler/conf.h.lspp cups-2.2.5/scheduler/conf.h
|
diff -up cups-2.2.8/scheduler/conf.h.lspp cups-2.2.8/scheduler/conf.h
|
||||||
--- cups-2.2.5/scheduler/conf.h.lspp 2017-10-17 19:06:19.585229421 +0200
|
--- cups-2.2.8/scheduler/conf.h.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/conf.h 2017-10-17 19:06:19.691228540 +0200
|
+++ cups-2.2.8/scheduler/conf.h 2018-06-08 17:34:38.730653578 +0200
|
||||||
@@ -250,6 +250,13 @@ VAR char *ServerKeychain VALUE(NULL);
|
@@ -246,6 +246,13 @@ VAR char *ServerKeychain VALUE(NULL);
|
||||||
/* Keychain holding cert + key */
|
/* Keychain holding cert + key */
|
||||||
#endif /* HAVE_SSL */
|
#endif /* HAVE_SSL */
|
||||||
|
|
||||||
@ -782,7 +782,7 @@ diff -up cups-2.2.5/scheduler/conf.h.lspp cups-2.2.5/scheduler/conf.h
|
|||||||
#ifdef HAVE_ONDEMAND
|
#ifdef HAVE_ONDEMAND
|
||||||
VAR int IdleExitTimeout VALUE(60);
|
VAR int IdleExitTimeout VALUE(60);
|
||||||
/* Time after which an idle cupsd will exit */
|
/* Time after which an idle cupsd will exit */
|
||||||
@@ -268,6 +275,9 @@ VAR int HaveServerCreds VALUE(0);
|
@@ -264,6 +271,9 @@ VAR int HaveServerCreds VALUE(0);
|
||||||
VAR gss_cred_id_t ServerCreds; /* Server's GSS credentials */
|
VAR gss_cred_id_t ServerCreds; /* Server's GSS credentials */
|
||||||
#endif /* HAVE_GSSAPI */
|
#endif /* HAVE_GSSAPI */
|
||||||
|
|
||||||
@ -792,9 +792,9 @@ diff -up cups-2.2.5/scheduler/conf.h.lspp cups-2.2.5/scheduler/conf.h
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Prototypes...
|
* Prototypes...
|
||||||
diff -up cups-2.2.5/scheduler/cupsd.h.lspp cups-2.2.5/scheduler/cupsd.h
|
diff -up cups-2.2.8/scheduler/cupsd.h.lspp cups-2.2.8/scheduler/cupsd.h
|
||||||
--- cups-2.2.5/scheduler/cupsd.h.lspp 2017-10-17 19:06:19.626229080 +0200
|
--- cups-2.2.8/scheduler/cupsd.h.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/cupsd.h 2017-10-17 19:06:19.691228540 +0200
|
+++ cups-2.2.8/scheduler/cupsd.h 2018-06-08 17:34:38.730653578 +0200
|
||||||
@@ -11,6 +11,8 @@
|
@@ -11,6 +11,8 @@
|
||||||
* file is missing or damaged, see the license at "http://www.cups.org/".
|
* file is missing or damaged, see the license at "http://www.cups.org/".
|
||||||
*/
|
*/
|
||||||
@ -826,9 +826,9 @@ diff -up cups-2.2.5/scheduler/cupsd.h.lspp cups-2.2.5/scheduler/cupsd.h
|
|||||||
/*
|
/*
|
||||||
* Some OS's don't have hstrerror(), most notably Solaris...
|
* Some OS's don't have hstrerror(), most notably Solaris...
|
||||||
*/
|
*/
|
||||||
diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
diff -up cups-2.2.8/scheduler/ipp.c.lspp cups-2.2.8/scheduler/ipp.c
|
||||||
--- cups-2.2.5/scheduler/ipp.c.lspp 2017-10-17 19:06:19.599229305 +0200
|
--- cups-2.2.8/scheduler/ipp.c.lspp 2018-06-08 17:34:38.652654197 +0200
|
||||||
+++ cups-2.2.5/scheduler/ipp.c 2017-10-17 19:06:19.695228506 +0200
|
+++ cups-2.2.8/scheduler/ipp.c 2018-06-08 17:37:19.166378937 +0200
|
||||||
@@ -14,6 +14,9 @@
|
@@ -14,6 +14,9 @@
|
||||||
* missing or damaged, see the license at "http://www.cups.org/".
|
* missing or damaged, see the license at "http://www.cups.org/".
|
||||||
*/
|
*/
|
||||||
@ -864,7 +864,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
|
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
|
||||||
static void close_job(cupsd_client_t *con, ipp_attribute_t *uri);
|
static void close_job(cupsd_client_t *con, ipp_attribute_t *uri);
|
||||||
static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
|
static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
|
||||||
@@ -1286,6 +1300,21 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1250,6 +1264,21 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
"time-at-creation",
|
"time-at-creation",
|
||||||
"time-at-processing"
|
"time-at-processing"
|
||||||
};
|
};
|
||||||
@ -886,9 +886,9 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
|
|
||||||
|
|
||||||
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
|
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
|
||||||
@@ -1597,6 +1626,106 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1578,6 +1607,106 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
return (NULL);
|
|
||||||
}
|
attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
|
||||||
|
|
||||||
+#ifdef WITH_LSPP
|
+#ifdef WITH_LSPP
|
||||||
+ if (is_lspp_config())
|
+ if (is_lspp_config())
|
||||||
@ -993,7 +993,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
if ((job = cupsdAddJob(priority, printer->name)) == NULL)
|
if ((job = cupsdAddJob(priority, printer->name)) == NULL)
|
||||||
{
|
{
|
||||||
send_ipp_status(con, IPP_INTERNAL_ERROR,
|
send_ipp_status(con, IPP_INTERNAL_ERROR,
|
||||||
@@ -1605,6 +1734,32 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1586,6 +1715,32 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1026,7 +1026,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
|
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
|
||||||
job->attrs = con->request;
|
job->attrs = con->request;
|
||||||
job->dirty = 1;
|
job->dirty = 1;
|
||||||
@@ -1794,6 +1949,29 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1773,6 +1928,29 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
ippSetString(job->attrs, &attr, 0, printer->job_sheets[0]);
|
ippSetString(job->attrs, &attr, 0, printer->job_sheets[0]);
|
||||||
ippSetString(job->attrs, &attr, 1, printer->job_sheets[1]);
|
ippSetString(job->attrs, &attr, 1, printer->job_sheets[1]);
|
||||||
}
|
}
|
||||||
@ -1056,7 +1056,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
|
|
||||||
job->job_sheets = attr;
|
job->job_sheets = attr;
|
||||||
|
|
||||||
@@ -1824,6 +2002,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1803,6 +1981,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
"job-sheets=\"%s,none\", "
|
"job-sheets=\"%s,none\", "
|
||||||
"job-originating-user-name=\"%s\"",
|
"job-originating-user-name=\"%s\"",
|
||||||
Classification, job->username);
|
Classification, job->username);
|
||||||
@ -1066,7 +1066,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
}
|
}
|
||||||
else if (attr->num_values == 2 &&
|
else if (attr->num_values == 2 &&
|
||||||
strcmp(attr->values[0].string.text,
|
strcmp(attr->values[0].string.text,
|
||||||
@@ -1842,6 +2023,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1821,6 +2002,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
"job-originating-user-name=\"%s\"",
|
"job-originating-user-name=\"%s\"",
|
||||||
attr->values[0].string.text,
|
attr->values[0].string.text,
|
||||||
attr->values[1].string.text, job->username);
|
attr->values[1].string.text, job->username);
|
||||||
@ -1076,7 +1076,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
}
|
}
|
||||||
else if (strcmp(attr->values[0].string.text, Classification) &&
|
else if (strcmp(attr->values[0].string.text, Classification) &&
|
||||||
strcmp(attr->values[0].string.text, "none") &&
|
strcmp(attr->values[0].string.text, "none") &&
|
||||||
@@ -1862,6 +2046,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1841,6 +2025,9 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
"job-originating-user-name=\"%s\"",
|
"job-originating-user-name=\"%s\"",
|
||||||
attr->values[0].string.text,
|
attr->values[0].string.text,
|
||||||
attr->values[1].string.text, job->username);
|
attr->values[1].string.text, job->username);
|
||||||
@ -1086,14 +1086,14 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (strcmp(attr->values[0].string.text, Classification) &&
|
else if (strcmp(attr->values[0].string.text, Classification) &&
|
||||||
@@ -1902,8 +2089,52 @@ add_job(cupsd_client_t *con, /* I - Cl
|
@@ -1881,8 +2068,52 @@ add_job(cupsd_client_t *con, /* I - Cl
|
||||||
"job-sheets=\"%s\", "
|
"job-sheets=\"%s\", "
|
||||||
"job-originating-user-name=\"%s\"",
|
"job-originating-user-name=\"%s\"",
|
||||||
Classification, job->username);
|
Classification, job->username);
|
||||||
+#ifdef WITH_LSPP
|
+#ifdef WITH_LSPP
|
||||||
+ override = 1;
|
+ override = 1;
|
||||||
+#endif /* WITH_LSPP */
|
+#endif /* WITH_LSPP */
|
||||||
}
|
+ }
|
||||||
+#ifdef WITH_LSPP
|
+#ifdef WITH_LSPP
|
||||||
+ if (is_lspp_config() && AuditLog != -1)
|
+ if (is_lspp_config() && AuditLog != -1)
|
||||||
+ {
|
+ {
|
||||||
@ -1127,7 +1127,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
+ }
|
+ }
|
||||||
+ cupsdClearString(&audit_message);
|
+ cupsdClearString(&audit_message);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
}
|
||||||
+
|
+
|
||||||
+ if (userheader)
|
+ if (userheader)
|
||||||
+ free(userheader);
|
+ free(userheader);
|
||||||
@ -1139,7 +1139,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* See if we need to add the starting sheet...
|
* See if we need to add the starting sheet...
|
||||||
@@ -3686,6 +3917,128 @@ check_rss_recipient(
|
@@ -3656,6 +3887,128 @@ check_rss_recipient(
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1268,7 +1268,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
/*
|
/*
|
||||||
* 'check_quotas()' - Check quotas for a printer and user.
|
* 'check_quotas()' - Check quotas for a printer and user.
|
||||||
*/
|
*/
|
||||||
@@ -4142,6 +4495,15 @@ copy_banner(cupsd_client_t *con, /* I -
|
@@ -4112,6 +4465,15 @@ copy_banner(cupsd_client_t *con, /* I -
|
||||||
char attrname[255], /* Name of attribute */
|
char attrname[255], /* Name of attribute */
|
||||||
*s; /* Pointer into name */
|
*s; /* Pointer into name */
|
||||||
ipp_attribute_t *attr; /* Attribute */
|
ipp_attribute_t *attr; /* Attribute */
|
||||||
@ -1284,7 +1284,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
|
|
||||||
|
|
||||||
cupsdLogMessage(CUPSD_LOG_DEBUG2,
|
cupsdLogMessage(CUPSD_LOG_DEBUG2,
|
||||||
@@ -4177,6 +4539,85 @@ copy_banner(cupsd_client_t *con, /* I -
|
@@ -4147,6 +4509,85 @@ copy_banner(cupsd_client_t *con, /* I -
|
||||||
|
|
||||||
fchmod(cupsFileNumber(out), 0640);
|
fchmod(cupsFileNumber(out), 0640);
|
||||||
fchown(cupsFileNumber(out), RunUser, Group);
|
fchown(cupsFileNumber(out), RunUser, Group);
|
||||||
@ -1370,7 +1370,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Try the localized banner file under the subdirectory...
|
* Try the localized banner file under the subdirectory...
|
||||||
@@ -4271,6 +4712,24 @@ copy_banner(cupsd_client_t *con, /* I -
|
@@ -4241,6 +4682,24 @@ copy_banner(cupsd_client_t *con, /* I -
|
||||||
else
|
else
|
||||||
s = attrname;
|
s = attrname;
|
||||||
|
|
||||||
@ -1395,7 +1395,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
if (!strcmp(s, "printer-name"))
|
if (!strcmp(s, "printer-name"))
|
||||||
{
|
{
|
||||||
cupsFilePuts(out, job->dest);
|
cupsFilePuts(out, job->dest);
|
||||||
@@ -6459,6 +6918,22 @@ get_job_attrs(cupsd_client_t *con, /* I
|
@@ -6480,6 +6939,22 @@ get_job_attrs(cupsd_client_t *con, /* I
|
||||||
|
|
||||||
exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
|
exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
|
||||||
|
|
||||||
@ -1418,7 +1418,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
/*
|
/*
|
||||||
* Copy attributes...
|
* Copy attributes...
|
||||||
*/
|
*/
|
||||||
@@ -6856,6 +7331,11 @@ get_jobs(cupsd_client_t *con, /* I - C
|
@@ -6877,6 +7352,11 @@ get_jobs(cupsd_client_t *con, /* I - C
|
||||||
if (username[0] && _cups_strcasecmp(username, job->username))
|
if (username[0] && _cups_strcasecmp(username, job->username))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@ -1430,7 +1430,7 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
if (count > 0)
|
if (count > 0)
|
||||||
ippAddSeparator(con->response);
|
ippAddSeparator(con->response);
|
||||||
|
|
||||||
@@ -11487,6 +11967,11 @@ validate_user(cupsd_job_t *job, /* I
|
@@ -11475,6 +11955,11 @@ validate_user(cupsd_job_t *job, /* I
|
||||||
|
|
||||||
strlcpy(username, get_username(con), userlen);
|
strlcpy(username, get_username(con), userlen);
|
||||||
|
|
||||||
@ -1442,9 +1442,9 @@ diff -up cups-2.2.5/scheduler/ipp.c.lspp cups-2.2.5/scheduler/ipp.c
|
|||||||
/*
|
/*
|
||||||
* Check the username against the owner...
|
* Check the username against the owner...
|
||||||
*/
|
*/
|
||||||
diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
diff -up cups-2.2.8/scheduler/job.c.lspp cups-2.2.8/scheduler/job.c
|
||||||
--- cups-2.2.5/scheduler/job.c.lspp 2017-10-17 19:06:19.607229238 +0200
|
--- cups-2.2.8/scheduler/job.c.lspp 2018-06-08 17:34:38.657654158 +0200
|
||||||
+++ cups-2.2.5/scheduler/job.c 2017-10-17 19:06:19.696228498 +0200
|
+++ cups-2.2.8/scheduler/job.c 2018-06-08 17:34:38.733653554 +0200
|
||||||
@@ -11,6 +11,9 @@
|
@@ -11,6 +11,9 @@
|
||||||
* missing or damaged, see the license at "http://www.cups.org/".
|
* missing or damaged, see the license at "http://www.cups.org/".
|
||||||
*/
|
*/
|
||||||
@ -1553,7 +1553,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
if (Classification && !banner_page)
|
if (Classification && !banner_page)
|
||||||
{
|
{
|
||||||
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
|
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
|
||||||
@@ -1908,6 +1988,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
|
@@ -1862,6 +1942,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
|
||||||
ippSetString(job->attrs, &job->reasons, 0, "none");
|
ippSetString(job->attrs, &job->reasons, 0, "none");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1576,7 +1576,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER);
|
job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER);
|
||||||
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER);
|
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER);
|
||||||
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
|
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
|
||||||
@@ -2321,6 +2417,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
|
@@ -2275,6 +2371,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
|
||||||
{
|
{
|
||||||
char filename[1024]; /* Job control filename */
|
char filename[1024]; /* Job control filename */
|
||||||
cups_file_t *fp; /* Job file */
|
cups_file_t *fp; /* Job file */
|
||||||
@ -1591,7 +1591,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
|
|
||||||
|
|
||||||
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
|
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
|
||||||
@@ -2343,6 +2447,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
|
@@ -2297,6 +2401,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
|
||||||
|
|
||||||
fchown(cupsFileNumber(fp), RunUser, Group);
|
fchown(cupsFileNumber(fp), RunUser, Group);
|
||||||
|
|
||||||
@ -1670,7 +1670,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
job->attrs->state = IPP_IDLE;
|
job->attrs->state = IPP_IDLE;
|
||||||
|
|
||||||
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
|
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
|
||||||
@@ -3989,6 +4165,19 @@ get_options(cupsd_job_t *job, /* I - Jo
|
@@ -3943,6 +4119,19 @@ get_options(cupsd_job_t *job, /* I - Jo
|
||||||
banner_page)
|
banner_page)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@ -1690,7 +1690,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
/*
|
/*
|
||||||
* Otherwise add them to the list...
|
* Otherwise add them to the list...
|
||||||
*/
|
*/
|
||||||
@@ -4750,6 +4939,18 @@ start_job(cupsd_job_t *job, /* I -
|
@@ -4704,6 +4893,18 @@ start_job(cupsd_job_t *job, /* I -
|
||||||
cupsd_printer_t *printer) /* I - Printer to print job */
|
cupsd_printer_t *printer) /* I - Printer to print job */
|
||||||
{
|
{
|
||||||
const char *filename; /* Support filename */
|
const char *filename; /* Support filename */
|
||||||
@ -1709,7 +1709,7 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
|
ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
|
||||||
"job-cancel-after",
|
"job-cancel-after",
|
||||||
IPP_TAG_INTEGER);
|
IPP_TAG_INTEGER);
|
||||||
@@ -4926,6 +5127,113 @@ start_job(cupsd_job_t *job, /* I -
|
@@ -4892,6 +5093,113 @@ start_job(cupsd_job_t *job, /* I -
|
||||||
fcntl(job->side_pipes[1], F_SETFD,
|
fcntl(job->side_pipes[1], F_SETFD,
|
||||||
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
|
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
|
||||||
|
|
||||||
@ -1823,9 +1823,9 @@ diff -up cups-2.2.5/scheduler/job.c.lspp cups-2.2.5/scheduler/job.c
|
|||||||
/*
|
/*
|
||||||
* Now start the first file in the job...
|
* Now start the first file in the job...
|
||||||
*/
|
*/
|
||||||
diff -up cups-2.2.5/scheduler/job.h.lspp cups-2.2.5/scheduler/job.h
|
diff -up cups-2.2.8/scheduler/job.h.lspp cups-2.2.8/scheduler/job.h
|
||||||
--- cups-2.2.5/scheduler/job.h.lspp 2017-10-13 20:22:26.000000000 +0200
|
--- cups-2.2.8/scheduler/job.h.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/job.h 2017-10-17 19:06:19.696228498 +0200
|
+++ cups-2.2.8/scheduler/job.h 2018-06-08 17:34:38.733653554 +0200
|
||||||
@@ -11,6 +11,13 @@
|
@@ -11,6 +11,13 @@
|
||||||
* missing or damaged, see the license at "http://www.cups.org/".
|
* missing or damaged, see the license at "http://www.cups.org/".
|
||||||
*/
|
*/
|
||||||
@ -1851,9 +1851,9 @@ diff -up cups-2.2.5/scheduler/job.h.lspp cups-2.2.5/scheduler/job.h
|
|||||||
};
|
};
|
||||||
|
|
||||||
typedef struct cupsd_joblog_s /**** Job log message ****/
|
typedef struct cupsd_joblog_s /**** Job log message ****/
|
||||||
diff -up cups-2.2.5/scheduler/main.c.lspp cups-2.2.5/scheduler/main.c
|
diff -up cups-2.2.8/scheduler/main.c.lspp cups-2.2.8/scheduler/main.c
|
||||||
--- cups-2.2.5/scheduler/main.c.lspp 2017-10-17 19:06:19.637228989 +0200
|
--- cups-2.2.8/scheduler/main.c.lspp 2018-06-08 17:34:38.663654110 +0200
|
||||||
+++ cups-2.2.5/scheduler/main.c 2017-10-17 19:08:26.642173026 +0200
|
+++ cups-2.2.8/scheduler/main.c 2018-06-08 17:34:38.734653546 +0200
|
||||||
@@ -56,6 +56,9 @@
|
@@ -56,6 +56,9 @@
|
||||||
# include <sys/param.h>
|
# include <sys/param.h>
|
||||||
#endif /* HAVE_SYS_PARAM_H */
|
#endif /* HAVE_SYS_PARAM_H */
|
||||||
@ -1874,7 +1874,7 @@ diff -up cups-2.2.5/scheduler/main.c.lspp cups-2.2.5/scheduler/main.c
|
|||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
int use_sysman = 1; /* Use system management functions? */
|
int use_sysman = 1; /* Use system management functions? */
|
||||||
#else
|
#else
|
||||||
@@ -516,6 +522,25 @@ main(int argc, /* I - Number of comm
|
@@ -495,6 +501,25 @@ main(int argc, /* I - Number of comm
|
||||||
exit(errno);
|
exit(errno);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1900,7 +1900,7 @@ diff -up cups-2.2.5/scheduler/main.c.lspp cups-2.2.5/scheduler/main.c
|
|||||||
/*
|
/*
|
||||||
* Let the system know we are busy while we bring up cupsd...
|
* Let the system know we are busy while we bring up cupsd...
|
||||||
*/
|
*/
|
||||||
@@ -1227,6 +1252,11 @@ main(int argc, /* I - Number of comm
|
@@ -1188,6 +1213,11 @@ main(int argc, /* I - Number of comm
|
||||||
|
|
||||||
cupsdStopSelect();
|
cupsdStopSelect();
|
||||||
|
|
||||||
@ -1912,9 +1912,9 @@ diff -up cups-2.2.5/scheduler/main.c.lspp cups-2.2.5/scheduler/main.c
|
|||||||
return (!stop_scheduler);
|
return (!stop_scheduler);
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -up cups-2.2.5/scheduler/printers.c.lspp cups-2.2.5/scheduler/printers.c
|
diff -up cups-2.2.8/scheduler/printers.c.lspp cups-2.2.8/scheduler/printers.c
|
||||||
--- cups-2.2.5/scheduler/printers.c.lspp 2017-10-17 19:06:19.587229404 +0200
|
--- cups-2.2.8/scheduler/printers.c.lspp 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.5/scheduler/printers.c 2017-10-17 19:06:19.697228490 +0200
|
+++ cups-2.2.8/scheduler/printers.c 2018-06-08 17:34:38.734653546 +0200
|
||||||
@@ -11,6 +11,8 @@
|
@@ -11,6 +11,8 @@
|
||||||
* missing or damaged, see the license at "http://www.cups.org/".
|
* missing or damaged, see the license at "http://www.cups.org/".
|
||||||
*/
|
*/
|
||||||
@ -1935,7 +1935,7 @@ diff -up cups-2.2.5/scheduler/printers.c.lspp cups-2.2.5/scheduler/printers.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Local functions...
|
* Local functions...
|
||||||
@@ -2212,6 +2218,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
|
@@ -2202,6 +2208,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
|
||||||
ipp_attribute_t *attr; /* Attribute data */
|
ipp_attribute_t *attr; /* Attribute data */
|
||||||
char *name, /* Current user/group name */
|
char *name, /* Current user/group name */
|
||||||
*filter; /* Current filter */
|
*filter; /* Current filter */
|
||||||
@ -1949,7 +1949,7 @@ diff -up cups-2.2.5/scheduler/printers.c.lspp cups-2.2.5/scheduler/printers.c
|
|||||||
|
|
||||||
|
|
||||||
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
|
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
|
||||||
@@ -2339,6 +2352,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
|
@@ -2329,6 +2342,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
|
||||||
attr->values[1].string.text = _cupsStrAlloc(Classification ?
|
attr->values[1].string.text = _cupsStrAlloc(Classification ?
|
||||||
Classification : p->job_sheets[1]);
|
Classification : p->job_sheets[1]);
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
|
diff -up cups-2.2.8/scheduler/main.c.systemd-socket cups-2.2.8/scheduler/main.c
|
||||||
--- cups-2.2.7/scheduler/main.c.systemd-socket 2018-04-03 14:23:12.128786025 +0200
|
--- cups-2.2.8/scheduler/main.c.systemd-socket 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.7/scheduler/main.c 2018-04-03 14:23:12.148785913 +0200
|
+++ cups-2.2.8/scheduler/main.c 2018-06-08 17:32:39.417600671 +0200
|
||||||
@@ -691,8 +691,16 @@ main(int argc, /* I - Number of comm
|
@@ -681,8 +681,16 @@ main(int argc, /* I - Number of comm
|
||||||
|
|
||||||
#ifdef HAVE_ONDEMAND
|
#ifdef HAVE_ONDEMAND
|
||||||
if (OnDemand)
|
if (OnDemand)
|
||||||
@ -19,9 +19,9 @@ diff -up cups-2.2.7/scheduler/main.c.systemd-socket cups-2.2.7/scheduler/main.c
|
|||||||
#endif /* HAVE_ONDEMAND */
|
#endif /* HAVE_ONDEMAND */
|
||||||
if (fg)
|
if (fg)
|
||||||
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
|
||||||
diff -up cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.path.in
|
diff -up cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.path.in
|
||||||
--- cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-03-23 04:48:36.000000000 +0100
|
--- cups-2.2.8/scheduler/org.cups.cupsd.path.in.systemd-socket 2018-06-05 18:06:54.000000000 +0200
|
||||||
+++ cups-2.2.7/scheduler/org.cups.cupsd.path.in 2018-04-03 14:23:12.148785913 +0200
|
+++ cups-2.2.8/scheduler/org.cups.cupsd.path.in 2018-06-08 17:32:39.417600671 +0200
|
||||||
@@ -3,7 +3,7 @@ Description=CUPS Scheduler
|
@@ -3,7 +3,7 @@ Description=CUPS Scheduler
|
||||||
PartOf=org.cups.cupsd.service
|
PartOf=org.cups.cupsd.service
|
||||||
|
|
||||||
@ -31,9 +31,9 @@ diff -up cups-2.2.7/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.2.7/s
|
|||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
diff -up cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.7/scheduler/org.cups.cupsd.service.in
|
diff -up cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.8/scheduler/org.cups.cupsd.service.in
|
||||||
--- cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-04-03 14:23:12.148785913 +0200
|
--- cups-2.2.8/scheduler/org.cups.cupsd.service.in.systemd-socket 2018-06-08 17:32:39.417600671 +0200
|
||||||
+++ cups-2.2.7/scheduler/org.cups.cupsd.service.in 2018-04-03 14:25:16.312088802 +0200
|
+++ cups-2.2.8/scheduler/org.cups.cupsd.service.in 2018-06-08 17:34:09.091888847 +0200
|
||||||
@@ -1,10 +1,11 @@
|
@@ -1,10 +1,11 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=CUPS Scheduler
|
Description=CUPS Scheduler
|
||||||
@ -44,6 +44,6 @@ diff -up cups-2.2.7/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.2.
|
|||||||
ExecStart=@sbindir@/cupsd -l
|
ExecStart=@sbindir@/cupsd -l
|
||||||
-Type=simple
|
-Type=simple
|
||||||
+Type=notify
|
+Type=notify
|
||||||
Restart=always
|
Restart=on-failure
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
143
cups.spec
143
cups.spec
@ -14,8 +14,8 @@
|
|||||||
Summary: CUPS printing system
|
Summary: CUPS printing system
|
||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.2.7
|
Version: 2.2.8
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Url: http://www.cups.org/
|
Url: http://www.cups.org/
|
||||||
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
|
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
|
||||||
@ -27,47 +27,119 @@ Source6: cups.logrotate
|
|||||||
Source7: ncp.backend
|
Source7: ncp.backend
|
||||||
Source8: macros.cups
|
Source8: macros.cups
|
||||||
|
|
||||||
|
# some man pages are shipped gzipped, don't do it
|
||||||
Patch1: cups-no-gzip-man.patch
|
Patch1: cups-no-gzip-man.patch
|
||||||
|
# PAM enablement, very old patch, not even git can track when or why
|
||||||
|
# the patch was added.
|
||||||
Patch2: cups-system-auth.patch
|
Patch2: cups-system-auth.patch
|
||||||
|
# cups-config from devel package conflicted on multilib arches,
|
||||||
|
# fixed hack with pkg-config calling for gnutls' libdir variable
|
||||||
Patch3: cups-multilib.patch
|
Patch3: cups-multilib.patch
|
||||||
|
# if someone makes a change to banner files, then there will <banner>.rpmnew
|
||||||
|
# with next update of cups-filters - this patch makes sure the banner file
|
||||||
|
# changed by user is used and .rpmnew or .rpmsave is ignored
|
||||||
|
# Note: This could be rewrite with use a kind of #define and send to upstream
|
||||||
Patch5: cups-banners.patch
|
Patch5: cups-banners.patch
|
||||||
Patch6: cups-serverbin-compat.patch
|
# don't export ssl libs to cups-config - can't find the reason.
|
||||||
Patch7: cups-no-export-ssllibs.patch
|
Patch7: cups-no-export-ssllibs.patch
|
||||||
|
# enables old uri usb:/dev/usb/lp0 - leave it here for users of old printers
|
||||||
Patch8: cups-direct-usb.patch
|
Patch8: cups-direct-usb.patch
|
||||||
Patch9: cups-lpr-help.patch
|
# fix for redhat dbus spooler - adding new dbus functions to backend/ipp.c
|
||||||
Patch10: cups-peercred.patch
|
# -> initialize dbus connection and sending dbus broadcast about job queued
|
||||||
Patch11: cups-pid.patch
|
# on remote queue with QueueChanged type for PRINTER_CHANGED, JOB_STATE_CHANGED
|
||||||
|
# and PRINTER_STATE_CHANGED events
|
||||||
Patch12: cups-eggcups.patch
|
Patch12: cups-eggcups.patch
|
||||||
|
# when system workload is high, timeout for cups-driverd can be reached -
|
||||||
|
# increase the timeout
|
||||||
Patch13: cups-driverd-timeout.patch
|
Patch13: cups-driverd-timeout.patch
|
||||||
Patch14: cups-strict-ppd-line-length.patch
|
# cupsd implement its own logrotate, but when MaxLogSize 0 is used, logrotated
|
||||||
|
# takes care of it
|
||||||
Patch15: cups-logrotate.patch
|
Patch15: cups-logrotate.patch
|
||||||
|
# usb backend didn't get any notification about out-of-paper because of kernel
|
||||||
Patch16: cups-usb-paperout.patch
|
Patch16: cups-usb-paperout.patch
|
||||||
Patch17: cups-res_init.patch
|
# uri compatibility with old Fedoras
|
||||||
Patch18: cups-filter-debug.patch
|
|
||||||
Patch19: cups-uri-compat.patch
|
Patch19: cups-uri-compat.patch
|
||||||
Patch20: cups-str3382.patch
|
# fixing snmp oid for hp printer - upstream doesn't want to support too much
|
||||||
#Patch21: cups-0755.patch
|
# snmp backend, because it's deprecated
|
||||||
Patch22: cups-hp-deviceid-oid.patch
|
Patch22: cups-hp-deviceid-oid.patch
|
||||||
Patch23: cups-dnssd-deviceid.patch
|
# same as HP OID
|
||||||
Patch24: cups-ricoh-deviceid-oid.patch
|
Patch24: cups-ricoh-deviceid-oid.patch
|
||||||
|
# change to notify type, because when it fails to start, it gives a error
|
||||||
|
# message
|
||||||
Patch25: cups-systemd-socket.patch
|
Patch25: cups-systemd-socket.patch
|
||||||
Patch27: cups-avahi-address.patch
|
# use IP_FREEBIND, because cupsd cannot bind to not yet existing IP address
|
||||||
Patch29: cups-dymo-deviceid.patch
|
# by default
|
||||||
Patch30: cups-freebind.patch
|
Patch30: cups-freebind.patch
|
||||||
#Patch31: cups-no-gcry.patch
|
# add support of multifile
|
||||||
Patch33: cups-use-ipp1.1.patch
|
|
||||||
Patch34: cups-avahi-no-threaded.patch
|
|
||||||
Patch35: cups-ipp-multifile.patch
|
Patch35: cups-ipp-multifile.patch
|
||||||
|
# prolongs web ui timeout
|
||||||
Patch36: cups-web-devices-timeout.patch
|
Patch36: cups-web-devices-timeout.patch
|
||||||
|
# needs to be set to Yes to avoid race conditions
|
||||||
Patch37: cups-synconclose.patch
|
Patch37: cups-synconclose.patch
|
||||||
|
# ypbind must be started before cups if NIS configured
|
||||||
Patch38: cups-ypbind.patch
|
Patch38: cups-ypbind.patch
|
||||||
Patch39: cups-substitute-bad-attrs.patch
|
|
||||||
|
# selinux and audit enablement for CUPS - needs work and CUPS upstream wants
|
||||||
|
# to have these features implemented their way in the future
|
||||||
|
Patch100: cups-lspp.patch
|
||||||
|
|
||||||
|
# reported upstream or upstream patches - possible removal later
|
||||||
|
# adding --help option to lpr command
|
||||||
|
Patch9: cups-lpr-help.patch
|
||||||
|
# adds logs when job fails due bad conversion
|
||||||
|
Patch18: cups-filter-debug.patch
|
||||||
|
# add device id for dymo printer
|
||||||
|
Patch29: cups-dymo-deviceid.patch
|
||||||
# cupsd LogLevel ignored when logging to journald (syslog) (#1589593) -
|
# cupsd LogLevel ignored when logging to journald (syslog) (#1589593) -
|
||||||
# cups logging ignored log level when logging was set to syslog and
|
# cups logging ignored log level when logging was set to syslog and
|
||||||
# it did not support job logging history
|
# it did not support job logging history (upstream https://github.com/apple/cups/pull/5337)
|
||||||
Patch40: cups-journal-history.patch
|
Patch40: cups-journal-history.patch
|
||||||
|
# cupsd crashes when AccessLog is NULL (upstream https://github.com/apple/cups/issues/5309)
|
||||||
|
Patch41: cups-accesslog-null.patch
|
||||||
|
# printing with epson crashes when page size is A4/A6 (upstream https://github.com/apple/cups/issues/5323)
|
||||||
|
Patch42: cups-epson-A6-crash.patch
|
||||||
|
# gnome-control-center eats a lot CPU - regression in ippValidateAttribute (upstream https://github.com/apple/cups/issues/5330 , https://github.com/apple/cups/issues/5322)
|
||||||
|
Patch43: cups-ippvalidateattr-regression.patch
|
||||||
|
# IPP everywhere driver isn't in web UI (upstream https://github.com/apple/cups/issues/5338)
|
||||||
|
Patch44: cups-ippeve-webui.patch
|
||||||
|
|
||||||
Patch100: cups-lspp.patch
|
##### Patches removed because IMHO they aren't no longer needed
|
||||||
|
##### but still I'll leave them in git in case their removal
|
||||||
|
##### breaks something.
|
||||||
|
# every filter and backend should be in /usr/lib/cups, the patch for
|
||||||
|
# for /usr/lib64/cups is not needed
|
||||||
|
#Patch6: cups-serverbin-compat.patch
|
||||||
|
# <sys/socket.h> is included in http-private.h, which is included in
|
||||||
|
# cups-private.h and cups-private.h is included in cupsd.h
|
||||||
|
#Patch10: cups-peercred.patch
|
||||||
|
# cupsd doesn't save its pid number by default - the patch was introduced for
|
||||||
|
# initscripts, which are deprecated - I'll remove this patch for now
|
||||||
|
#Patch11: cups-pid.patch
|
||||||
|
# enforce ppd line length only when PPD_CONFORM_STRICT is set for old
|
||||||
|
# foomatic (from RHEL 3/4)
|
||||||
|
#Patch14: cups-strict-ppd-line-length.patch
|
||||||
|
# glibc's getaddrinfo now reacts on changes in /etc/resolv.conf and restarts
|
||||||
|
# resolver by itself (https://bugzilla.redhat.com/show_bug.cgi?id=1374239)
|
||||||
|
#Patch17: cups-res_init.patch
|
||||||
|
# upstream especially doesn't want to use mkstemp because of bad API and
|
||||||
|
# portability - because it is patch because of depreacated cups-lpd,
|
||||||
|
# I remove it because of divergence from upstream
|
||||||
|
#Patch20: cups-str3382.patch
|
||||||
|
# now done by configure option
|
||||||
|
#Patch21: cups-0755.patch
|
||||||
|
# markes fuzzy device ids - created from mdns message - with FZY, not in upstream
|
||||||
|
# not clear benefit - removing for now
|
||||||
|
#Patch23: cups-dnssd-deviceid.patch
|
||||||
|
# upstream rejected this patch, don't diverge from upstream - when trying to use
|
||||||
|
# dnssd uri discovered by dnssd backend then printing failed
|
||||||
|
#Patch27: cups-avahi-address.patch
|
||||||
|
# seems unnecessary derivation from upstream
|
||||||
|
#Patch31: cups-no-gcry.patch
|
||||||
|
# Removing this patch, because we want to default to IPP 2.0, which is needed
|
||||||
|
# by IPP Everywhere
|
||||||
|
#Patch33: cups-use-ipp1.1.patch
|
||||||
|
# rejected by upstream, possibly fixed by str4347.patch according upstream
|
||||||
|
#Patch34: cups-avahi-no-threaded.patch
|
||||||
|
|
||||||
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
|
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
@ -204,7 +276,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
# Ignore rpm save/new files in the banners directory.
|
# Ignore rpm save/new files in the banners directory.
|
||||||
%patch5 -p1 -b .banners
|
%patch5 -p1 -b .banners
|
||||||
# Use compatibility fallback path for ServerBin.
|
# Use compatibility fallback path for ServerBin.
|
||||||
%patch6 -p1 -b .serverbin-compat
|
#%%patch6 -p1 -b .serverbin-compat
|
||||||
# Don't export SSLLIBS to cups-config.
|
# Don't export SSLLIBS to cups-config.
|
||||||
%patch7 -p1 -b .no-export-ssllibs
|
%patch7 -p1 -b .no-export-ssllibs
|
||||||
# Allow file-based usb device URIs.
|
# Allow file-based usb device URIs.
|
||||||
@ -212,39 +284,39 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
# Add --help option to lpr.
|
# Add --help option to lpr.
|
||||||
%patch9 -p1 -b .lpr-help
|
%patch9 -p1 -b .lpr-help
|
||||||
# Fix compilation of peer credentials support.
|
# Fix compilation of peer credentials support.
|
||||||
%patch10 -p1 -b .peercred
|
#%%patch10 -p1 -b .peercred
|
||||||
# Maintain a cupsd.pid file.
|
# Maintain a cupsd.pid file.
|
||||||
%patch11 -p1 -b .pid
|
#%%patch11 -p1 -b .pid
|
||||||
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
|
# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
|
||||||
%patch12 -p1 -b .eggcups
|
%patch12 -p1 -b .eggcups
|
||||||
# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
|
# Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
|
||||||
%patch13 -p1 -b .driverd-timeout
|
%patch13 -p1 -b .driverd-timeout
|
||||||
# Only enforce maximum PPD line length when in strict mode.
|
# Only enforce maximum PPD line length when in strict mode.
|
||||||
%patch14 -p1 -b .strict-ppd-line-length
|
#%%patch14 -p1 -b .strict-ppd-line-length
|
||||||
# Re-open the log if it has been logrotated under us.
|
# Re-open the log if it has been logrotated under us.
|
||||||
%patch15 -p1 -b .logrotate
|
%patch15 -p1 -b .logrotate
|
||||||
# Support for errno==ENOSPACE-based USB paper-out reporting.
|
# Support for errno==ENOSPACE-based USB paper-out reporting.
|
||||||
%patch16 -p1 -b .usb-paperout
|
%patch16 -p1 -b .usb-paperout
|
||||||
# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
|
# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
|
||||||
%patch17 -p1 -b .res_init
|
#%%patch17 -p1 -b .res_init
|
||||||
# Log extra debugging information if no filters are available.
|
# Log extra debugging information if no filters are available.
|
||||||
%patch18 -p1 -b .filter-debug
|
%patch18 -p1 -b .filter-debug
|
||||||
# Allow the usb backend to understand old-style URI formats.
|
# Allow the usb backend to understand old-style URI formats.
|
||||||
%patch19 -p1 -b .uri-compat
|
%patch19 -p1 -b .uri-compat
|
||||||
# Fix temporary filename creation.
|
# Fix temporary filename creation.
|
||||||
%patch20 -p1 -b .str3382
|
#%%patch20 -p1 -b .str3382
|
||||||
# Use mode 0755 for binaries and libraries where appropriate.
|
# Use mode 0755 for binaries and libraries where appropriate.
|
||||||
#%%patch21 -p1 -b .0755
|
#%%patch21 -p1 -b .0755
|
||||||
# Add an SNMP query for HP's device ID OID (STR #3552).
|
# Add an SNMP query for HP's device ID OID (STR #3552).
|
||||||
%patch22 -p1 -b .hp-deviceid-oid
|
%patch22 -p1 -b .hp-deviceid-oid
|
||||||
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
|
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
|
||||||
%patch23 -p1 -b .dnssd-deviceid
|
#%%patch23 -p1 -b .dnssd-deviceid
|
||||||
# Add an SNMP query for Ricoh's device ID OID (STR #3552).
|
# Add an SNMP query for Ricoh's device ID OID (STR #3552).
|
||||||
%patch24 -p1 -b .ricoh-deviceid-oid
|
%patch24 -p1 -b .ricoh-deviceid-oid
|
||||||
# Make cups.service Type=notify (bug #1088918).
|
# Make cups.service Type=notify (bug #1088918).
|
||||||
%patch25 -p1 -b .systemd-socket
|
%patch25 -p1 -b .systemd-socket
|
||||||
# Use IP address when resolving DNSSD URIs (bug #948288).
|
# Use IP address when resolving DNSSD URIs (bug #948288).
|
||||||
%patch27 -p1 -b .avahi-address
|
#%%patch27 -p1 -b .avahi-address
|
||||||
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
|
||||||
%patch29 -p1 -b .dymo-deviceid
|
%patch29 -p1 -b .dymo-deviceid
|
||||||
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
|
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
|
||||||
@ -252,9 +324,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
# Don't link against libgcrypt needlessly.
|
# Don't link against libgcrypt needlessly.
|
||||||
#%%patch31 -p1 -b .no-gcry
|
#%%patch31 -p1 -b .no-gcry
|
||||||
# Default to IPP/1.1 for now (bug #977813).
|
# Default to IPP/1.1 for now (bug #977813).
|
||||||
%patch33 -p1 -b .use-ipp1.1
|
#%%patch33 -p1 -b .use-ipp1.1
|
||||||
# Don't use D-Bus from two threads (bug #979748).
|
# Don't use D-Bus from two threads (bug #979748).
|
||||||
%patch34 -p1 -b .avahi-no-threaded
|
#%%patch34 -p1 -b .avahi-no-threaded
|
||||||
# Fixes for jobs with multiple files and multiple formats.
|
# Fixes for jobs with multiple files and multiple formats.
|
||||||
%patch35 -p1 -b .ipp-multifile
|
%patch35 -p1 -b .ipp-multifile
|
||||||
# Increase web interface get-devices timeout to 10s (bug #996664).
|
# Increase web interface get-devices timeout to 10s (bug #996664).
|
||||||
@ -269,11 +341,15 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
|
|||||||
%patch100 -p1 -b .lspp
|
%patch100 -p1 -b .lspp
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# substitute default values for invalid job attributes (upstream issues #5229 and #5186)
|
|
||||||
%patch39 -p1 -b .substitute-bad-attrs
|
|
||||||
# cupsd LogLevel ignored when logging to journald (syslog) (bug #1589593)
|
# cupsd LogLevel ignored when logging to journald (syslog) (bug #1589593)
|
||||||
%patch40 -p1 -b .journal-history
|
%patch40 -p1 -b .journal-history
|
||||||
|
%patch41 -p1 -b .accesslog-null
|
||||||
|
%patch42 -p1 -b .epson-A6-crash
|
||||||
|
%patch43 -p1 -b .ippvalidateattr-regression
|
||||||
|
%patch44 -p1 -b .ippeve-webui
|
||||||
|
|
||||||
|
# if cupsd is set to log into /var/log/cups, then 'MaxLogSize 0' needs to be
|
||||||
|
# in cupsd.conf to disable cupsd logrotate functionality and use logrotated
|
||||||
sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
|
sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
|
||||||
|
|
||||||
# Log to the system journal by default (bug #1078781, bug #1519331).
|
# Log to the system journal by default (bug #1078781, bug #1519331).
|
||||||
@ -664,6 +740,9 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man5/ipptoolfile.5.gz
|
%{_mandir}/man5/ipptoolfile.5.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 27 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.8-1
|
||||||
|
- 2.2.8, removing several downstream patches, adding some upstream patches
|
||||||
|
|
||||||
* Tue Jun 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.7-2
|
* Tue Jun 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.7-2
|
||||||
- 1589593 - cupsd LogLevel ignored when logging to journald (syslog)
|
- 1589593 - cupsd LogLevel ignored when logging to journald (syslog)
|
||||||
- 1590123 - cups-driverd doesn't recognize static gzipped ppds
|
- 1590123 - cups-driverd doesn't recognize static gzipped ppds
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cups-2.2.7-source.tar.gz) = 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
|
SHA512 (cups-2.2.8-source.tar.gz) = 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261
|
||||||
|
Loading…
Reference in New Issue
Block a user