[OpenWrt-Devel] [PATCH] Update mksh to R39b

[Thorsten Glaser]

Hi,

I’m the upstream and (in various distributions) package maintainer
of mksh, and there has been a new version.

The attached diff…
• syncs the 100-dot_mkshrc patch with FreeWRT and refreshes it
• fixes the svn:keywords property on it
• upgrades mksh to R39b
  ‣ the realpath builtin is now always included, so skip forcing it
• fixes a bug in setting TARGET_OS: it’s supposed to be hardcoded
  to the OS/platform of the _target_ device, *not* $(uname -s),
  which is the OS of the _build_ system (unbreaks when cross-compiling
  from e.g. Cygwin, OSX, BSD)
• syncs the mksh package description with upstream

Please apply. I tested that it actually compiles (brcm-2.4 tree) but
couldn’t do a run-time test at the moment (however, it works on BSD,
GNU/Linux, FreeWRT, Solaris, Tru64, OSF/1, Ultrix – these I’ve already
confirmed for this release).

bye,
//mirabilos
-- 
«MyISAM tables -will- get corrupted eventually. This is a fact of life. »
“mysql is about as much database as ms access” – “MSSQL at least descends
from a database” “it's a rebranded SyBase” “MySQL however was born from a
flatfile and went downhill from there” – “at least jetDB doesn’t claim to
be a database”  (#nosec)    ‣‣‣ Please let MySQL and MariaDB finally die!
Index: patches/100-dot_mkshrc
===================================================================
--- patches/100-dot_mkshrc	(revision 19380)
+++ patches/100-dot_mkshrc	(working copy)
@@ -3,12 +3,12 @@
 	• Part of the FreeWRT patches:
 	  – no hostname(1)
 	  – ls has no -o
-	• OpenWrt fix:
+	• OpenWrt and FreeWRT-1.0 fix:
 	  – since this is not ~/.mkshrc make sure subshells find it
 
---- a/dot.mkshrc
-+++ b/dot.mkshrc
-@@ -20,7 +20,7 @@
+--- mksh/dot.mkshrc~	2010-01-25 15:29:58.000000000 +0100
++++ mksh/dot.mkshrc	2010-01-29 15:57:56.000000000 +0100
+@@ -21,7 +21,7 @@
  #-
  # ~/.mkshrc: mksh initialisation file for interactive shells
  
@@ -17,19 +17,19 @@
  [[ $HOSTNAME = @(localhost|*([	 ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
  : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi
  function precmd {
-@@ -38,7 +38,7 @@ unalias ls
+@@ -39,7 +39,7 @@ unalias ls
  alias l='ls -F'
  alias la='l -a'
  alias ll='l -l'
 -alias lo='l -alo'
 +alias lo='l -al'
- alias which='whence -p'
  whence -p rot13 >&- || alias rot13='tr \
      abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
-@@ -304,4 +304,8 @@ function Lstripcom {
- 	done; }
- }
+     nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM'
+@@ -352,4 +352,8 @@ alias cls='print -n \\033c'
  
+ unset p
+ 
 +# we need this in OpenWrt for subshells that are not login shells
 +: ${ENV=/etc/mkshrc}
 +[[ -z $ENV ]] || export ENV

Property changes on: patches/100-dot_mkshrc
___________________________________________________________________
Added: svn:keywords
   + Id

Index: Makefile
===================================================================
--- Makefile	(revision 19380)
+++ Makefile	(working copy)
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2007-2008 OpenWrt.org
-# Copyright (c) 2009 Thorsten Glaser <t...@mirbsd.org>
+# Copyright (c) 2009-2010 Thorsten Glaser <t...@mirbsd.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mksh
-PKG_VERSION:=39
+PKG_VERSION:=39b
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).cpio.gz
 PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
-PKG_MD5SUM:=b2eeb4fe4ccac2704e1440e53cd2672c
+PKG_MD5SUM:=91274beff2be95260a51234d2c7bb4f7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -35,13 +35,14 @@
 derivate currently being actively developed.  It includes bug
 fixes and feature improvements, in order to produce a modern,
 robust shell good for interactive and especially script use.
-mksh has UTF-8 support (e.g. in the emacs editing mode); R38c
-corresponds to OpenBSD 4.5-current ksh (without GNU bash-like
-$PS1 and fancy character classes).  The code has throughoutly
+mksh has UTF-8 support (in substring operations and the Emacs
+editing mode) and, while R39b corresponds to OpenBSD 4.6-cur-
+rent ksh (without GNU bash-like PS1 and fancy character clas-
+ses), adheres to SUSv4 and is much more robust.  The code has
 been cleaned up and simplified, bugs fixed, standards compli-
 ance added, and several enhancements (for extended compatibi-
 lity to other modern shells - as well as a couple of its own)
-have been placed.
+are available.
 endef
 
 define Build/Compile
@@ -50,15 +51,12 @@
 	#	UTF-8 mode, neither use setlocale/nl_langinfo
 	#	nor look at $LC_* and $LANG (not recommended)
 	# HAVE_CAN_FSTACKPROTECTORALL=0 ⇒ nuke libssp dependency
-	# HAVE_REALPATH=x ⇒ add the realpath builtin, which was
-	#	disabled by MKSH_SMALL, back if realpath() exists
 	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" \
 		HAVE_CAN_FSTACKPROTECTORALL=0 \
-		HAVE_REALPATH=x \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 			$(BASH) Build.sh -Q -r
 endef

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel