up to 56c

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 3b13f2719681c51c163737e57d32f85bcd0c35df..36ad8179be415aaaf947633c2a772b54b4e19bcb 100644 (file)
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -3,11 +3,11 @@ diff -ur mksh-56.orig/eval.c mksh-56/eval.c
 +++ mksh-56/eval.c     2017-08-12 22:40:32.672676143 +0200
 @@ -1005,6 +1005,7 @@
                                switch (ord(c)) {
-                               case ord('['):
-                               case ord('!'):
-+                              case ord(NOT2):
-                               case ord('-'):
-                               case ord(']'):
+                               case ORD('['):
+                               case ORD('!'):
++                              case ORD(NOT2):
+                               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
@@ -16,8 +16,8 @@ diff -ur mksh-56.orig/misc.c mksh-56/misc.c
        char *subp;
  
        /* check for negation */
--      if (ISMAGIC(p[0]) && ord(p[1]) == ord('!')) {
-+      if (ISMAGIC(p[0]) && (ord(p[1]) == ord('!') || ord(p[1]) == ord(NOT2))) {
+-      if (ISMAGIC(p[0]) && ord(p[1]) == ORD('!')) {
++      if (ISMAGIC(p[0]) && (ord(p[1]) == ORD('!') || ord(p[1]) == ORD(NOT2))) {
                p += 2;
                negated = true;
        }
@@ -27,7 +27,7 @@ diff -ur mksh-56.orig/sh.h mksh-56/sh.h
 @@ -550,6 +550,7 @@
   */
  #define MAGIC         KSH_BEL /* prefix for *?[!{,} during expand */
- #define ISMAGIC(c)    (ord(c) == ord(MAGIC))
+ #define ISMAGIC(c)    (ord(c) == ORD(MAGIC))
 +#define NOT2          '^'
  
  EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */

diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index 15465a635bbf2e78e19492d5f59f988b3ee46529..3cde184c6198d22ab0020110c3fd2cda8f1c96ba 100644 (file)
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,12 +1,11 @@
 --- 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 @@
+@@ -591,9 +591,14 @@
                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 {

diff --git a/mksh.spec b/mksh.spec
index 18af3f30088a2fbaa24c46cb0c89f945c0f9e34c..52446af0f6ee6ac69ef3d8f852a0f1f3766fc626 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -7,12 +7,12 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       56b
+Version:       56c
 Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       https://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: 6b65b3798f5f6a057fa541fc08cc2be9
+# Source0-md5: 4799a9ac6d55871d79ba66713d928663
 Source1:       %{name}-mkshrc
 Source2:       get-source.sh
 Patch0:                %{name}-mkshrc_support.patch