From: Joey Hess <joeyh@debian.org>
Date: Tue, 9 Aug 2016 16:11:31 +0000 (+0200)
Subject: Disable time stamps in conffiles, to avoid ever-changing files in /etc.
X-Git-Tag: v2.3.3op1~40^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2d9c33a6ed9e0d4737ea4fe16fcac2a914356b;p=thirdparty%2Fcups.git

Disable time stamps in conffiles, to avoid ever-changing files in /etc.

Bug: https://github.com/apple/cups/issues/3067
Bug-Debian: https://bugs.debian.org/549673
---

diff --git a/scheduler/classes.c b/scheduler/classes.c
index 14d2558bf0..35d0eb77d5 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -688,7 +688,7 @@ cupsdSaveAllClasses(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
  /*
diff --git a/scheduler/job.c b/scheduler/job.c
index 17b341834c..624450ba3a 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2201,7 +2201,7 @@ cupsdSaveAllJobs(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
  /*
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 23feb3429f..60ea016da9 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1506,7 +1506,7 @@ cupsdSaveAllPrinters(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
   cupsFilePrintf(fp, "NextPrinterId %d\n", NextPrinterId);
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 15acedca8d..eca0bfa19a 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1051,7 +1051,7 @@ cupsdSaveAllSubscriptions(void)
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", &curdate);
 
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);