diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch index bf24d43eb9..41cdf6ed77 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch | |||
@@ -1,25 +1,23 @@ | |||
1 | From ffb5301a8594140ad7a58bc0f2053be8ca2b2946 Mon Sep 17 00:00:00 2001 | 1 | From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 20 Jan 2017 13:32:06 +0200 | 3 | Date: Fri, 20 Jan 2017 13:32:06 +0200 |
4 | Subject: [PATCH 1/2] Do not reset the PATH environment variable before running | 4 | Subject: [PATCH] Do not reset the PATH environment variable before running |
5 | scriptlets. | 5 | scriptlets. |
6 | 6 | ||
7 | We add lots of native stuff into it and scriptlets rely on that. | 7 | We add lots of native stuff into it and scriptlets rely on that. |
8 | 8 | ||
9 | Also need to remove the xx test later in the function since the | ||
10 | value could now be used un-initialised. | ||
11 | |||
12 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
14 | --- | 12 | --- |
15 | lib/rpmscript.c | 2 +- | 13 | lib/rpmscript.c | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 15 | ||
18 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c | 16 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
19 | index 92f949fa2..7c1aa75a8 100644 | 17 | index 6a31e0d..2b0e438 100644 |
20 | --- a/lib/rpmscript.c | 18 | --- a/lib/rpmscript.c |
21 | +++ b/lib/rpmscript.c | 19 | +++ b/lib/rpmscript.c |
22 | @@ -201,7 +201,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, | 20 | @@ -184,7 +184,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, |
23 | if (ipath && ipath[5] != '%') | 21 | if (ipath && ipath[5] != '%') |
24 | path = ipath; | 22 | path = ipath; |
25 | 23 | ||
@@ -28,13 +26,3 @@ index 92f949fa2..7c1aa75a8 100644 | |||
28 | free(ipath); | 26 | free(ipath); |
29 | } | 27 | } |
30 | 28 | ||
31 | @@ -206,9 +206,7 @@ static void doScriptExec(ARGV_const_t ar | ||
32 | /* XXX Don't mtrace into children. */ | ||
33 | unsetenv("MALLOC_CHECK_"); | ||
34 | |||
35 | - if (xx == 0) { | ||
36 | xx = execv(argv[0], argv); | ||
37 | - } | ||
38 | } | ||
39 | _exit(127); /* exit 127 for compatibility with bash(1) */ | ||
40 | } | ||