X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9fc0086f05724e99d6c1d1c7346baee7865867fa..0ac7043b58e74928955a9037d63265a56451c7b7:/packages/zsh/build.sh

diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index 9e57827c..ef810a79 100644
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -1,17 +1,20 @@
-TERMUX_PKG_HOMEPAGE="http://www.zsh.org/"
-TERMUX_PKG_DESCRIPTION="Shell designed for interactive use, although it is also a powerful scripting language"
-_FOLDERVERSION=5.2
-TERMUX_PKG_VERSION=${_FOLDERVERSION}.0
-TERMUX_PKG_BUILD_REVISION=3
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zsh/zsh/$_FOLDERVERSION/zsh-${_FOLDERVERSION}.tar.xz
-TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${_FOLDERVERSION}"
-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"
+TERMUX_PKG_HOMEPAGE=https://www.zsh.org
+TERMUX_PKG_DESCRIPTION="Shell with lots of features"
+TERMUX_PKG_VERSION=5.5.1
+TERMUX_PKG_SHA256=35dd75e44a3bbc9d5eefe77a9f5504a19eeeac1ca91a36ca15cff65844b92f7a
+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, pcre"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_header_utmp_h=no
+ac_cv_func_getpwuid=yes
+--disable-gdbm
+--enable-pcre
+--enable-etcdir=$TERMUX_PREFIX/etc
+"
 TERMUX_PKG_CONFFILES="etc/zshrc"
 
-# Below needed to force dynamically loaded binary modules, but does not currently work:
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" zsh_cv_shared_environ=yes"
-
 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,
@@ -21,7 +24,10 @@ termux_step_post_configure () {
 	# - 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).
-	for module in files regex curses zprof socket; do
+	# - 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 pcre; do
 		perl -p -i -e "s|${module}.mdd link=no|${module}.mdd link=static|" $TERMUX_PKG_BUILDDIR/config.modules
 	done
 }
@@ -32,15 +38,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/$_FOLDERVERSION}
-}
-
-termux_step_create_debscripts () {
-	# For already installed packages:
-	echo "chmod 700 $TERMUX_PREFIX/share/zsh" > postinst
-        echo "exit 0" >> postinst
-        chmod 0755 postinst
 }