From: Frank Lichtenheld <djpig@debian.org>
Date: Fri, 10 Feb 2006 14:56:15 +0000 (+0000)
Subject: Let dpkg-source -x touch all patched files to have the same
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fab0b1a4afd66af3d3d9a3d26119732050dcf4;p=dpkg

Let dpkg-source -x touch all patched files to have the same
timestamp to mitigate time-skew problems (Denis Barbier).
Closes: #105750
---

diff --git a/ChangeLog b/ChangeLog
index 00770280..c9a34d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2006-02-10  Ian Jackson <iwj@ubuntu.com>
+2006-02-10  Denis Barbier  <barbier@linuxfr.org>
+
+	* scripts/dpkg-source.pl: Touch all patched files
+	to have the same timestamp. This should mitigate
+	time-skew problems until we can finally add proper
+	timestamps to the diffs.
+
+2006-02-10  Ian Jackson  <iwj@ubuntu.com>
 
 	* src/configure.c: Differentiate between modified
 	and deleted configuration files. Gives and more
diff --git a/debian/changelog b/debian/changelog
index 0a19333f..1069813a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
     variables.
   * On package configuration, differentiate between modified and
     deleted configuration files (Ian Jackson). Closes: #351361
+  * Let dpkg-source -x touch all patched files to have the same
+    timestamp to mitigate time-skew problems (Denis Barbier).
+    Closes: #105750
 
   [ Christian Perrier ]
   * Switch to po4a for manpages translation. Closes: #320122
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4306d2f9..4159b5ba 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -815,8 +815,11 @@ if ($opmode eq 'build') {
 	&reapgzip if $patch =~ /\.(gz|bz2)$/;
     }
 
+    my $now = time;
     for $fn (keys %filepatched) {
-	$ftr= "$newdirectory/".substr($fn,length($expectprefix)+1).".dpkg-orig";
+	$ftr= "$newdirectory/".substr($fn,length($expectprefix)+1);
+	utime($now, $now, $ftr) || &syserr("cannot change timestamp for $ftr");
+	$ftr.= ".dpkg-orig";
 	unlink($ftr) || &syserr("remove patch backup file $ftr");
     }