- up to 40b (tty/test patches in upstream)

Changed files:
    mksh-distro.patch -> 1.2
    mksh-test.patch -> 1.2
    mksh-tty.patch -> 1.2
    mksh.spec -> 1.31

diff --git a/mksh-distro.patch b/mksh-distro.patch
index 56bb1a7de7971770a960a3c4e42bbe367a3efc46..1cce60c595e75e3bb7ae588a65e8ac6da407c254 100644 (file)
--- a/mksh-distro.patch
+++ b/mksh-distro.patch
@@ -5,8 +5,8 @@ diff -ur mksh.org/check.t mksh/check.t
  # http://www.research.att.com/~gsf/public/ifs.sh
  
  expected-stdout:
--      @(#)MIRBSD KSH R40 2011/06/12
-+      @(#)MIRBSD KSH R40 2011/06/12 @DISTRO@
+-      @(#)MIRBSD KSH R40 2011/07/16
++      @(#)MIRBSD KSH R40 2011/07/16 @DISTRO@
  description:
        Check version of shell.
  stdin:
@@ -17,8 +17,8 @@ diff -ur mksh.org/sh.h mksh/sh.h
  #ifdef EXTERN
  __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.476 2011/06/12 14:58:45 tg Exp $");
  #endif
--#define MKSH_VERSION "R40 2011/06/12"
-+#define MKSH_VERSION "R40 2011/06/12 @DISTRO@"
+-#define MKSH_VERSION "R40 2011/07/16"
++#define MKSH_VERSION "R40 2011/07/16 @DISTRO@"
  
  #ifndef MKSH_INCLUDES_ONLY
  

diff --git a/mksh-test.patch b/mksh-test.patch
deleted file mode 100644 (file)
index 814473a..0000000
--- a/mksh-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mksh-40/check.t~   2011-07-07 22:54:57.000000000 +0200
-+++ mksh-40/check.t    2011-07-07 22:59:01.105425013 +0200
-@@ -5907,6 +5907,7 @@
- description:
-       Ensure ±U on the command line is honoured
-       (this test may pass falsely depending on CPPFLAGS)
-+need-ctty: yes
- stdin:
-       export iter=0
-       code='if [[ $- = *U* ]]; then echo $iter on; else echo $iter off; fi'

diff --git a/mksh-tty.patch b/mksh-tty.patch
deleted file mode 100644 (file)
index 6f83824..0000000
--- a/mksh-tty.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mksh-40/var.c~     2011-07-07 21:48:19.000000000 +0200
-+++ mksh-40/var.c      2011-07-07 22:08:36.466887894 +0200
-@@ -1442,7 +1442,7 @@
- #ifdef TIOCGWINSZ
-               if (tty_fd < 0)
-                       /* non-FTALKING, try to get an fd anyway */
--                      tty_init(false, false);
-+                      tty_init(true, false);
- #endif
-               x_cols = -1;
-       }

diff --git a/mksh.spec b/mksh.spec
index 77c6c7d6929dd58338527484bab1aa2a8cffc060..345682573f76c43790420ab6bc7354c2244d55aa 100644 (file)
--- a/mksh.spec
+++ b/mksh.spec
@@ -4,19 +4,17 @@
 Summary:       MirBSD Korn Shell
 Summary(pl.UTF-8):     Powłoka Korna z MirBSD
 Name:          mksh
-Version:       40
-Release:       5
+Version:       40b
+Release:       1
 License:       BSD
 Group:         Applications/Shells
 Source0:       http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
-# Source0-md5: 395a6c5f39c7e2afd8f6504d90ca90bd
+# Source0-md5: afb08b65272ace550ec59b26a876a7de
 Source1:       %{name}-mkshrc
 Patch0:                %{name}-mkshrc_support.patch
 Patch1:                %{name}-circumflex.patch
 Patch2:                %{name}-no_stop_alias.patch
-Patch3:                %{name}-tty.patch
-Patch4:                %{name}-test.patch
-Patch5:                %{name}-distro.patch
+Patch3:                %{name}-distro.patch
 URL:           https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires: ed
@@ -86,8 +84,6 @@ mv mksh/* .; rmdir mksh
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h