- PLD merge

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

diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index 15465a635bbf2e78e19492d5f59f988b3ee46529..d34f4c86094e3445cec669375e7f2656266785ba 100644 (file)
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,12 +1,12 @@
---- mksh-50/main.c.orig        2014-08-21 18:13:38.072682886 +0200
-+++ mksh-50/main.c     2014-08-21 18:29:13.715976954 +0200
-@@ -591,10 +591,14 @@
+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 {
@@ -15,5 +15,5 @@
 +                              include(cp, 0, NULL, true);
 +                      }
                }
-       } else {
-               include(MKSH_SUID_PROFILE, 0, NULL, true);
+       }
+       if (restricted_shell) {