42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
diff -u -r ../dpkg-1.17.10/src/archives.c ./src/archives.c
|
||
|
|
--- ../dpkg-1.17.10/src/archives.c 2014-06-05 19:56:33.000000000 +0200
|
||
|
|
+++ ./src/archives.c 2014-06-06 03:46:40.636882807 +0200
|
||
|
|
@@ -354,8 +354,10 @@
|
||
|
|
namenode->statoverride->uid,
|
||
|
|
namenode->statoverride->gid,
|
||
|
|
namenode->statoverride->mode);
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
if (fchown(fd, st->uid, st->gid))
|
||
|
|
ohshite(_("error setting ownership of `%.255s'"), te->name);
|
||
|
|
+#endif
|
||
|
|
if (fchmod(fd, st->mode & ~S_IFMT))
|
||
|
|
ohshite(_("error setting permissions of `%.255s'"), te->name);
|
||
|
|
|
||
|
|
@@ -468,11 +470,15 @@
|
||
|
|
return; /* Already handled using the file descriptor. */
|
||
|
|
|
||
|
|
if (te->type == TAR_FILETYPE_SYMLINK) {
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
if (lchown(path, st->uid, st->gid))
|
||
|
|
ohshite(_("error setting ownership of symlink `%.255s'"), path);
|
||
|
|
+#endif
|
||
|
|
} else {
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
if (chown(path, st->uid, st->gid))
|
||
|
|
ohshite(_("error setting ownership of `%.255s'"), path);
|
||
|
|
+#endif
|
||
|
|
if (chmod(path, st->mode & ~S_IFMT))
|
||
|
|
ohshite(_("error setting permissions of `%.255s'"), path);
|
||
|
|
}
|
||
|
|
@@ -1142,8 +1148,10 @@
|
||
|
|
varbuf_end_str(&symlinkfn);
|
||
|
|
if (symlink(symlinkfn.buf,fnametmpvb.buf))
|
||
|
|
ohshite(_("unable to make backup symlink for `%.255s'"), ti->name);
|
||
|
|
+#ifndef __ANDROID__
|
||
|
|
if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
|
||
|
|
ohshite(_("unable to chown backup symlink for `%.255s'"), ti->name);
|
||
|
|
+#endif
|
||
|
|
tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
|
||
|
|
} else {
|
||
|
|
debug(dbg_eachfiledetail, "tarobject nondirectory, 'link' backup");
|