dpkg: Work around symbolic link size issue

Fixes #558.

diff --git a/packages/dpkg/src-archives.c.patch b/packages/dpkg/src-archives.c.patch
index c4e206b..e0860fb 100644 (file)
--- a/packages/dpkg/src-archives.c.patch
+++ b/packages/dpkg/src-archives.c.patch
@@ -1,6 +1,6 @@
-diff -u -r ../dpkg-1.18.10/src/archives.c ./src/archives.c
---- ../dpkg-1.18.10/src/archives.c     2016-07-07 19:36:47.000000000 -0400
-+++ ./src/archives.c   2016-11-25 18:32:58.505875297 -0500
+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,
@@ -28,7 +28,28 @@ diff -u -r ../dpkg-1.18.10/src/archives.c ./src/archives.c
      if (chmod(path, st->mode & ~S_IFMT))
        ohshite(_("error setting permissions of '%.255s'"), path);
    }
-@@ -1040,12 +1051,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);

diff --git a/packages/dpkg/src-configure.c.patch b/packages/dpkg/src-configure.c.patch
index b586375..d1f18f0 100644 (file)
--- a/packages/dpkg/src-configure.c.patch
+++ b/packages/dpkg/src-configure.c.patch
@@ -1,7 +1,7 @@
-diff -u -r ../dpkg-1.18.4/src/configure.c ./src/configure.c
---- ../dpkg-1.18.4/src/configure.c     2015-11-26 18:53:41.000000000 -0500
-+++ ./src/configure.c  2016-03-03 17:41:42.494272593 -0500
-@@ -496,8 +496,10 @@
+diff -u -r ../dpkg-1.18.15/src/configure.c ./src/configure.c
+--- ../dpkg-1.18.15/src/configure.c    2016-11-11 22:18:40.000000000 -0500
++++ ./src/configure.c  2016-12-03 16:32:43.719508056 -0500
+@@ -497,8 +497,10 @@
                                pkg_name(pkg, pnaw_nonambig), cdr2.buf,
                                strerror(errno));
                if (!(what & CFOF_USER_DEL))
@@ -14,3 +14,14 @@ diff -u -r ../dpkg-1.18.4/src/configure.c ./src/configure.c
                                        pkg_name(pkg, pnaw_nonambig), cdr.buf,
                                        cdr2.buf, strerror(errno));
                /* Fall through. */
+@@ -757,7 +759,9 @@
+                                       pkg_name(pkg, pnaw_nonambig), in,
+                                       result->buf, strerror(errno));
+                               return -1;
+-                      } 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 */
+                               warning(_("symbolic link '%.250s' size has "
+                                         "changed from %jd to %zd"),
+                                       result->buf, (intmax_t)stab.st_size, r);