[OpenWrt-Devel] [LEDE-DEV] [PATCH] [mksh] Update to r52c

[John Crispin]

Hi

could you please

* change the subject prefix to "utils/mksh:" and remove the []

On 11/07/2016 09:18, Alive 4ever wrote:
> Update mksh package to sync with current latest upstream (r52c).
> ----

* remove this tearline

> Signed-off-by: alive4ever <alive4ever at live.com>

* we need a real name please

	John

> ---
>  utils/mksh/Makefile               |  4 +--
>  utils/mksh/patches/100-dot_mkshrc | 52 ++++++++++++++++++---------------------
>  2 files changed, 26 insertions(+), 30 deletions(-)
> 
> diff --git a/utils/mksh/Makefile b/utils/mksh/Makefile
> index 89380a9..445974c 100644
> --- a/utils/mksh/Makefile
> +++ b/utils/mksh/Makefile
> @@ -9,7 +9,7 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=mksh
> -PKG_VERSION:=50d
> +PKG_VERSION:=52c
>  PKG_RELEASE:=1
>  
>  PKG_MAINTAINER:=Thorsten Glaser <tg at mirbsd.org>
> @@ -17,7 +17,7 @@ PKG_LICENSE:=MirOS
>  
>  PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz
>  PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh
> -PKG_MD5SUM:=1c3882c07a760b23df1ad94ad0b4ed2e
> +PKG_MD5SUM:=cc3884e02314447e7b4a3073b8d65d1e
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
>  
> diff --git a/utils/mksh/patches/100-dot_mkshrc b/utils/mksh/patches/100-dot_mkshrc
> index a7bf840..1ee2a2e 100644
> --- a/utils/mksh/patches/100-dot_mkshrc
> +++ b/utils/mksh/patches/100-dot_mkshrc
> @@ -1,3 +1,5 @@
> +Refreshed for mksh-r52c, based on tg's patch
> +
>  From 23712cea8e2a623fd952eb781df0011c501703d0 Mon Sep 17 00:00:00 2001
>  From: Thorsten Glaser <tg at mirbsd.org>
>  Date: Thu, 25 Jul 2013 22:07:33 +0200
> @@ -9,42 +11,36 @@ Subject: [PATCH] Make default mkshrc file suitable for OpenWrt environment:
>  * OpenWrt and FreeWRT-1.0 fix:
>    - since this is not ~/.mkshrc make sure subshells find it
>  ---
> - dot.mkshrc | 10 +++++++---
> - 1 file changed, 7 insertions(+), 3 deletions(-)
> -
> -diff --git a/dot.mkshrc b/dot.mkshrc
> -index 233a10c..caf482c 100644
> +Signed-off-by: alive4ever <alive4ever at live.com>
>  --- a/dot.mkshrc
>  +++ b/dot.mkshrc
> -@@ -28,8 +28,8 @@ case $KSH_VERSION in
> +@@ -28,8 +28,9 @@
>   *) return 0 ;;
>   esac
>   
> --PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(ulimit -c 0; hostname -s \
> --    2>/dev/null)} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
> -+PS1='#'; (( USER_ID )) && PS1='$'; [[ ${HOSTNAME:=$(</proc/sys/kernel/hostname
> -+    )} = *([	 ]|localhost) ]] && HOSTNAME=$(ulimit -c 0; hostname \
> -     2>/dev/null); : ${EDITOR:=/bin/ed} ${HOSTNAME:=nil} ${TERM:=vt100}
> - : ${MKSH:=$(whence -p mksh)}; PS4='[$EPOCHREALTIME] '; PS1=$'\001\r''${|
> - 	local e=$?
> -@@ -50,7 +50,7 @@ unalias ls
> - alias l='ls -F'
> - alias la='l -a'
> - alias ll='l -l'
> --alias lo='l -alo'
> -+alias lo='l -al'
> - alias doch='sudo mksh -c "$(fc -ln -1)"'
> - whence -p rot13 >/dev/null || alias rot13='tr \
> +-PS1='#'; (( USER_ID )) && PS1='$'; \: "${TERM:=vt100}${HOSTNAME:=$(\ulimit -c \
> +-    0; hostname 2>/dev/null)}${EDITOR:=/bin/ed}${USER:=$(\ulimit -c 0; id -un \
> ++PS1='#'; (( USER_ID )) && PS1='$'; \: "${HOSTNAME:=$(</proc/sys/kernel/hostname\
> ++    )} = *([     ]|localhost) && HOSTNAME=$(\ulimit -c \
> ++    0; hostname 2>/dev/null)}${EDITOR:=/bin/vi}${USER:=$(\ulimit -c 0; id -un \
> +     2>/dev/null || \echo \?)}${MKSH:=$(\builtin whence -p mksh)}"
> + HOSTNAME=${HOSTNAME%%*([	 ]).*}; HOSTNAME=${HOSTNAME##*([	 ])}
> + [[ $HOSTNAME = ?(ip6-)localhost?(6) ]] && HOSTNAME=
> +@@ -52,7 +53,7 @@
> + \alias l='ls -F'
> + \alias la='l -a'
> + \alias ll='l -l'
> +-\alias lo='l -alo'
> ++\alias lo='l -al'
> + \alias doch='sudo mksh -c "$(\builtin fc -ln -1)"'
> + \command -v rot13 >/dev/null || \alias rot13='tr \
>       abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \
> -@@ -402,4 +402,8 @@ alias cls='print -n \\033c'
> +@@ -601,4 +602,8 @@
>   
> - unset p
> + \unset p
>   
>  +# we need this in OpenWrt for subshells that are not login shells
> -+: ${ENV=/etc/mkshrc}
> ++\: ${ENV=/etc/mkshrc}
>  +[[ -z $ENV ]] || export ENV
>  +
> - : place customisations above this line
> --- 
> -2.1.1
> -
> + \: place customisations above this line
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel