- up to 40f

Changed files:
    mksh-distro.patch -> 1.6
    mksh-tty_close.patch -> 1.2
    mksh.spec -> 1.40

diff --git a/mksh-distro.patch b/mksh-distro.patch
index 7ead54994ad4d2e08fbafcefa64ce65d9b16a6b1..5588c5792ef14048f211a677cf9a3210b961e532 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 2012/03/20
-+      @(#)MIRBSD KSH R40 2012/03/20 @DISTRO@
+-      @(#)MIRBSD KSH R40 2012/04/06
++      @(#)MIRBSD KSH R40 2012/04/06 @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.484.2.16 2012/03/24 21:22:43 tg Exp $");
  #endif
--#define MKSH_VERSION "R40 2012/03/20"
-+#define MKSH_VERSION "R40 2012/03/20 @DISTRO@"
+-#define MKSH_VERSION "R40 2012/04/06"
++#define MKSH_VERSION "R40 2012/04/06 @DISTRO@"
  
  /* arithmetic types: C implementation */
  #if !HAVE_CAN_INTTYPES

diff --git a/mksh-tty_close.patch b/mksh-tty_close.patch
deleted file mode 100644 (file)
index 7715503..0000000
--- a/mksh-tty_close.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 04ac6ad16336a70603c4817d678f9a1eddd18c74
-Author: tg <tg>
-Date:   Sun Mar 25 14:28:11 2012 +0000
-
-    fix regression w.r.t. TTY and external programmes:
-    • release the TTY after the initial change_winsz()
-    • since we release it, we can skip initialising tty_state, too
-
-diff --git a/main.c b/main.c
-index 8022782..0405b1b 100644
---- a/main.c
-+++ b/main.c
-@@ -252,8 +252,9 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
- 
- #ifdef TIOCGWINSZ
-       /* try to initialise tty size before importing environment */
--      tty_init(true, false);
-+      tty_init(false, false);
-       change_winsz();
-+      tty_close();
- #endif
- 
- #ifdef _PATH_DEFPATH

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