Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mksh: update to current version

Browse source 
also
• update description
• drop “-c lto”, this option is gone from Build.sh
• add missing $(TARGET_CPPFLAGS)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
This commit is contained in:
Thorsten Glaser 2020-11-29 01:31:44 +01:00 committed by Thorsten Glaser
parent 1fcb02973f
commit a3dc217aca
No known key found for this signature in database
GPG key ID: 8950C1895EB8D3B3
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
utils/mksh/Makefile
View file

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mksh PKG_NAME:=mksh
PKG_VERSION:=56c PKG_VERSION:=59c
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Thorsten Glaser <tg@mirbsd.org>, \ PKG_MAINTAINER:=Thorsten Glaser <tg@mirbsd.org>, \
@ -19,7 +19,7 @@ PKG_LICENSE:=MirOS
PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME)-R$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh \ PKG_SOURCE_URL:=http://www.mirbsd.org/MirOS/dist/mir/mksh \
http://pub.allbsd.org/MirOS/dist/mir/mksh http://pub.allbsd.org/MirOS/dist/mir/mksh
PKG_HASH:=dd86ebc421215a7b44095dc13b056921ba81e61b9f6f4cdab08ca135d02afb77 PKG_HASH:=77ae1665a337f1c48c61d6b961db3e52119b38e58884d1c89684af31f87bc506
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@ -42,7 +42,7 @@ derivate currently being actively developed. It includes bug
fixes and feature improvements, in order to produce a modern, fixes and feature improvements, in order to produce a modern,
robust shell good for interactive and especially script use. robust shell good for interactive and especially script use.
mksh has UTF-8 support (in substring operations and the Emacs mksh has UTF-8 support (in substring operations and the Emacs
editing mode) and - while R50 corresponds to OpenBSD 5.5-cur- editing mode) and - while R59 corresponds to OpenBSD 5.7-cur-
rent ksh (without GNU bash-like PS1 and fancy character clas- rent ksh (without GNU bash-like PS1 and fancy character clas-
ses) - adheres to SUSv4 and is much more robust. The code has ses) - adheres to SUSv4 and is much more robust. The code has
been cleaned up and simplified, bugs fixed, standards compli- been cleaned up and simplified, bugs fixed, standards compli-
@ -65,11 +65,11 @@ define Build/Compile
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
TARGET_OS="$(shell uname -s)" \ TARGET_OS="$(shell uname -s)" \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_BINSHPOSIX -DMKSHRC_PATH=\\\"/etc/mkshrc\\\"" \ CPPFLAGS="$(TARGET_CPPFLAGS) -DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=0 -DMKSH_BINSHPOSIX -DMKSHRC_PATH=\\\"/etc/mkshrc\\\"" \
HAVE_CAN_FSTACKPROTECTORALL=0 \ HAVE_CAN_FSTACKPROTECTORALL=0 \
HAVE_CAN_FSTACKPROTECTORSTRONG=0 \ HAVE_CAN_FSTACKPROTECTORSTRONG=0 \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
$(BASH) Build.sh -Q -r -c lto $(BASH) Build.sh -Q -r
endef endef
define Package/mksh/postinst define Package/mksh/postinst

13
utils/mksh/patches/100-dot_mkshrc
View file

@ -32,17 +32,16 @@ Signed-off-by: Alif M. A. <alive4ever at live.com>
--- a/dot.mkshrc --- a/dot.mkshrc
+++ b/dot.mkshrc +++ b/dot.mkshrc
@@ -63,10 +63,9 @@ @@ -64,9 +64,9 @@
EDITOR= EDITOR=
done done
-\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -alo' -\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -alo'
-\: "${HOSTNAME:=$(\\builtin ulimit -c 0; \\builtin print -r -- $(hostname \ -\: "${EDITOR:=/bin/ed}${TERM:=vt100}${USER:=$(\\builtin ulimit -c 0; id -un \
- 2>/dev/null))}${EDITOR:=/bin/ed}${TERM:=vt100}${USER:=$(\\builtin ulimit \ - 2>/dev/null)}${HOSTNAME:=$(\\builtin ulimit -c 0; hostname 2>/dev/null)}"
- -c 0; id -un 2>/dev/null)}${USER:=?}"
+\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -al' +\\builtin alias ls=ls l='ls -F' la='l -a' ll='l -l' lo='l -al'
+\: "${HOSTNAME:=$(</proc/sys/kernel/hostname)}${EDITOR:=/bin/vi}${TERM:=vt100}\ +\: "${EDITOR:=/bin/vi}${TERM:=vt100}${USER:=$(\\builtin ulimit -c 0; id -un \
+ ${USER:=$(\\builtin ulimit -c 0; id -un 2>/dev/null)}${USER:=?}" + 2>/dev/null)}${HOSTNAME:=$(</proc/sys/kernel/hostname)}"
[[ $HOSTNAME = ?(?(ip6-)localhost?(6)) ]] && HOSTNAME=nil; \\builtin unalias ls [[ $HOSTNAME = ?(?(ip6-)localhost?(6)) ]] && HOSTNAME=nil; \\builtin unalias ls
\\builtin export EDITOR HOSTNAME TERM USER \\builtin export EDITOR HOSTNAME TERM USER="${USER:-?}"