- PLD merge

[packages/mksh.git] / mksh-mkshrc_support.patch

diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index 38baf33fc1117a5c8071c7828bdc0b9549266fd0..d34f4c86094e3445cec669375e7f2656266785ba 100644 (file)
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,13 +1,12 @@
-diff -urp mksh.orig/main.c mksh/main.c
---- mksh.orig/main.c   2016-08-04 20:52:01.000000000 +0000
-+++ mksh/main.c        2016-08-18 06:47:50.115554000 +0000
-@@ -611,10 +611,14 @@ main_init(int argc, const char *argv[],
+diff -urNp -x '*.orig' mksh-59c.org/main.c mksh-59c/main.c
+--- mksh-59c.org/main.c        2020-10-01 22:29:21.000000000 +0200
++++ mksh-59c/main.c    2021-03-20 19:54:06.508364229 +0100
+@@ -695,9 +695,14 @@ main_init(int argc, const char *argv[],
                if (Flag(FLOGIN))
                        include(substitute("$HOME/.profile", 0), 0, NULL, true);
                if (Flag(FTALKING)) {
--                      cp = substitute(substitute("${ENV:-" MKSHRC_PATH "}",
--                          0), DOTILDE);
-+                      cp = substitute(substitute("${ENV}", 0), DOTILDE);
+-                      cp = substitute("${ENV:-" MKSHRC_PATH "}", DOTILDE);
++                      cp = substitute("${ENV}", DOTILDE);
                        if (cp[0] != '\0')
                                include(cp, 0, NULL, true);
 +                      else {
@@ -16,5 +15,5 @@ diff -urp mksh.orig/main.c mksh/main.c
 +                              include(cp, 0, NULL, true);
 +                      }
                }
-       } else {
-               include(MKSH_SUID_PROFILE, 0, NULL, true);
+       }
+       if (restricted_shell) {