- PLD merge

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

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 43b7804296eb51a42b34a9eb44bd4b12cd0e002d..dc6276b71e80e4e398dc12d517929a26b4eda6b2 100644 (file)
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -1,7 +1,7 @@
-diff -ur mksh.orig/check.t mksh/check.t
---- mksh.orig/check.t  2020-10-31 04:53:30.000000000 +0100
-+++ mksh/check.t       2021-01-18 19:12:47.413180226 +0100
-@@ -2484,7 +2484,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
@@ -10,10 +10,10 @@ diff -ur mksh.orig/check.t mksh/check.t
        +bc ,bc -bc
        -bc 0bc 1bc
  ---
-diff -ur mksh.orig/eval.c mksh/eval.c
---- mksh.orig/eval.c   2020-05-05 23:34:54.000000000 +0200
-+++ mksh/eval.c        2021-01-18 19:12:47.411180226 +0100
-@@ -1108,6 +1108,7 @@
+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('!'):
@@ -21,10 +21,10 @@ diff -ur mksh.orig/eval.c mksh/eval.c
                                case ORD('-'):
                                case ORD(']'):
                                        /*
-diff -ur mksh.orig/misc.c mksh/misc.c
---- mksh.orig/misc.c   2020-08-27 21:53:12.000000000 +0200
-+++ mksh/misc.c        2021-01-18 19:12:47.411180226 +0100
-@@ -1018,7 +1018,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 */
@@ -33,10 +33,10 @@ diff -ur mksh.orig/misc.c mksh/misc.c
                p += 2;
                negated = true;
        }
-diff -ur mksh.orig/sh.h mksh/sh.h
---- mksh.orig/sh.h     2020-10-31 04:53:33.000000000 +0100
-+++ mksh/sh.h  2021-01-18 19:12:47.412180226 +0100
-@@ -580,6 +580,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))
@@ -44,4 +44,3 @@ diff -ur mksh.orig/sh.h mksh/sh.h
  
  EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
  
-Only in mksh: sh.h.orig