From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 21 Sep 2007 00:07:40 +0000 (+0000)
Subject: update mksh to R31b
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=6bfea51d41e974cb68acec1811e293ed523493a8

update mksh to R31b

SVN-Revision: 8896
---

diff --git a/utils/mksh/Makefile b/utils/mksh/Makefile
index a40cab502b..36744c5108 100644
--- a/utils/mksh/Makefile
+++ b/utils/mksh/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mksh
-PKG_VERSION:=R29g
+PKG_VERSION:=R31b
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).cpio.gz
 PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
-PKG_MD5SUM:=324ea1a4a1d2fc3e37744e48586535e1
+PKG_MD5SUM:=819feed2336274f939c67547c5a3ddbd
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -36,7 +36,7 @@ define Build/Compile
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-DMKSH_SMALL=1" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-			$(BASH) Build.sh -d -r
+			$(BASH) Build.sh -Q -r
 endef
 
 define Package/mksh/postinst
diff --git a/utils/mksh/patches/100-dot_mkshrc b/utils/mksh/patches/100-dot_mkshrc
index c26d798c99..c4523476d5 100644
--- a/utils/mksh/patches/100-dot_mkshrc
+++ b/utils/mksh/patches/100-dot_mkshrc
@@ -1,13 +1,27 @@
 $FreeWRT$
---- mksh.orig/dot.mkshrc	Wed Jun 20 13:38:18 2007
-+++ mksh/dot.mkshrc	Mon Jul  9 12:32:20 2007
-@@ -1,4 +1,4 @@
+--- 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 @@
 -: ${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>&- || \
-@@ -19,7 +19,7 @@ export EDITOR HOSTNAME MKSH=$(whence -p 
+-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'
  alias la='l -a'
  alias ll='l -l'
@@ -16,3 +30,4 @@ $FreeWRT$
  alias which='whence -p'
  whence -p rot13 >&- || alias rot13='tr [A-Za-z] [N-ZA-Mn-za-m]'
  whence -p hd >&- || function hd {
+