X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/99c3da2c8c9297aec7eac0065f0581dfd6fc7eff..33b944c8a2e07eef3a2508f1dbbafc8b39b8db3e:/packages/dpkg/src-archives.c.patch

diff --git a/packages/dpkg/src-archives.c.patch b/packages/dpkg/src-archives.c.patch
index 9ae0f41b..e0860fba 100644
--- a/packages/dpkg/src-archives.c.patch
+++ b/packages/dpkg/src-archives.c.patch
@@ -1,7 +1,7 @@
-diff -u -r ../dpkg-1.18.2/src/archives.c ./src/archives.c
---- ../dpkg-1.18.2/src/archives.c	2015-07-13 09:53:37.000000000 -0400
-+++ ./src/archives.c	2015-08-25 17:59:35.594992908 -0400
-@@ -352,8 +352,10 @@
+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);
@@ -12,7 +12,7 @@ diff -u -r ../dpkg-1.18.2/src/archives.c ./src/archives.c
      if (fchmod(fd, st->mode & ~S_IFMT))
        ohshite(_("error setting permissions of '%.255s'"), te->name);
  
-@@ -465,11 +467,15 @@
+@@ -506,11 +508,15 @@
      return; /* Already handled using the file descriptor. */
  
    if (te->type == TAR_FILETYPE_SYMLINK) {
@@ -28,7 +28,28 @@ diff -u -r ../dpkg-1.18.2/src/archives.c ./src/archives.c
      if (chmod(path, st->mode & ~S_IFMT))
        ohshite(_("error setting permissions of '%.255s'"), path);
    }
-@@ -1022,14 +1028,19 @@
+@@ -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);
@@ -39,14 +60,12 @@ diff -u -r ../dpkg-1.18.2/src/archives.c ./src/archives.c
        tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
      } else {
        debug(dbg_eachfiledetail, "tarobject nondirectory, 'link' backup");
-+      /* Termux modification: Try with rename(2) for systems not supporting hardlinks. */
++#ifdef __ANDROID__
++      /* Android does not support hardlinks. */
++      if (rename(fnamevb.buf,fnametmpvb.buf))
++#else
        if (link(fnamevb.buf,fnametmpvb.buf))
--        ohshite(_("unable to make backup link of '%.255s' before installing new version"),
--                ti->name);
-+        if (rename(fnamevb.buf,fnametmpvb.buf)) {
-+          ohshite(_("unable to make backup link of '%.255s' before installing new version"),
-+	          ti->name);
-+	}
++#endif
+         ohshite(_("unable to make backup link of '%.255s' before installing new version"),
+                 ti->name);
      }
-   }
-