mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

dpkg: update to 1.19.7

Browse Source 
(From OE-Core rev: 4b312777a2e154a6d86311981299bc16f23f053c)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Kravchuk
2019-06-29 18:39:58 +02:00
committed by Richard Purdie
parent 2db1c45c71
commit ee50f417f3
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+10 -10
View File
@@ -1,7 +1,7 @@
From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001
From dd11ed66640f79143e42d778b58fdd5a61fb5836 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 26 Aug 2015 16:25:45 +0300
Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a
Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a
sysroot and don't expect a chroot. This matches up our system expectations
with what dpkg does.
@@ -12,11 +12,11 @@ ALIMON 2016/05/26
ALIMON 2017/02/21
KKang 2019/02/20
---
src/script.c | 44 +++-----------------------------------------
1 file changed, 3 insertions(+), 41 deletions(-)
src/script.c | 53 +++-------------------------------------------------
1 file changed, 3 insertions(+), 50 deletions(-)
diff --git a/src/script.c b/src/script.c
index 0865b95..73ed35d 100644
index abe65b6f7..621ff9b27 100644
--- a/src/script.c
+++ b/src/script.c
@@ -96,58 +96,11 @@ setexecute(const char *path, struct stat *stab)
@@ -27,12 +27,12 @@ index 0865b95..73ed35d 100644
- const char *changedir;
- size_t instdirlen = strlen(instdir);
-
- if (instdirlen > 0 && fc_script_chrootless)
- if (instdirlen > 0 && in_force(FORCE_SCRIPT_CHROOTLESS))
- changedir = instdir;
- else
- changedir = "/";
-
- if (instdirlen > 0 && !fc_script_chrootless) {
- if (instdirlen > 0 && !in_force(FORCE_SCRIPT_CHROOTLESS)) {
- int rc;
-
- if (strncmp(admindir, instdir, instdirlen) != 0)
@@ -43,7 +43,7 @@ index 0865b95..73ed35d 100644
- ohshite(_("unable to setenv for subprocesses"));
-
- rc = chroot(instdir);
- if (rc && fc_nonroot && errno == EPERM)
- if (rc && in_force(FORCE_NON_ROOT) && errno == EPERM)
- ohshit(_("not enough privileges to change root "
- "directory with --force-not-root, consider "
- "using --force-script-chrootless?"));
@@ -69,7 +69,7 @@ index 0865b95..73ed35d 100644
- args.buf);
- varbuf_destroy(&args);
- }
- if (instdirlen == 0 || fc_script_chrootless)
- if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS))
- return cmd->filename;
-
- if (strlen(cmd->filename) < instdirlen)
@@ -82,5 +82,5 @@ index 0865b95..73ed35d 100644
/**
--
2.1.4
2.17.1
meta/recipes-devtools/dpkg/dpkg_1.19.4.bb → meta/recipes-devtools/dpkg/dpkg_1.19.7.bb
+2 -2
View File
@@ -18,5 +18,5 @@ SRC_URI_append_class-native = " \
file://tweak-options-require-tar-1.27.patch \
"
SRC_URI[md5sum] = "1e4420409426d8c58bbe13a8e07c0c0b"
SRC_URI[sha256sum] = "c15234e98655689586bff2d517a6fdc6135d139c54d52ae9cfa6a90007fee0ae"
SRC_URI[md5sum] = "60f57c5494e6dfa177504d47bfa0e383"
SRC_URI[sha256sum] = "4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8"