From: Raphaël Hertzog <hertzog@debian.org>
Date: Sun, 5 Sep 2010 07:43:32 +0000 (+0200)
Subject: dpkg-source: drop -k parameter from the tar command line used to extract tarballs
X-Git-Tag: 1.15.8.5~21
X-Git-Url: https://anonscm.debian.org/gitweb/?p=dpkg%2Fdpkg.git;a=commitdiff_plain;h=4d2b04f

dpkg-source: drop -k parameter from the tar command line used to extract tarballs

dpkg-source only extracts tarballs in directories that it has created
itself, there's no risk of overwriting any user files. Furthermore in
the few cases where we do extract a tarball on a non-empty directory,
we really want to be able to overwrite files already present. That's the
case with a debian.tar.gz file.

Reported-by: James Westby <james.westby@linaro.org>
---

diff --git a/debian/changelog b/debian/changelog
index b78d7ee..bb7627f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ dpkg (1.15.8.5) UNRELEASED; urgency=low
   [ Raphaël Hertzog ]
   * Fix dpkg-genchanges to not split the short description in the middle of a
     UTF8 character. Closes: #593442
+  * Drop -k parameter from the tar call used by dpkg-source to extract
+    tarballs. Upstream binary files modified by the packager were not properly
+    installed due to this. Thanks to James Westby for the report.
+    Closes: #594440
 
   [ Updated programs translations ]
   * French (Christian Perrier).
diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm
index 132a780..921c76e 100644
--- a/scripts/Dpkg/Source/Archive.pm
+++ b/scripts/Dpkg/Source/Archive.pm
@@ -124,7 +124,7 @@ sub extract {
     # Call tar extraction process
     $spawn_opts{"delete_env"} = [ "TAR_OPTIONS" ];
     $spawn_opts{'exec'} = [ 'tar', '--no-same-owner', '--no-same-permissions',
-                            @{$opts{"options"}}, '-xkf', '-' ];
+                            @{$opts{"options"}}, '-xf', '-' ];
     spawn(%spawn_opts);
     $self->close();