X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/917dd81c3ff811a70ef7bd0c408f65b380b89329..35d070fc50529dfdabb2f50a62e9ea6c475425b4:/packages/zsh/build.sh

diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index 333e70bc..a6c015df 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -1,13 +1,30 @@
-TERMUX_PKG_HOMEPAGE="http://www.zsh.org/"
-TERMUX_PKG_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language"
-TERMUX_PKG_VERSION=5.1.1
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zsh/zsh/${TERMUX_PKG_VERSION}/zsh-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_HOMEPAGE=https://www.zsh.org
+TERMUX_PKG_DESCRIPTION="Shell with lots of features"
+TERMUX_PKG_VERSION=5.4.2
+TERMUX_PKG_SHA256=62f5d034d5f4bbaa7a6b08f49aeb16a9c7dc327fd9b3d5a8017d08c66b1beb92
+TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/zsh-${TERMUX_PKG_VERSION}.tar.xz
+# Remove hard link to bin/zsh as Android does not support hard links:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools, command-not-found"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-etcdir=$TERMUX_PREFIX/etc --disable-gdbm --disable-pcre ac_cv_header_utmp_h=no"
-# Below needed to force loadable binary modules, but does not currently work:
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_shared_environ=yes"
+TERMUX_PKG_CONFFILES="etc/zshrc"
+
+termux_step_post_configure () {
+	# INSTALL file: "For a non-dynamic zsh, the default is to compile the complete, compctl, zle,
+	# computil, complist, sched, # parameter, zleparameter and rlimits modules into the shell,
+	# and you will need to edit config.modules to make any other modules available."
+	# Since we build zsh non-dynamically (since dynamic loading doesn't work on Android when enabled),
+	# we need to explicitly enable the additional modules we want.
+	# - The files module is needed by `compinstall` (https://github.com/termux/termux-packages/issues/61).
+	# - The regex module seems to be used by several extensions.
+	# - The curses, socket and zprof modules was desired by BrainDamage on IRC (#termux).
+	# - The deltochar and mathfunc modules is used by grml-zshrc (https://github.com/termux/termux-packages/issues/494).
+	# - The system module is needed by zplug (https://github.com/termux/termux-packages/issues/659).
+	# - The zpty is needed by zsh-async (https://github.com/termux/termux-packages/issues/672).
+	for module in files regex curses zprof socket system deltochar mathfunc zpty; do
+		perl -p -i -e "s|${module}.mdd link=no|${module}.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules
+	done
+}
 
 termux_step_post_make_install () {
 	# /etc/zshrc - Run for interactive shells (http://zsh.sourceforge.net/Guide/zshguide02.html):
@@ -15,15 +32,4 @@ termux_step_post_make_install () {
 
 	# Remove zsh.new/zsh.old/zsh-$version if any exists:
 	rm -f $TERMUX_PREFIX/{zsh-*,zsh.*}
-
-	# This should perhaps be done in a more general way? Doing it here
-	# to silence "compaudit" warnings:
-	chmod 700 $TERMUX_PREFIX/share/{zsh,zsh/$TERMUX_PKG_VERSION}
-}
-
-termux_step_create_debscripts () {
-	# For already installed packages:
-	echo "chmod 700 $TERMUX_PREFIX/share/{zsh,zsh/$TERMUX_PKG_VERSION}" > postinst
-        echo "exit 0" >> postinst
-        chmod 0755 postinst
 }