[gnome-continuous-yocto/gnomeostree-3.28-rocko: 749/8267] dpkg: Upgrade to 1.18.7

[Emmanuele Bassi <ebassi src gnome org>]

commit 81b59a19ad6df490f1edbea70b2612d7a8e43164
Author: Aníbal Limón <anibal limon linux intel com>
Date:   Thu May 26 16:18:45 2016 -0500

    dpkg: Upgrade to 1.18.7
    
    Rebased patches:
    
    0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
    add_armeb_triplet_entry.patchadd_armeb_triplet_entry.patch
    
    Patches removed already in upstream:
    
        [1] 0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
        [2] fix-abs-redefine.patch
    
    (From OE-Core rev: 3812f58b3a438ae533c282170416cdd1681868e0)
    
    Signed-off-by: Aníbal Limón <anibal limon linux intel com>
    
    [1] 
https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/dpkg-deb/build.c?id=7a91341446851cd3594a8b752823b8c1f26d652a
    [2] 
https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/lib/dpkg/i18n.h?id=ecd4baa091619cbbdd70043129dd992573580371
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/dpkg/dpkg.inc                |    2 -
 ...g-do_package_write_deb-we-have-trees-of-h.patch |   71 --------------------
 ...tinsts-expect-D-to-be-set-when-running-in.patch |   36 ++++++----
 .../dpkg/dpkg/add_armeb_triplet_entry.patch        |   22 ++++--
 .../dpkg/dpkg/fix-abs-redefine.patch               |   40 -----------
 .../dpkg/{dpkg_1.18.4.bb => dpkg_1.18.7.bb}        |    6 +-
 6 files changed, 40 insertions(+), 137 deletions(-)
---
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 3d9e7e3..c2215ce 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -4,8 +4,6 @@ SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz"
 
-SRC_URI_append_class-native = " file://0001-When-running-do_package_write_deb-we-have-trees-of-h.patch"
-
 DEPENDS = "zlib bzip2 perl ncurses"
 DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native 
gettext-native perl-native"
 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl"
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch 
b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 9f77c6c..80504ce 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
@@ -8,30 +8,41 @@ Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a
 Upstream-Status: Inappropriate [OE Specific]
 
 RP 2011/12/07
+ALIMON 2016/05/26
+
 ---
- src/script.c | 31 ++-----------------------------
- 1 file changed, 2 insertions(+), 29 deletions(-)
+ src/script.c | 39 +++------------------------------------
+ 1 file changed, 3 insertions(+), 36 deletions(-)
 
 diff --git a/src/script.c b/src/script.c
-index a958145..24c49f9 100644
+index 3c88be8..ce66a86 100644
 --- a/src/script.c
 +++ b/src/script.c
-@@ -100,36 +100,9 @@ maintscript_pre_exec(struct command *cmd)
-       size_t instdirl = strlen(instdir);
- 
-       if (*instdir) {
+@@ -97,43 +97,10 @@ setexecute(const char *path, struct stat *stab)
+ static const char *
+ maintscript_pre_exec(struct command *cmd)
+ {
+-      const char *admindir = dpkg_db_get_dir();
+-      const char *changedir = fc_script_chrootless ? instdir : "/";
+-      size_t instdirl = strlen(instdir);
+-
+-      if (*instdir && !fc_script_chrootless) {
 -              if (strncmp(admindir, instdir, instdirl) != 0)
 -                      ohshit(_("admindir must be inside instdir for dpkg to work properly"));
 -              if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0)
 -                      ohshite(_("unable to setenv for subprocesses"));
+-              if (setenv("DPKG_ROOT", "", 1) < 0)
+-                      ohshite(_("unable to setenv for subprocesses"));
 -
 -              if (chroot(instdir))
 -                      ohshite(_("failed to chroot to '%.250s'"), instdir);
--      }
++      if (*instdir) {
++              setenv("D", instdir, 1);
+       }
 -      /* Switch to a known good directory to give the maintainer script
 -       * a saner environment, also needed after the chroot(). */
--      if (chdir("/"))
--              ohshite(_("failed to chdir to '%.255s'"), "/");
+-      if (chdir(changedir))
+-              ohshite(_("failed to chdir to '%.255s'"), changedir);
 -      if (debug_has_flag(dbg_scripts)) {
 -              struct varbuf args = VARBUF_INIT;
 -              const char **argv = cmd->argv;
@@ -44,9 +55,8 @@ index a958145..24c49f9 100644
 -              debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename,
 -                    args.buf);
 -              varbuf_destroy(&args);
-+              setenv("D", instdir, 1);
-       }
--      if (!instdirl)
+-      }
+-      if (!instdirl || fc_script_chrootless)
 -              return cmd->filename;
 -
 -      assert(strlen(cmd->filename) >= instdirl);
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch 
b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
index af275de..dc69eb2 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
@@ -25,14 +25,22 @@ Upstream-Status: Pending
 
 Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh krishnanjanappa caviumnetworks com>
 
-diff -Naurp dpkg-1.17.21_org/triplettable dpkg-1.17.21/triplettable
---- dpkg-1.17.21_org/triplettable      2015-04-08 17:08:52.370759171 +0530
-+++ dpkg-1.17.21/triplettable  2015-04-08 17:09:12.406752081 +0530
-@@ -9,6 +9,7 @@ musleabihf-linux-arm   musl-linux-armhf
- musl-linux-<cpu>      musl-linux-<cpu>
- gnueabihf-linux-arm   armhf
+---
+ triplettable | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/triplettable b/triplettable
+index abe4726..1e9c247 100644
+--- a/triplettable
++++ b/triplettable
+@@ -11,6 +11,7 @@ gnueabihf-linux-arm  armhf
  gnueabi-linux-arm     armel
+ gnuabin32-linux-mips64r6el    mipsn32r6el
+ gnuabin32-linux-mips64r6      mipsn32r6
 +gnueabi-linux-armeb   armeb
  gnuabin32-linux-mips64el      mipsn32el
  gnuabin32-linux-mips64        mipsn32
- gnuabi64-linux-mips64el       mips64el
+ gnuabi64-linux-mips64r6el     mips64r6el
+-- 
+2.1.4
+
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
similarity index 79%
rename from meta/recipes-devtools/dpkg/dpkg_1.18.4.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
index 7876944..5375923 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.4.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SRC_URI_append_class-native =" file://glibc2.5-sync_file_range.patch "
 SRC_URI += "file://noman.patch \
             file://remove-tar-no-timestamp.patch \
-            file://fix-abs-redefine.patch \
             file://arch_pm.patch \
             file://dpkg-configure.service \
             file://add_armeb_triplet_entry.patch \
@@ -15,6 +14,5 @@ SRC_URI += "file://noman.patch \
            file://0006-add-musleabi-to-known-target-tripets.patch \
            "
 
-SRC_URI[md5sum] = "e95b513c89693f6ec3ab53b6b1c3defd"
-SRC_URI[sha256sum] = "fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da"
-
+SRC_URI[md5sum] = "073dbf2129a54b0fc627464bf8af4a1b"
+SRC_URI[sha256sum] = "ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b"