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 00770280cbeb105740a1b7c343e87cee4795c363..c9a34d4df92523f8a390e3c7e0ff507487a0809f 100644 (file)
--- 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 0a19333fe795ecc7aa6a5978df6a455faa562df7..1069813a2896364286b6f46c8354588c32cf80fa 100644 (file)
--- 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 4306d2f927a4cf5962c79751cfd7f3360c9d8bd2..4159b5bae074cf44200434e3290dfd442bd5fca3 100755 (executable)
--- 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");
     }