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

Fix job history logging.

Browse Source
This commit is contained in:
Tim Waugh 2013-10-24 15:44:10 +01:00
parent 585f6b3406
commit 3d3e404e3b
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-jobhistory.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.7rc1/scheduler/log.c.orig cups-1.7rc1/scheduler/log.c
--- cups-1.7rc1/scheduler/log.c.orig 2013-10-24 15:40:42.412062412 +0100
+++ cups-1.7rc1/scheduler/log.c 2013-10-24 15:40:43.329066617 +0100
@@ -534,7 +534,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo
if ((temp = malloc(sizeof(cupsd_joblog_t) + strlen(log_line))) != NULL)
{
temp->time = time(NULL);
- strlcpy(temp->message, log_line, sizeof(temp->message));
+ strcpy(temp->message, log_line);
}
if (!job->history)

8
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7 Version: 1.7
Release: 0.26.%{prever}%{?dist} Release: 0.27.%{prever}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -73,6 +73,7 @@ Patch40: cups-full-relro.patch
Patch41: cups-web-devices-timeout.patch Patch41: cups-web-devices-timeout.patch
Patch42: cups-synconclose.patch Patch42: cups-synconclose.patch
Patch43: cups-final-content-type.patch Patch43: cups-final-content-type.patch
Patch44: cups-jobhistory.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -272,6 +273,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Reverted upstream change to FINAL_CONTENT_TYPE in order to fix # Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
# printing to remote CUPS servers (bug #1010580). # printing to remote CUPS servers (bug #1010580).
%patch43 -p1 -b .final-content-type %patch43 -p1 -b .final-content-type
# Fix job history logging.
%patch44 -p1 -b .jobhistory
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -646,6 +649,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Thu Oct 24 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.27.rc1
- Fix job history logging.
* Fri Sep 27 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.26.rc1 * Fri Sep 27 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.26.rc1
- Reverted upstream change to FINAL_CONTENT_TYPE in order to fix - Reverted upstream change to FINAL_CONTENT_TYPE in order to fix
printing to remote CUPS servers (bug #1010580). printing to remote CUPS servers (bug #1010580).