Update readline to v7 and bash to v4.4

As a consequence of updating readline to version 7 we bump the build revision of all packaging linking to it as the soname has changed.
8 years ago · 83d11d6e04
28 changed files with 32 additions and 34 deletions
--- a/packages/abook/build.sh
+++ b/packages/abook/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://abook.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
 TERMUX_PKG_VERSION=0.6.0pre2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://abook.sourceforge.net/devel/abook-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man"
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/bash/
 TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features from the Korn shell (ksh) and C shell (csh)"
 TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command-not-found"
-_MAIN_VERSION=4.3
-_PATCH_VERSION=46
+_MAIN_VERSION=4.4
+_PATCH_VERSION=0
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline ac_cv_header_grp_h=no ac_cv_header_pwd_h=no ac_cv_rl_version=6.3"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-multibyte --without-bash-malloc --with-installed-readline ac_cv_header_grp_h=no ac_cv_rl_version=7.0"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_job_control_missing=present"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_sys_siglist=yes"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_func_sigsetjmp=present"
@ -20,7 +20,7 @@ termux_step_pre_configure () {
        cd $TERMUX_PKG_SRCDIR
 	for patch_number in `seq -f '%03g' ${_PATCH_VERSION}`; do
 		PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${patch_number}.patch
-		test ! -f $PATCHFILE && curl "http://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-$patch_number" > $PATCHFILE
+		test ! -f $PATCHFILE && curl "http://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-$patch_number" > $PATCHFILE
 		patch -p0 -i $PATCHFILE
 	done
 }
--- a/packages/bash/dont_endpwent_in_shell_c.patch
+++ b/packages/bash/dont_endpwent_in_shell_c.patch
@ -1,13 +0,0 @@
-diff -u -r ../bash-4.2/shell.c ./shell.c
--- ../bash-4.2/shell.c	2011-01-02 22:04:51.000000000 +0100
-+++ ./shell.c	2014-02-11 11:20:46.000000000 +0100
-@@ -1654,7 +1654,9 @@
- 	  current_user.shell = savestring ("/bin/sh");
- 	  current_user.home_dir = savestring ("/");
- 	}
-+#ifndef __ANDROID__
-       endpwent ();
-+#endif
-     }
- }
- 
--- a/packages/bc/build.sh
+++ b/packages/bc/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/bc/
 TERMUX_PKG_DESCRIPTION="Arbitrary precision numeric processing language"
 TERMUX_PKG_VERSION=1.06.95
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://alpha.gnu.org/gnu/bc/bc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="readline,flex"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline --mandir=$TERMUX_PREFIX/share/man"
--- a/packages/dnsutils/build.sh
+++ b/packages/dnsutils/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/
 TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
 TERMUX_PKG_VERSION=9.10.4
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME="bind-$TERMUX_PKG_VERSION"
 TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf"
--- a/packages/gawk/build.sh
+++ b/packages/gawk/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/gawk/
 TERMUX_PKG_DESCRIPTION="Interpreted programming language designed for text processing and typically used as a data extraction and reporting tool"
 TERMUX_PKG_DEPENDS="libandroid-support, libmpfr, libgmp, readline"
 TERMUX_PKG_VERSION=4.1.4
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gawk/gawk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gawk-* bin/igawk share/man/man1/igawk.1"

--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_DEPENDS="liblzma, libexpat, readline"
 TERMUX_PKG_VERSION=7.11.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-readline --with-curses --enable-static ac_cv_func_getpwent=no ac_cv_func_getpwnam=no"
--- a/packages/gnuchess/build.sh
+++ b/packages/gnuchess/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/chess/
 TERMUX_PKG_DESCRIPTION="Chess-playing program"
 TERMUX_PKG_VERSION=6.2.2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/chess/gnuchess-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="ncurses, readline"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/gnuchessu bin/gnuchessx"
--- a/packages/gnugo/build.sh
+++ b/packages/gnugo/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gnugo/
 TERMUX_PKG_DESCRIPTION="Program that plays the game of Go"
 TERMUX_PKG_VERSION=3.8
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gnugo/gnugo-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="ncurses, readline"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline"
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.1.15
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libnpth,readline,pinentry"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ldap --disable-sqlite"
--- a/packages/gnuplot/build.sh
+++ b/packages/gnuplot/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnuplot.info/
 TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
 TERMUX_PKG_VERSION=5.0.4
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals"
 TERMUX_PKG_DEPENDS="libandroid-support, readline, pango, libgd"
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://hunspell.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Spell checker"
 TERMUX_PKG_VERSION=1.4.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"
 TERMUX_PKG_DEPENDS="ncurses, readline, hunspell-en-us"
--- a/packages/inetutils/build.sh
+++ b/packages/inetutils/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/inetutils/
 TERMUX_PKG_DESCRIPTION="Collection of common network programs"
 TERMUX_PKG_VERSION=1.9.4
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="readline, libutil"
 # These are old cruft / not suited for android:
--- a/packages/lftp/build.sh
+++ b/packages/lftp/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://lftp.yar.ru/
 TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
 TERMUX_PKG_VERSION=4.7.3
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://lftp.yar.ru/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
 # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.
 # (2) Use --with-openssl to use openssl instead of gnutls.
--- a/packages/libsqlite/build.sh
+++ b/packages/libsqlite/build.sh
@ -4,6 +4,7 @@ TERMUX_PKG_DESCRIPTION="Software library that implements a self-contained, serve
 _SQLITE_MAJOR=3
 _SQLITE_MINOR=14
 _SQLITE_PATCH=2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH}
 TERMUX_PKG_SRCURL=https://www.sqlite.org/2016/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-readline"
--- a/packages/lua/build.sh
+++ b/packages/lua/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.lua.org/
 TERMUX_PKG_DESCRIPTION="Powerful, fast, lightweight, embeddable scripting language"
 TERMUX_PKG_VERSION=5.3.3
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://www.lua.org/ftp/lua-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="readline"
 TERMUX_PKG_EXTRA_MAKE_ARGS=linux
--- a/packages/mathomatic/build.sh
+++ b/packages/mathomatic/build.sh
@ -1,5 +1,5 @@
 TERMUX_PKG_VERSION=16.0.5
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_HOMEPAGE=http://www.mathomatic.org/
 TERMUX_PKG_DESCRIPTION="Simple CAS and symbolic calculator"
 TERMUX_PKG_SRCURL="http://fossies.org/linux/misc/mathomatic-${TERMUX_PKG_VERSION}.tar.gz"
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://php.net/
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=5.6.25
+TERMUX_PKG_VERSION=5.6.26
 TERMUX_PKG_SRCURL=http://mirror.internode.on.net/pub/php/php-${TERMUX_PKG_VERSION}.tar.xz
 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true

 _MAJOR_VERSION=3.5
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_BUILD_REVISION=4
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz

 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true

 _MAJOR_VERSION=2.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.12
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz

 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
--- a/packages/qalc/build.sh
+++ b/packages/qalc/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://qalculate.github.io/
 TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator"
 TERMUX_PKG_VERSION=0.9.10
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v${TERMUX_PKG_VERSION}/libqalculate-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="glib, gnuplot, libcln, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/readline/build.sh
+++ b/packages/readline/build.sh
@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 TERMUX_PKG_DESCRIPTION="Library providing a set of functions for use by applications that allow users to edit command lines as they are typed in"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
-_MAIN_VERSION=6.3
-_PATCH_VERSION=8
+_MAIN_VERSION=7.0
+_PATCH_VERSION=0
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/readline/readline-${_MAIN_VERSION}.tar.gz

@ -13,7 +13,7 @@ termux_step_pre_configure () {
        cd $TERMUX_PKG_SRCDIR
 	for patch_number in `seq -f '%03g' ${_PATCH_VERSION}`; do
 		PATCHFILE=$TERMUX_PKG_CACHEDIR/readline_patch_${patch_number}.patch
-		test ! -f $PATCHFILE && curl "http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-$patch_number" > $PATCHFILE
+		test ! -f $PATCHFILE && curl "http://ftp.gnu.org/gnu/readline/readline-7.0-patches/readline70-$patch_number" > $PATCHFILE
 		patch -p0 -i $PATCHFILE
 	done
 }
--- a/packages/rlwrap/build.sh
+++ b/packages/rlwrap/build.sh
@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://utopia.knoware.nl/~hlub/rlwrap/
 TERMUX_PKG_DESCRIPTION="Wrapper using readline to enable editing of keyboard input for commands"
 TERMUX_PKG_VERSION=0.42
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://utopia.knoware.nl/~hlub/rlwrap/rlwrap-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ptyttylib_cv_ptys=STREAMS ac_cv_func_grantpt=yes ac_cv_func_unlockpt=yes"
 # Avoid linking to libutil:
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/
 TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity"
 _MAJOR_VERSION=2.3
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_SRCURL=http://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
 # libbffi is used by the fiddle extension module:
 TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil"
--- a/packages/socat/build.sh
+++ b/packages/socat/build.sh
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.dest-unreach.org/socat/
 TERMUX_PKG_DESCRIPTION="Relay for bidirectional data transfer between two independent data channels"
 TERMUX_PKG_DEPENDS="openssl, readline, libutil"
 TERMUX_PKG_VERSION=1.7.3.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://www.dest-unreach.org/socat/download/socat-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes ac_compiler_gnu=yes" # sc_cv_sys_crdly_shift=9 sc_cv_sys_csize_shift=4 sc_cv_sys_tabdly_shift=11"
 TERMUX_PKG_BUILD_IN_SRC=yes
--- a/packages/tasksh/build.sh
+++ b/packages/tasksh/build.sh
@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Shell command wrapping Taskwarrior commands"
 TERMUX_PKG_VERSION=1.1.0
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://taskwarrior.org/download/tasksh-latest.tar.gz
 TERMUX_PKG_SHA256=eef7c6677d6291b1c0e13595e8c9606d7f8dc1060d197a0d088cc1fddcb70024
 TERMUX_PKG_DEPENDS="readline, taskwarrior, libandroid-glob"
--- a/packages/units/build.sh
+++ b/packages/units/build.sh
@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/units/
 TERMUX_PKG_DESCRIPTION="Converts between different systems of units"
 TERMUX_PKG_VERSION=2.13
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="readline, libandroid-support"
--- a/packages/wcalc/build.sh
+++ b/packages/wcalc/build.sh
@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://w-calc.sourceforge.net
 TERMUX_PKG_DESCRIPTION="Capable calculator"
 TERMUX_PKG_VERSION=2.5
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/w-calc/wcalc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="flex,libmpfr,libgmp,readline"