Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From ffb5301a8594140ad7a58bc0f2053be8ca2b2946 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 20 Jan 2017 13:32:06 +0200 |
| 4 | Subject: [PATCH 1/2] Do not reset the PATH environment variable before running |
| 5 | scriptlets. |
| 6 | |
| 7 | We add lots of native stuff into it and scriptlets rely on that. |
| 8 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | Also need to remove the xx test later in the function since the |
| 10 | value could now be used un-initialised. |
| 11 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | Upstream-Status: Inappropriate [oe-core specific] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | lib/rpmscript.c | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
| 19 | index 92f949fa2..7c1aa75a8 100644 |
| 20 | --- a/lib/rpmscript.c |
| 21 | +++ b/lib/rpmscript.c |
| 22 | @@ -201,7 +201,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, |
| 23 | if (ipath && ipath[5] != '%') |
| 24 | path = ipath; |
| 25 | |
| 26 | - xx = setenv("PATH", path, 1); |
| 27 | + //xx = setenv("PATH", path, 1); |
| 28 | free(ipath); |
| 29 | } |
| 30 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 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 | } |