diff --git a/cups-synconclose.patch b/cups-synconclose.patch new file mode 100644 index 0000000..2d75e1d --- /dev/null +++ b/cups-synconclose.patch @@ -0,0 +1,50 @@ +diff -up cups-1.7.0/doc/help/man-cups-files.conf.html.synconclose cups-1.7.0/doc/help/man-cups-files.conf.html +--- cups-1.7.0/doc/help/man-cups-files.conf.html.synconclose 2013-10-31 11:19:11.927824302 +0000 ++++ cups-1.7.0/doc/help/man-cups-files.conf.html 2013-10-31 11:19:24.061871113 +0000 +@@ -146,7 +146,7 @@ be found. +
SyncOnClose No +
+
Specifies whether the scheduler calls fsync(2) after writing configuration +-or state files. The default is No. ++or state files. The default is Yes. +
+
SystemGroup group-name [group-name ...] +
+diff -up cups-1.7.0/doc/help/ref-cups-files-conf.html.in.synconclose cups-1.7.0/doc/help/ref-cups-files-conf.html.in +--- cups-1.7.0/doc/help/ref-cups-files-conf.html.in.synconclose 2013-10-31 11:19:33.382907073 +0000 ++++ cups-1.7.0/doc/help/ref-cups-files-conf.html.in 2013-10-31 11:20:31.567131557 +0000 +@@ -442,8 +442,8 @@ SyncOnClose Yes + +

The SyncOnClose directive determines whether the scheduler + flushes changes to configuration and state files to disk. The default is +-No which relies on the operating system to schedule a suitable +-time to write changes to disk.

++Yes. The option No relies on the operating ++system to schedule a suitable time to write changes to disk.

+ +
Note: + +diff -up cups-1.7.0/man/cups-files.conf.man.in.synconclose cups-1.7.0/man/cups-files.conf.man.in +--- cups-1.7.0/man/cups-files.conf.man.in.synconclose 2013-10-31 11:18:43.928716290 +0000 ++++ cups-1.7.0/man/cups-files.conf.man.in 2013-10-31 11:19:00.870781647 +0000 +@@ -126,7 +126,7 @@ SyncOnClose Yes + .TP 5 + SyncOnClose No + Specifies whether the scheduler calls \fIfsync(2)\fR after writing configuration +-or state files. The default is No. ++or state files. The default is Yes. + .TP 5 + SystemGroup group-name [group-name ...] + .br +diff -up cups-1.7.0/scheduler/conf.c.synconclose cups-1.7.0/scheduler/conf.c +--- cups-1.7.0/scheduler/conf.c.synconclose 2013-10-31 11:20:45.560185549 +0000 ++++ cups-1.7.0/scheduler/conf.c 2013-10-31 11:20:56.679228452 +0000 +@@ -738,7 +738,7 @@ cupsdReadConfiguration(void) + ReloadTimeout = DEFAULT_KEEPALIVE; + RootCertDuration = 300; + StrictConformance = FALSE; +- SyncOnClose = FALSE; ++ SyncOnClose = TRUE; + Timeout = DEFAULT_TIMEOUT; + WebInterface = CUPS_DEFAULT_WEBIF; + diff --git a/cups.spec b/cups.spec index 0cecbff..f0ee6b3 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -70,6 +70,7 @@ Patch41: cups-web-devices-timeout.patch Patch43: cups-final-content-type.patch Patch44: cups-jobhistory.patch Patch45: cups-journal.patch +Patch46: cups-synconclose.patch Patch100: cups-lspp.patch @@ -269,6 +270,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch44 -p1 -b .jobhistory # Allow "journal" log type for log output to system journal. %patch45 -p1 -b .journal +# Set the default for SyncOnClose to Yes. +%patch46 -p1 -b .synconclose %if %lspp # LSPP support. @@ -649,6 +652,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Thu Oct 31 2013 Tim Waugh - 1:1.7.0-3 +- Set the default for SyncOnClose to Yes. + * Mon Oct 28 2013 Tim Waugh - 1:1.7.0-2 - Use upstream patch to fix job history.