Hi, this updates mksh to the latest available upstream version.
Signed-off-by: Waldemar Brodkorb <[email protected]> Index: utils/mksh/Makefile =================================================================== --- utils/mksh/Makefile (Revision 35899) +++ utils/mksh/Makefile (Arbeitskopie) @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mksh -PKG_VERSION:=40d +PKG_VERSION:=44 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).cpio.gz +PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh -PKG_MD5SUM:=c6428401103367730a95b99284bf47dc +PKG_MD5SUM:=fe011686319a8c50d5e237fd5e195fd8 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -53,9 +53,9 @@ # HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency cd $(PKG_BUILD_DIR); \ CC="$(TARGET_CC)" \ - TARGET_OS="$(shell uname -s)" \ + TARGET_OS="Linux" \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_GCC565048=1" \ + CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_GCC55009=1" \ HAVE_CAN_FSTACKPROTECTORALL=0 \ LDFLAGS="$(TARGET_LDFLAGS)" \ $(BASH) Build.sh -Q -r -c lto Index: utils/mksh/patches/100-dot_mkshrc =================================================================== --- utils/mksh/patches/100-dot_mkshrc (Revision 35899) +++ utils/mksh/patches/100-dot_mkshrc (Arbeitskopie) @@ -1,38 +1,21 @@ -$Id$ - - • Part of the FreeWRT patches: - – no hostname(1) - – ls(1) has no -o option - • OpenWrt and FreeWRT-1.0 fix: - – since this is not ~/.mkshrc make sure subshells find it - ---- a/dot.mkshrc Sat Nov 26 18:15:38 2011 -+++ b/dot.mkshrc Sun Dec 11 21:31:27 2011 -@@ -21,7 +21,7 @@ +diff -Nur mksh.orig/dot.mkshrc mksh/dot.mkshrc +--- mksh.orig/dot.mkshrc 2013-02-17 16:58:51.000000000 +0100 ++++ mksh/dot.mkshrc 2013-03-08 17:09:19.000000000 +0100 +@@ -22,7 +22,7 @@ #- # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells --: ${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}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi +-PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(ulimit -c 0; hostname -s \ ++PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(</proc/sys/kernel/hostname \ + 2>/dev/null)} = *([ ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \ + 2>/dev/null); : ${EDITOR:=/bin/ed} ${HOSTNAME:=nil} ${TERM:=vt100} function precmd { -@@ -40,7 +40,7 @@ unalias ls +@@ -43,7 +43,7 @@ alias l='ls -F' alias la='l -a' alias ll='l -l' -alias lo='l -alo' +alias lo='l -al' - whence -p rot13 >&- || alias rot13='tr \ + whence -p rot13 >/dev/null || alias rot13='tr \ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \ nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM' -@@ -365,5 +365,9 @@ alias cls='print -n \\033c' - #export LANG=C LC_CTYPE=$p LC_MEASUREMENT=$p LC_MESSAGES=$p LC_PAPER=$p - - unset p -+ -+# we need this in OpenWrt for subshells that are not login shells -+: ${ENV=/etc/mkshrc} -+[[ -z $ENV ]] || export ENV - - : place customisations above this line Index: utils/mksh/patches/000-debian_build_fix.patch =================================================================== --- utils/mksh/patches/000-debian_build_fix.patch (Revision 35899) +++ utils/mksh/patches/000-debian_build_fix.patch (Arbeitskopie) @@ -1,18 +0,0 @@ -This patch is a backport of the fix proposed at: -https://bugs.launchpad.net/ubuntu/+source/mksh/+bug/1058035 - -diff -urN mksh/Build.sh mksh.new/Build.sh ---- mksh/Build.sh 2012-12-11 14:28:56.632807230 +0100 -+++ mksh.new/Build.sh 2012-12-11 14:35:23.704817141 +0100 -@@ -1530,9 +1530,11 @@ - /* but the next three are; we REQUIRE signed integer wraparound */ - cta(ari_is_signed, (mksh_ari_t)-1 < (mksh_ari_t)0); - cta(ari_has_31_bit, 0 < (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1)); -+#if !defined(MKSH_GCC565048) - cta(ari_sign_32_bit_and_wrap, - (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 1) > - (mksh_ari_t)(((((mksh_ari_t)1 << 15) << 15) - 1) * 2 + 2)); -+#endif - /* the next assertion is probably not really needed */ - cta(uari_is_4_char, sizeof(mksh_uari_t) == 4); - /* but the next four are; we REQUIRE unsigned integer wraparound */ _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
