diff --git a/cups-journal.patch b/cups-journal.patch index 2af220e..0601269 100644 --- a/cups-journal.patch +++ b/cups-journal.patch @@ -473,7 +473,7 @@ diff -up cups-1.7.0/scheduler/log.c.journal cups-1.7.0/scheduler/log.c + "CUPS_JOB_ID=%d", job->id, + NULL) ? 0 : 1); + } else -+ return (sd_journal_print (syslevels[level], message) ? 0 : 1); ++ return (sd_journal_print (syslevels[level], "%s", message) ? 0 : 1); + } +#endif /* HAVE_JOURNAL */ #ifdef HAVE_VSYSLOG diff --git a/cups.spec b/cups.spec index b68fe3b..fd69c7a 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -658,6 +658,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Fri Dec 13 2013 Tim Waugh - 1:1.7.0-8 +- Use string literal for format string in sd_journal_print call. + * Thu Nov 28 2013 Tim Waugh - 1:1.7.0-7 - Prevent USB timeouts causing incorrect print output (bug #1026914).