← Back to branch summary

~ubuntu-branches/ubuntu/lucid/cups/lucid

« back to all changes in this revision

Viewing changes to debian/patches/no-conffile-timestamp.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, Till Kamppeter, Martin Pitt
  • Date: 2010-03-24 16:50:56 UTC
  • Revision ID: james.westby@ubuntu.com-20100324165056-o4wrlv8vy3pibgk8
Tags: 1.4.2-10
https://launchpad.net/bugs/544636
http://bugs.debian.org/549673
http://bugs.debian.org/572940
[ Till Kamppeter ]
* debian/local/filters/pdf-filters/pdftopdf/P2PDoc.cxx: Output of the
  pdftopdf filter was not completely complying with the Adobe specs for PDF.
  Thanks to Duncan Lock for finding and reporting the bug and supplying a
  fix (LP: #544636).

[ Martin Pitt ]
* Add no-conffile-timestamp.dpatch: Disable time stamps in conffiles, to
  avoid ever-changing files in /etc. Thanks Joey Hess!
  (Rejected upstream, STR#3067; Closes: #549673)
* CVE-2010-0393.dpatch: Replace with patch from upstream, and tag
  header. (Closes: #572940)
* debian/local/filters/pdf-filters/*: Disable call of setErrorFunction() on
  armel for now, since armel's libpoppler is broken. This works around
  #575262, so that cups can finally go into testing again (which is more
  than overdue).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/no-conffile-timestamp.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## no-conffile-timestamp.dpatch by Joey Hess <joeyh@debian.org>
 
3
##
 
4
## DP: Disable time stamps in conffiles, to avoid ever-changing files in /etc.
 
5
## DP: Rejected upstream (http://www.cups.org/str.php?L3067).
 
6
## DP: Debian #549673
 
7
 
 
8
@DPATCH@
 
9
diff -urNad cups-1.4.2~/scheduler/classes.c cups-1.4.2/scheduler/classes.c
 
10
--- cups-1.4.2~/scheduler/classes.c     2009-10-07 20:16:09.000000000 +0200
 
11
+++ cups-1.4.2/scheduler/classes.c      2010-02-19 23:54:10.923197033 +0100
 
12
@@ -727,7 +727,7 @@
 
13
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
14
 
 
15
   cupsFilePuts(fp, "# Class configuration file for " CUPS_SVERSION "\n");
 
16
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
17
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
18
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
19
 
 
20
  /*
 
21
diff -urNad cups-1.4.2~/scheduler/dirsvc.c cups-1.4.2/scheduler/dirsvc.c
 
22
--- cups-1.4.2~/scheduler/dirsvc.c      2009-08-29 08:05:14.000000000 +0200
 
23
+++ cups-1.4.2/scheduler/dirsvc.c       2010-02-19 23:54:10.923197033 +0100
 
24
@@ -764,7 +764,7 @@
 
25
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
26
 
 
27
   cupsFilePuts(fp, "# Remote cache file for " CUPS_SVERSION "\n");
 
28
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
29
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
30
 
 
31
  /*
 
32
   * Write each local printer known to the system...
 
33
diff -urNad cups-1.4.2~/scheduler/job.c cups-1.4.2/scheduler/job.c
 
34
--- cups-1.4.2~/scheduler/job.c 2009-08-29 08:05:14.000000000 +0200
 
35
+++ cups-1.4.2/scheduler/job.c  2010-02-19 23:54:10.933194672 +0100
 
36
@@ -1873,7 +1873,7 @@
 
37
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
38
 
 
39
   cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
 
40
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
41
+  cupsFilePrintf(fp, "# Written by cupsd\n", temp);
 
42
   cupsFilePrintf(fp, "NextJobId %d\n", NextJobId);
 
43
 
 
44
  /*
 
45
diff -urNad cups-1.4.2~/scheduler/printers.c cups-1.4.2/scheduler/printers.c
 
46
--- cups-1.4.2~/scheduler/printers.c    2009-10-07 20:16:09.000000000 +0200
 
47
+++ cups-1.4.2/scheduler/printers.c     2010-02-19 23:54:10.933194672 +0100
 
48
@@ -1517,7 +1517,7 @@
 
49
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
50
 
 
51
   cupsFilePuts(fp, "# Printer configuration file for " CUPS_SVERSION "\n");
 
52
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
53
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
54
   cupsFilePuts(fp, "# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING\n");
 
55
 
 
56
  /*
 
57
diff -urNad cups-1.4.2~/scheduler/subscriptions.c cups-1.4.2/scheduler/subscriptions.c
 
58
--- cups-1.4.2~/scheduler/subscriptions.c       2009-04-03 00:53:56.000000000 +0200
 
59
+++ cups-1.4.2/scheduler/subscriptions.c        2010-02-19 23:54:10.933194672 +0100
 
60
@@ -1143,7 +1143,7 @@
 
61
   strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
 
62
 
 
63
   cupsFilePuts(fp, "# Subscription configuration file for " CUPS_SVERSION "\n");
 
64
-  cupsFilePrintf(fp, "# Written by cupsd on %s\n", temp);
 
65
+  cupsFilePrintf(fp, "# Written by cupsd\n");
 
66
 
 
67
   cupsFilePrintf(fp, "NextSubscriptionId %d\n", NextSubscriptionId);
 
68