4f47cb101c
This allows dropping of local patches tolerating symlink size to differ between st_size and strlen(readlink()) which is now upstream.
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
diff -u -r ../dpkg-1.18.18/src/archives.c ./src/archives.c
|
|
--- ../dpkg-1.18.18/src/archives.c 2016-12-17 13:46:21.000000000 -0500
|
|
+++ ./src/archives.c 2016-12-20 18:44:57.276098093 -0500
|
|
@@ -393,8 +393,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);
|
|
|
|
@@ -506,11 +508,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);
|
|
}
|
|
@@ -1046,12 +1052,19 @@
|
|
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");
|
|
+#ifdef __ANDROID__
|
|
+ /* Android does not support hardlinks. */
|
|
+ if (rename(fnamevb.buf,fnametmpvb.buf))
|
|
+#else
|
|
if (link(fnamevb.buf,fnametmpvb.buf))
|
|
+#endif
|
|
ohshite(_("unable to make backup link of '%.255s' before installing new version"),
|
|
ti->name);
|
|
}
|