libcairo: Update from 1.14.6 to 1.14.8

[termux-packages] / packages / dpkg / src-archives.c.patch

diff -u -r ../dpkg-1.18.15/src/archives.c ./src/archives.c
--- ../dpkg-1.18.15/src/archives.c	2016-11-11 22:18:40.000000000 -0500
+++ ./src/archives.c	2016-12-03 16:28:53.922977673 -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);
   }
@@ -546,7 +552,9 @@
     linksize = readlink(fn_old, linkname, stab->st_size + 1);
     if (linksize < 0)
       ohshite(_("unable to read link '%.255s'"), fn_old);
-    else if (linksize != stab->st_size)
+    else if (linksize > stab->st_size)
+      /* Termux patch: In some cases st_size is too large, ignore that.
+         See https://github.com/corbinlc/GNURootDebian/issues/103 */
       ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
              fn_old, (intmax_t)stab->st_size, linksize);
     linkname[linksize] = '\0';
@@ -1033,19 +1041,28 @@
       r = readlink(fnamevb.buf, symlinkfn.buf, symlinkfn.size);
       if (r < 0)
         ohshite(_("unable to read link '%.255s'"), ti->name);
-      else if (r != stab.st_size)
+      else if (r > stab.st_size)
+        /* Termux patch: In some cases st_size is too large, ignore that.
+           See https://github.com/corbinlc/GNURootDebian/issues/103 */
         ohshit(_("symbolic link '%.250s' size has changed from %jd to %zd"),
                fnamevb.buf, (intmax_t)stab.st_size, r);
       varbuf_trunc(&symlinkfn, r);
       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);
     }