diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-01 15:53:46 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 11:35:41 +0000 |
commit | d50b9c511e17c6f582ef39b61eaaa8d4555eabba (patch) | |
tree | 794a20e7d91cc313086994a2c73bb81dddf363dc /meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch | |
parent | f0a5815732f3e62da51fbb89d35c2fbee84aac0f (diff) | |
download | poky-d50b9c511e17c6f582ef39b61eaaa8d4555eabba.tar.gz |
pseudo: update to latest master
Dropped patches:
0001-Use-epoll-API-on-Linux.patch replaced by
http://git.yoctoproject.org/cgit/cgit.cgi/pseudo/commit/?id=0a3e435085046f535074f498a3de75a7704fb14c
(also add --enable-epoll to configure options)
b6b68db896f9963558334aff7fca61adde4ec10f.patch merged upstream
efe0be279901006f939cd357ccee47b651c786da.patch merged upstream
fastopreply.patch replaced by
http://git.yoctoproject.org/cgit/cgit.cgi/pseudo/commit/?id=449c234d3030328fb997b309511bb54598848a05
toomanyfiles.patch rebased
(From OE-Core rev: 7c3df6782bbd5b623dcb6ee8a9bc914926640cdd)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch')
-rw-r--r-- | meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch b/meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch deleted file mode 100644 index 3045a3b736..0000000000 --- a/meta/recipes-devtools/pseudo/files/b6b68db896f9963558334aff7fca61adde4ec10f.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From b6b68db896f9963558334aff7fca61adde4ec10f Mon Sep 17 00:00:00 2001 | ||
2 | From: Seebs <seebs@seebs.net> | ||
3 | Date: Thu, 13 Apr 2017 18:12:01 -0500 | ||
4 | Subject: Prevent bash from segfaulting when unloading pseudo | ||
5 | |||
6 | bash's extremely fancy internal awareness of how the environment looks | ||
7 | means that, if you directly call the underlying libc "unsetenv" on | ||
8 | a variable, bash can end up trying to access a null pointer. Fixing | ||
9 | this generically is actually rather hard; you can't really avoid | ||
10 | writing to environ on fork() or popen(), even if you change all | ||
11 | execv*() functions to use the execv*e() variants. So for now, instead | ||
12 | of unsetting the variable, set it to an empty string. | ||
13 | |||
14 | Thanks to Saur in IRC for spotting this and helping debug it. | ||
15 | |||
16 | Signed-off-by: Seebs <seebs@seebs.net> | ||
17 | |||
18 | Upstream-Status: Backport | ||
19 | |||
20 | diff --git a/ChangeLog.txt b/ChangeLog.txt | ||
21 | index a2d30e9..8ba1ffa 100644 | ||
22 | --- a/ChangeLog.txt | ||
23 | +++ b/ChangeLog.txt | ||
24 | @@ -1,3 +1,8 @@ | ||
25 | +2017-04-13: | ||
26 | + * (seebs) don't unset LD_PRELOAD or the like, because if you | ||
27 | + do that, bash can segfault because it "knows" how many | ||
28 | + fields are in environ. | ||
29 | + | ||
30 | 2017-02-24: | ||
31 | * (seebs) import posix_acl_default fix from Anton Gerasimov | ||
32 | <anton@advancedtelematic.com> | ||
33 | diff --git a/pseudo_util.c b/pseudo_util.c | ||
34 | index 172990b..6a1fac2 100644 | ||
35 | --- a/pseudo_util.c | ||
36 | +++ b/pseudo_util.c | ||
37 | @@ -844,7 +844,7 @@ void pseudo_dropenv() { | ||
38 | if (ld_preload && strlen(ld_preload)) { | ||
39 | SETENV(PRELINK_LIBRARIES, ld_preload, 1); | ||
40 | } else { | ||
41 | - UNSETENV(PRELINK_LIBRARIES); | ||
42 | + SETENV(PRELINK_LIBRARIES, "", 1); | ||
43 | } | ||
44 | } | ||
45 | } | ||
46 | -- | ||
47 | cgit v0.10.2 | ||
48 | |||