- up to 42

diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 62139e44ab0967d27c8a557dfce9fcc27365c741..8aed985fc61f01e1a4b90c2701baa6e8aa7bcf96 100644 (file)
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -12,21 +12,12 @@ diff -ur mksh-40.org//eval.c mksh-40/eval.c
 diff -ur mksh-40.org//misc.c mksh-40/misc.c
 --- mksh-40.org//misc.c        2011-06-12 16:45:58.000000000 +0200
 +++ mksh-40/misc.c     2011-07-07 18:28:39.015826686 +0200
-@@ -652,7 +652,7 @@
-                       if (!in_bracket) {
-                               saw_glob = true;
-                               in_bracket = true;
--                              if (ISMAGIC(p[1]) && p[2] == '!')
-+                              if (ISMAGIC(p[1]) && (p[2] == '!' || p[2] == NOT2))
-                                       p += 2;
-                               if (ISMAGIC(p[1]) && p[2] == ']')
-                                       p += 2;
-@@ -831,7 +831,7 @@
-       int c, d, notp, found = 0;
+@@ -843,7 +843,7 @@
+       bool notp, found = false;
        const unsigned char *orig_p = p;
  
--      if ((notp = (ISMAGIC(*p) && *++p == '!')))
-+      if ((notp = (ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
+-      if ((notp = tobool(ISMAGIC(*p) && *++p == '!')))
++      if ((notp = tobool(ISMAGIC(*p) && (*++p == '!' || *p == NOT2))))
                p++;
        do {
                c = *p++;

diff --git a/mksh-distro.patch b/mksh-distro.patch
index 904654d3c56911417679a2872b3aa63975b6ab05..ed75f407df80f9944ca6625035503f4917e999ef 100644 (file)
--- a/mksh-distro.patch
+++ b/mksh-distro.patch
@@ -1,24 +1,22 @@
-diff -ur mksh.org/check.t mksh/check.t
---- mksh.org/check.t   2011-06-12 16:59:07.000000000 +0200
-+++ mksh/check.t       2011-07-12 08:00:42.528102214 +0200
-@@ -25,7 +25,7 @@
- # http://www.research.att.com/~gsf/public/ifs.sh
- 
- expected-stdout:
--      @(#)MIRBSD KSH R41 2012/11/30
-+      @(#)MIRBSD KSH R41 2012/11/30 @DISTRO@
- description:
-       Check version of shell.
- stdin:
-diff -ur mksh.org/sh.h mksh/sh.h
---- mksh.org/sh.h      2011-06-12 16:59:09.000000000 +0200
-+++ mksh/sh.h  2011-07-12 08:01:04.445312267 +0200
-@@ -153,7 +153,7 @@
+--- mksh-42/sh.h~      2013-02-12 07:20:52.764918024 +0100
++++ mksh-42/sh.h       2013-02-12 07:21:57.486460200 +0100
+@@ -166,7 +166,7 @@
  #ifdef EXTERN
- __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.484.2.16 2012/03/24 21:22:43 tg Exp $");
+ __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.634.2.1 2013/02/11 17:25:03 tg Exp $");
  #endif
--#define MKSH_VERSION "R41 2012/11/30"
-+#define MKSH_VERSION "R41 2012/11/30 @DISTRO@"
+-#define MKSH_VERSION "R42 2013/02/10"
++#define MKSH_VERSION "R42 2013/02/10 @DISTRO@"
  
  /* arithmetic types: C implementation */
  #if !HAVE_CAN_INTTYPES
+--- mksh-42/check.t~   2013-02-11 14:07:19.000000000 +0100
++++ mksh-42/check.t    2013-02-12 07:21:38.082664463 +0100
+@@ -29,7 +29,7 @@
+ # http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress.sh?rev=HEAD
+ 
+ expected-stdout:
+-      @(#)MIRBSD KSH R42 2013/02/10
++      @(#)MIRBSD KSH R42 2013/02/10 @DISTRO@
+ description:
+       Check version of shell.
+ stdin:

diff --git a/mksh.spec b/mksh.spec
index 1442f64c34496a280ec9ab32c8cad389f60a4087..697857260ba8b695f7080dba87a948479dc8fd7c 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -4,12 +4,12 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       41
+Version:       42
 Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: 70eca50d9340412714ef09b7060ebde9
+# Source0-md5: f1ad261f79f6ac45e8d5cc5bea191090
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
 Patch1:                %{name}-circumflex.patch