diff --git a/cups-jobhistory.patch b/cups-jobhistory.patch new file mode 100644 index 0000000..4fc6694 --- /dev/null +++ b/cups-jobhistory.patch @@ -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) diff --git a/cups.spec b/cups.spec index 29017c1..fa9e716 100644 --- a/cups.spec +++ b/cups.spec @@ -14,7 +14,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7 -Release: 0.26.%{prever}%{?dist} +Release: 0.27.%{prever}%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -73,6 +73,7 @@ Patch40: cups-full-relro.patch Patch41: cups-web-devices-timeout.patch Patch42: cups-synconclose.patch Patch43: cups-final-content-type.patch +Patch44: cups-jobhistory.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 # printing to remote CUPS servers (bug #1010580). %patch43 -p1 -b .final-content-type +# Fix job history logging. +%patch44 -p1 -b .jobhistory %if %lspp # LSPP support. @@ -646,6 +649,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Thu Oct 24 2013 Tim Waugh - 1:1.7-0.27.rc1 +- Fix job history logging. + * Fri Sep 27 2013 Tim Waugh - 1:1.7-0.26.rc1 - Reverted upstream change to FINAL_CONTENT_TYPE in order to fix printing to remote CUPS servers (bug #1010580).