Author: djpig
Date: 2007-06-30 23:35:58 +0000 (Sat, 30 Jun 2007)
New Revision: 826
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-source.pl
Log:
correct permission and owner/group handling when extracting
tar balls to match more the user's preferences instead of
ours or the ones from the originator of the tar ball. Patch
by Ian Jackson. Closes: #390915, #207289
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-27 16:35:08 UTC (rev 825)
+++ trunk/ChangeLog 2007-06-30 23:35:58 UTC (rev 826)
@@ -1,3 +1,19 @@
+2007-07-01 Ian Jackson <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-source.pl: Don't remove setgid bits
+ on directories when extracting the .orig tarball
+ since the user might prefer to have them. Also don't
+ manually override user and group for extracted
+ directories. Instead we will take tar take of most
+ of that.
+ (extracttar): Explicetly specify --no-same-owner
+ and --no-same-permissions. They are default anyway
+ for non-root users, but no need to handle the source
+ differently (i.e. more carelessly) if working as root.
+ Since tar still insists on honoring the file permissions in the
+ tar ball, fix them up so that they match what the user would
+ expect according to his umask.
+
2007-06-12 Jiří Paleček <[EMAIL PROTECTED]>
* dpkg-shlibdeps.pl: Support colon separated list of paths in the
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-06-27 16:35:08 UTC (rev 825)
+++ trunk/debian/changelog 2007-06-30 23:35:58 UTC (rev 826)
@@ -25,6 +25,10 @@
[ Frank Lichtenheld ]
* Fix typo in German translation of start-stop-daemon(8).
Noted by Joachim Breitner. Closes: #430008
+ * Correct permission and owner/group handling when extracting
+ tar balls to match more the user's preferences instead of
+ ours or the ones from the originator of the tar ball. Patch
+ by Ian Jackson. Closes: #390915, #207289
[ Updated dselect translations ]
* French (Christian Perrier)
Modified: trunk/scripts/dpkg-source.pl
===================================================================
--- trunk/scripts/dpkg-source.pl 2007-06-27 16:35:08 UTC (rev 825)
+++ trunk/scripts/dpkg-source.pl 2007-06-30 23:35:58 UTC (rev 826)
@@ -817,10 +817,8 @@
(my $t = $target) =~ s!.*/!!;
mkdir($tmp,0700) || &syserr(sprintf(_g("unable to create `%s'"), $tmp));
- system "chmod", "g-s", $tmp;
printf(_g("%s: unpacking %s")."\n", $progname, $tarfile);
extracttar("$dscdir/$tarfile",$tmp,$t);
- system "chown", '-R', '-f', join(':', getfowner()), "$tmp/$t";
rename("$tmp/$t",$target)
|| &syserr(sprintf(_g("unable to rename `%s' to `%s'"), "$tmp/$t",
$target));
rmdir($tmp)
@@ -1298,19 +1296,49 @@
sub extracttar {
my ($tarfileread,$dirchdir,$newtopdir) = @_;
+ my ($mode, $modes_set, $i, $j);
&forkgzipread("$tarfileread");
defined(my $c2 = fork) || syserr(_g("fork for tar -xkf -"));
if (!$c2) {
open(STDIN,"<&GZIP") || &syserr(_g("reopen gzip for tar -xkf -"));
&cpiostderr;
chdir($dirchdir) || &syserr(sprintf(_g("cannot chdir to `%s' for tar
extract"), $dirchdir));
- exec('tar','-xkf','-') or &syserr(_g("exec tar -xkf -"));
+ exec('tar','--no-same-owner','--no-same-permissions',
+ '-xkf','-') or &syserr(_g("exec tar -xkf -"));
}
close(GZIP);
$c2 == waitpid($c2,0) || &syserr(_g("wait for tar -xkf -"));
$? && subprocerr("tar -xkf -");
&reapgzip;
+ # Unfortunately tar insists on applying our umask _to the original
+ # permissions_ rather than mostly-ignoring the original
+ # permissions. We fix it up with chmod -R (which saves us some
+ # work) but we have to construct a u+/- string which is a bit
+ # of a palaver. (Numeric doesn't work because we need [ugo]+X
+ # and [ugo]=<stuff> doesn't work because that unsets sgid on dirs.)
+ #
+ # We still need --no-same-permissions because otherwise tar might
+ # extract directory setgid (which we want inherited, not
+ # extracted); we need --no-same-owner because putting the owner
+ # back is tedious - in particular, correct group ownership would
+ # have to be calculated using mount options and other madness.
+ #
+ # It would be nice if tar could do it right, or if pax could cope
+ # with GNU format tarfiles with long filenames.
+ #
+ $mode= 0777 & ~umask;
+ for ($i=0; $i<9; $i+=3) {
+ $modes_set.= ',' if $i;
+ $modes_set.= qw(u g o)[$i/3];
+ for ($j=0; $j<3; $j++) {
+ $modes_set.= $mode & (0400 >> ($i+$j)) ? '+' : '-';
+ $modes_set.= qw(r w X)[$j];
+ }
+ }
+ system 'chmod','-R',$modes_set,'--',$dirchdir;
+ $? && subprocerr("chmod -R $modes_set $dirchdir");
+
opendir(D,"$dirchdir") || &syserr(sprintf(_g("Unable to open dir %s"),
$dirchdir));
my @dirchdirfiles = grep($_ ne "." && $_ ne "..", readdir(D));
closedir(D) || &syserr(sprintf(_g("Unable to close dir %s"), $dirchdir));
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
