1 files changed, 18 insertions, 13 deletions

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 80504ce8b9..93d870443c 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
@@ -9,27 +9,32 @@ Upstream-Status: Inappropriate [OE Specific]
 
 RP 2011/12/07
 ALIMON 2016/05/26
-
+ALIMON 2017/02/21
 ---
- src/script.c | 39 +++------------------------------------
- 1 file changed, 3 insertions(+), 36 deletions(-)
+ src/script.c | 44 +++-----------------------------------------
+ 1 file changed, 3 insertions(+), 41 deletions(-)
 
 diff --git a/src/script.c b/src/script.c
-index 3c88be8..ce66a86 100644
+index 2f252ae..768a9d1 100644
 --- a/src/script.c
 +++ b/src/script.c
-@@ -97,43 +97,10 @@ setexecute(const char *path, struct stat *stab)
+@@ -97,48 +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);
+-       const char *changedir;
+-       size_t instdirlen = strlen(instdir);
+-
+-       if (instdirlen > 0 && fc_script_chrootless)
+-               changedir = instdir;
+-       else
+-               changedir = "/";
 -
--       if (*instdir && !fc_script_chrootless) {
--               if (strncmp(admindir, instdir, instdirl) != 0)
+-       if (instdirlen > 0 && !fc_script_chrootless) {
+-               if (strncmp(admindir, instdir, instdirlen) != 0)
 -                       ohshit(_("admindir must be inside instdir for dpkg to work properly"));
--               if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0)
+-               if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0)
 -                       ohshite(_("unable to setenv for subprocesses"));
 -               if (setenv("DPKG_ROOT", "", 1) < 0)
 -                       ohshite(_("unable to setenv for subprocesses"));
@@ -56,11 +61,11 @@ index 3c88be8..ce66a86 100644
 -                     args.buf);
 -               varbuf_destroy(&args);
 -       }
--       if (!instdirl || fc_script_chrootless)
+-       if (instdirlen == 0 || fc_script_chrootless)
 -               return cmd->filename;
 -
--       assert(strlen(cmd->filename) >= instdirl);
--       return cmd->filename + instdirl;
+-       assert(strlen(cmd->filename) >= instdirlen);
+-       return cmd->filename + instdirlen;
 +       return cmd->filename;
  }