Fix wait3() function and bump build revisions

diff --git a/ndk_patches/sys-wait.h.patch b/ndk_patches/sys-wait.h.patch
index b91a233e3e264d02cac8acfaa95314ef69a8de14..e7418c99026735d8d9daa5cfcce9371fc420f927 100644 (file)
--- a/ndk_patches/sys-wait.h.patch
+++ b/ndk_patches/sys-wait.h.patch
@@ -6,7 +6,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  extern pid_t  waitpid(pid_t, int *, int);
  extern pid_t  wait4(pid_t, int *, int, struct rusage *);
 +/* Termux addition: Add wait3() declaration used by busybox. Available in libc for 32-bit only. */
-+static pid_t wait3(int* status, int options, struct rusage* rusage) { wait4(-1, status, options, rusage); }
++static pid_t wait3(int* status, int options, struct rusage* rusage) { return wait4(-1, status, options, rusage); }
  
  /* Posix states that idtype_t should be an enumeration type, but
   * the kernel headers define P_ALL, P_PID and P_PGID as constant macros

diff --git a/packages/apr/build.sh b/packages/apr/build.sh
index 6cef7a181b3bef14ede7c99007857ba8d7cc1e79..feab308da58acaf51f87dd90bda46d0b816513c3 100644 (file)
--- a/packages/apr/build.sh
+++ b/packages/apr/build.sh
@@ -1,4 +1,5 @@
 TERMUX_PKG_VERSION=1.5.2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://archive.apache.org/dist/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_HOMEPAGE=https://apr.apache.org/
 TERMUX_PKG_DESCRIPTION="Apache Portable Runtime - library providing a predictable and consistent interface to underlying platform-specific implementations"

diff --git a/packages/bash/build.sh b/packages/bash/build.sh
index 9a85b5e20a5f46c7a4720a4181629b54e21a4d36..672d3115ffa04842b2e9346555fd000fb4de39dd 100755 (executable)
--- a/packages/bash/build.sh
+++ b/packages/bash/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools"
 _MAIN_VERSION=4.3
 _PATCH_VERSION=39
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 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"
 

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 7e9909cb3992b8b2f9ff5275a3396f11c1ecb7f0..22f5433267e3004573d0043781b80ddb07169337 100755 (executable)
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.23.2
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 

diff --git a/packages/dash/build.sh b/packages/dash/build.sh
index ec975346f643c1e78c5a1908500aeb2976552ac7..085acf51b24b76e39e20559a20fca2116ffdf1b9 100644 (file)
--- a/packages/dash/build.sh
+++ b/packages/dash/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 TERMUX_PKG_DESCRIPTION="Small POSIX-compliant implementation of /bin/sh"
 TERMUX_PKG_VERSION=0.5.8
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz
 
 CFLAGS+=" -DAT_EACCESS=0x200"

diff --git a/packages/inetutils/build.sh b/packages/inetutils/build.sh
index 98170ad823a00de693f1765e48b7605c9ae1f733..87191870f5567a6d1233a30bea48e7265c32bc77 100644 (file)
--- a/packages/inetutils/build.sh
+++ b/packages/inetutils/build.sh
@@ -1,6 +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=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="readline"
 # These are old cruft / not suited for android:

diff --git a/packages/ttyrec/build.sh b/packages/ttyrec/build.sh
index adbba530849b0f44e7f8ad5c8f76909e06b70a05..0494dfe28f03c291068eb29894fbae689888f32b 100644 (file)
--- a/packages/ttyrec/build.sh
+++ b/packages/ttyrec/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://0xcc.net/ttyrec/
 TERMUX_PKG_DESCRIPTION="Terminal recorder and player"
 TERMUX_PKG_VERSION=1.0.8
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://0xcc.net/ttyrec/ttyrec-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 

diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh
index dfd4ff9dbf68a6b178ad9146b629775ba32a7a2d..91dc329f48550485605e6b72cedbaa0ca140ebb8 100644 (file)
--- a/packages/zsh/build.sh
+++ b/packages/zsh/build.sh
@@ -1,7 +1,7 @@
 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.0.8
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/zsh/zsh/${TERMUX_PKG_VERSION}/zsh-${TERMUX_PKG_VERSION}.tar.bz2"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-tools"