Rediff patches.

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 36ad8179be415aaaf947633c2a772b54b4e19bcb..dc6276b71e80e4e398dc12d517929a26b4eda6b2 100644 (file)
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -1,7 +1,19 @@
-diff -ur mksh-56.orig/eval.c mksh-56/eval.c
---- mksh-56.orig/eval.c        2017-08-12 22:10:26.321676398 +0200
-+++ mksh-56/eval.c     2017-08-12 22:40:32.672676143 +0200
-@@ -1005,6 +1005,7 @@
+diff -urNp -x '*.orig' mksh-59c.org/check.t mksh-59c/check.t
+--- mksh-59c.org/check.t       2020-10-31 04:53:30.000000000 +0100
++++ mksh-59c/check.t   2021-03-20 19:53:40.714261839 +0100
+@@ -2484,7 +2484,7 @@ expected-stdout:
+       !bc +bc ,bc 0bc 1bc ^bc cbc
+       !bc +bc ,bc -bc 0bc 1bc ^bc cbc
+       abc bbc
+-      ^bc abc bbc
++      !bc +bc ,bc -bc 0bc 1bc ^bc cbc
+       +bc ,bc -bc
+       -bc 0bc 1bc
+ ---
+diff -urNp -x '*.orig' mksh-59c.org/eval.c mksh-59c/eval.c
+--- mksh-59c.org/eval.c        2020-05-05 23:34:54.000000000 +0200
++++ mksh-59c/eval.c    2021-03-20 19:53:40.717595272 +0100
+@@ -1108,6 +1108,7 @@ expand(
                                switch (ord(c)) {
                                case ORD('['):
                                case ORD('!'):
@@ -9,10 +21,10 @@ diff -ur mksh-56.orig/eval.c mksh-56/eval.c
                                case ORD('-'):
                                case ORD(']'):
                                        /*
-diff -ur mksh-56.orig/misc.c mksh-56/misc.c
---- mksh-56.orig/misc.c        2017-08-12 22:10:26.321676398 +0200
-+++ mksh-56/misc.c     2017-08-12 22:40:32.672676143 +0200
-@@ -966,7 +966,7 @@
+diff -urNp -x '*.orig' mksh-59c.org/misc.c mksh-59c/misc.c
+--- mksh-59c.org/misc.c        2020-08-27 21:53:12.000000000 +0200
++++ mksh-59c/misc.c    2021-03-20 19:53:40.717595272 +0100
+@@ -1018,7 +1018,7 @@ gmatch_cclass(const unsigned char *pat,
        char *subp;
  
        /* check for negation */
@@ -21,10 +33,10 @@ diff -ur mksh-56.orig/misc.c mksh-56/misc.c
                p += 2;
                negated = true;
        }
-diff -ur mksh-56.orig/sh.h mksh-56/sh.h
---- mksh-56.orig/sh.h  2017-08-12 22:10:26.325009789 +0200
-+++ mksh-56/sh.h       2017-08-12 22:40:32.696009488 +0200
-@@ -550,6 +550,7 @@
+diff -urNp -x '*.orig' mksh-59c.org/sh.h mksh-59c/sh.h
+--- mksh-59c.org/sh.h  2020-10-31 04:53:33.000000000 +0100
++++ mksh-59c/sh.h      2021-03-20 19:53:40.717595272 +0100
+@@ -580,6 +580,7 @@ extern int __cdecl setegid(gid_t);
   */
  #define MAGIC         KSH_BEL /* prefix for *?[!{,} during expand */
  #define ISMAGIC(c)    (ord(c) == ORD(MAGIC))
@@ -32,15 +44,3 @@ diff -ur mksh-56.orig/sh.h mksh-56/sh.h
  
  EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
  
-diff -ur mksh-56.orig/check.t mksh-56/check.t
---- mksh-56.orig/check.t       2017-08-12 22:10:26.321676398 +0200
-+++ mksh-56/check.t    2017-08-12 22:41:46.886083258 +0200
-@@ -2438,7 +2438,7 @@
-       !bc +bc ,bc 0bc 1bc ^bc cbc
-       !bc +bc ,bc -bc 0bc 1bc ^bc cbc
-       abc bbc
--      ^bc abc bbc
-+      !bc +bc ,bc -bc 0bc 1bc ^bc cbc
-       +bc ,bc -bc
-       -bc 0bc 1bc
- ---

diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index 3cde184c6198d22ab0020110c3fd2cda8f1c96ba..d34f4c86094e3445cec669375e7f2656266785ba 100644 (file)
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,6 +1,7 @@
---- 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,9 +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)) {
@@ -14,5 +15,5 @@
 +                              include(cp, 0, NULL, true);
 +                      }
                }
-       } else {
-               include(MKSH_SUID_PROFILE, 0, NULL, true);
+       }
+       if (restricted_shell) {