Upgrade mksh to R33d (#3688)

SVN-Revision: 11643

diff --git a/utils/mksh/Makefile b/utils/mksh/Makefile
index 4513053f68f69c16691c84aeaa807ea3744828f4..1c344c95de7464cc636ab42ecb7e0c12c4a0a93b 100644 (file)
--- a/utils/mksh/Makefile
+++ b/utils/mksh/Makefile
@@ -1,12 +1,20 @@
+# 
+# Copyright (C) 2007-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mksh
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mksh

-PKG_VERSION:=R31b
+PKG_VERSION:=R33d

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).cpio.gz
 PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).cpio.gz
 PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh

-PKG_MD5SUM:=819feed2336274f939c67547c5a3ddbd
+PKG_MD5SUM:=8ad2547ad55dc3a02b13554ab9b5c9c8

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/utils/mksh/patches/100-dot_mkshrc b/utils/mksh/patches/100-dot_mkshrc
index c4523476d503d760e015b6b27c80c992f069b587..60d2961ab7abd23bd0e26bce3a92cde44174df3b 100644 (file)
--- a/utils/mksh/patches/100-dot_mkshrc
+++ b/utils/mksh/patches/100-dot_mkshrc
@@ -1,33 +1,36 @@
 $FreeWRT$
 $FreeWRT$

---- mksh.orig/dot.mkshrc       Mon Sep  3 09:25:05 2007
-+++ mksh/dot.mkshrc    Fri Sep  7 23:49:55 2007
-@@ -1,24 +1,15 @@
+
+       • FreeWRT patches:
+         – no hostname(1)
+         – ls has no -o
+         – yofuh doesn’t like $? in $PS1
+
+--- a/dot.mkshrc
++++ b/dot.mkshrc
+@@ -25,13 +25,15 @@
+ # sample mksh initialisation file for interactive shells; install as
+ # /etc/skel/.mkshrc (as root, for new accounts) or copy to ~/.mkshrc
+ 

 -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
 +: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(</proc/sys/kernel/hostname)}
  [[ $HOSTNAME = @(localhost|*([         ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
  : ${HOSTNAME:=nil}; PS1='#'; [[ "$(ulimit -c 0; id -u 2>&-)" -eq 0 ]] || PS1='$'
 -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
 +: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(</proc/sys/kernel/hostname)}
  [[ $HOSTNAME = @(localhost|*([         ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
  : ${HOSTNAME:=nil}; PS1='#'; [[ "$(ulimit -c 0; id -u 2>&-)" -eq 0 ]] || PS1='$'

--PS1='$(((e = $?)) && print $e\|)${USER:=$(ulimit -c 0; id -un 2>&- || \
-+PS1='${USER:=$(ulimit -c 0; id -un 2>&- || \
-     print nobody)}@${HOSTNAME%%.*}:$(typeset pfx=~ wd=${PWD:-?}
--      typeset -i n=${COLUMNS:-80}/3; let n="n < 7 ? 7 : n"
-       [[ ${wd#$pfx} = $wd || $pfx = ?(/) ]] || wd=\~${wd#$pfx}
--      pfx=; while (( (${#pfx} + ${#wd}) > n )); do
--              if [[ $wd = */* ]]; then
--                      pfx=.../
--                      wd=${wd#*/}
--              else
--                      pfx=...
--                      wd=${wd#?????}
--              fi
--      done; print -r -- "$pfx$wd") '"$PS1 "
-+    print -r -- "$wd") '"$PS1 "
- export EDITOR HOSTNAME LESSHISTFILE=- MKSH=$(whence -p mksh) PS1 TERM USER
- alias l='/bin/ls -F'
+ function precmd {
+       typeset -Ui10 e=$?
+ 
+-      (( e )) && print -n "$e|"
++# enable this back if you want the errorlevel in your prompt
++# this is default in upstream mksh, disabled locally in fwrt
++#     (( e )) && print -n "$e|"
+ }
+ PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$(
+       typeset pfx=~ wd=${PWD:-?}
+@@ -53,7 +55,7 @@
+ alias l='ls -F'

  alias la='l -a'
  alias ll='l -l'
  alias la='l -a'
  alias ll='l -l'

--alias lo='la -lo'
-+alias lo='la -l'
+-alias lo='l -alo'
++alias lo='l -al'

  alias which='whence -p'
  alias which='whence -p'

- whence -p rot13 >&- || alias rot13='tr [A-Za-z] [N-ZA-Mn-za-m]'
- whence -p hd >&- || function hd {
-
+ whence -p rot13 >&- || alias rot13='tr \
+     abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \