X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/fee1613812436ecdf4de4a4ecb145d89e60022ff..HEAD:/packages/dpkg/src-archives.c.patch

diff --git a/packages/dpkg/src-archives.c.patch b/packages/dpkg/src-archives.c.patch
index e0860fba..61304265 100644
--- a/packages/dpkg/src-archives.c.patch
+++ b/packages/dpkg/src-archives.c.patch
@@ -1,6 +1,6 @@
-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
+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,
@@ -28,28 +28,7 @@ diff -u -r ../dpkg-1.18.15/src/archives.c ./src/archives.c
      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);
+@@ -1046,12 +1052,19 @@
        varbuf_end_str(&symlinkfn);
        if (symlink(symlinkfn.buf,fnametmpvb.buf))
          ohshite(_("unable to make backup symlink for '%.255s'"), ti->name);