rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

2.1.0

Browse Source
This commit is contained in:
Jiri Popelka 2015-09-01 10:50:31 +02:00
parent c24d1eaaa9
commit d74023bb36
4 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -70,3 +70,4 @@ cups-1.4.4-source.tar.bz2
/cups-2.0.4-source.tar.bz2 /cups-2.0.4-source.tar.bz2
/cups-2.1b1-source.tar.bz2 /cups-2.1b1-source.tar.bz2
/cups-2.1rc1-source.tar.bz2 /cups-2.1rc1-source.tar.bz2
/cups-2.1.0-source.tar.bz2

30
cups-journal.patch
View File

@ -1,30 +0,0 @@
diff -up cups-2.1rc1/scheduler/log.c.journal cups-2.1rc1/scheduler/log.c
--- cups-2.1rc1/scheduler/log.c.journal 2015-08-13 11:12:07.738534615 +0200
+++ cups-2.1rc1/scheduler/log.c 2015-08-13 11:14:41.411980473 +0200
@@ -646,7 +646,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
asl_set(m, PWG_Event, "JobStateChanged");
asl_set(m, PWG_JobID, job_id);
- asl_set(m, PWG_JobState, job_states[job->state_value - IPP_JSTATE_PENDING]);
+ asl_set(m, PWG_JobState, job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING]);
if (job->impressions)
{
@@ -666,7 +666,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
#elif defined(HAVE_SYSTEMD_SD_JOURNAL_H)
if (!strcmp(ErrorLog, "syslog"))
{
- cupsd_printer_t *printer = job->printer ? job->printer : job->dest ? cupsdFindDest(job->dest) : NULL;
+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL;
static const char * const job_states[] =
{ /* job-state strings */
"Pending",
@@ -696,7 +696,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
PWG_Event"=JobStateChanged",
PWG_ServiceURI"=%s", printer ? printer->uri : "",
PWG_JobID"=%d", job->id,
- PWG_JobState"=%s", job_states[job->state_value - IPP_JSTATE_PENDING],
+ 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

19
cups.spec
View File

@ -7,14 +7,15 @@
# but we use lib for compatibility with 3rd party drivers (at upstream request). # but we use lib for compatibility with 3rd party drivers (at upstream request).
%global cups_serverbin %{_exec_prefix}/lib/cups %global cups_serverbin %{_exec_prefix}/lib/cups
%global prever rc1 #%%global prever rc1
%global VERSION %{version}%{prever} #%%global VERSION %{version}%{prever}
%global VERSION %{version}
Summary: CUPS printing system Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.1 Version: 2.1.0
Release: 0.3%{prever}%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: http://www.cups.org/software/%{VERSION}/cups-%{VERSION}-source.tar.bz2 Source0: http://www.cups.org/software/%{VERSION}/cups-%{VERSION}-source.tar.bz2
@ -60,8 +61,7 @@ Patch33: cups-use-ipp1.1.patch
Patch34: cups-avahi-no-threaded.patch Patch34: cups-avahi-no-threaded.patch
Patch35: cups-ipp-multifile.patch Patch35: cups-ipp-multifile.patch
Patch36: cups-web-devices-timeout.patch Patch36: cups-web-devices-timeout.patch
Patch37: cups-journal.patch Patch37: cups-synconclose.patch
Patch38: cups-synconclose.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -253,10 +253,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%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).
%patch36 -p1 -b .web-devices-timeout %patch36 -p1 -b .web-devices-timeout
# Allow "journal" log type for log output to system journal.
%patch37 -p1 -b .journal
# Set the default for SyncOnClose to Yes. # Set the default for SyncOnClose to Yes.
%patch38 -p1 -b .synconclose %patch37 -p1 -b .synconclose
%if %{lspp} %if %{lspp}
# LSPP support. # LSPP support.
@ -621,6 +619,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Sep 01 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.1.0-1
- 2.1.0
* Thu Aug 13 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.1-0.3rc1 * Thu Aug 13 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.1-0.3rc1
- fix crash in scheduler (#1253135) - fix crash in scheduler (#1253135)

2
sources
View File

@ -1 +1 @@
18f90dfee618598d541e664f7d73304e cups-2.1rc1-source.tar.bz2 c4e57a66298bfdba66bb3d5bedd317a4 cups-2.1.0-source.tar.bz2