diff --git a/cups-journal.patch b/cups-journal.patch index 84358bd..debf83d 100644 --- a/cups-journal.patch +++ b/cups-journal.patch @@ -334,3 +334,49 @@ diff -up cups-1.7.1/scheduler/Makefile.journal cups-1.7.1/scheduler/Makefile tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c +--- cups-1.7.1/conf/cups-files.conf.in.journal 2014-04-04 13:12:13.923185140 +0100 ++++ cups-1.7.1/conf/cups-files.conf.in 2014-04-04 13:13:10.633430876 +0100 +@@ -30,9 +30,10 @@ SystemGroup @CUPS_SYSTEM_GROUPS@ + #ConfigFilePerm 0@CUPS_CONFIG_FILE_PERM@ + #LogFilePerm 0@CUPS_LOG_FILE_PERM@ + +-# Location of the file logging all access to the scheduler; may be the name +-# "syslog". If not an absolute path, the value of ServerRoot is used as the +-# root directory. Also see the "AccessLogLevel" directive in cupsd.conf. ++# Location of the file logging all access to the scheduler; may be the ++# name "syslog" or "journal". If not an absolute path, the value of ++# ServerRoot is used as the root directory. Also see the ++# "AccessLogLevel" directive in cupsd.conf. + AccessLog @CUPS_LOGDIR@/access_log + + # Location of cache files used by the scheduler... +@@ -44,10 +45,10 @@ AccessLog @CUPS_LOGDIR@/access_log + # Location of the static web content served by the scheduler... + #DocumentRoot @CUPS_DOCROOT@ + +-# Location of the file logging all messages produced by the scheduler and any +-# helper programs; may be the name "syslog". If not an absolute path, the value +-# of ServerRoot is used as the root directory. Also see the "LogLevel" +-# directive in cupsd.conf. ++# Location of the file logging all messages produced by the scheduler ++# and any helper programs; may be the name "syslog" or "journal". If ++# not an absolute path, the value of ServerRoot is used as the root ++# directory. Also see the "LogLevel" # directive in cupsd.conf. + ErrorLog @CUPS_LOGDIR@/error_log + + # Location of fonts used by older print filters... +@@ -56,10 +57,10 @@ ErrorLog @CUPS_LOGDIR@/error_log + # Location of LPD configuration + #LPDConfigFile @CUPS_DEFAULT_LPD_CONFIG_FILE@ + +-# Location of the file logging all pages printed by the scheduler and any +-# helper programs; may be the name "syslog". If not an absolute path, the value +-# of ServerRoot is used as the root directory. Also see the "PageLogFormat" +-# directive in cupsd.conf. ++# Location of the file logging all pages printed by the scheduler and ++# any helper programs; may be the name "syslog" or "journal". If not ++# an absolute path, the value of ServerRoot is used as the root ++# directory. Also see the "PageLogFormat" directive in cupsd.conf. + PageLog @CUPS_LOGDIR@/page_log + + # Location of the file listing all of the local printers... diff --git a/cups.spec b/cups.spec index 0236662..1898a5e 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -292,6 +292,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results. sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in +# Log to the system journal by default (bug #1078781). +sed -i -e 's,^ErrorLog .*$,ErrorLog journal,' conf/cups-files.conf.in + # Let's look at the compilation command lines. perl -pi -e "s,^.SILENT:,," Makedefs.in @@ -680,6 +683,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Fri Apr 4 2014 Tim Waugh - 1:1.7.1-11 +- Log to the system journal by default (bug #1078781). + * Thu Apr 3 2014 Tim Waugh - 1:1.7.1-10 - libcups: avoid race condition when sending IPP requests (STR #4386, bug #1072952).