Merge remote-tracking branch 'upstream/master' into tesseract

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:15.04
+FROM ubuntu:15.10
 MAINTAINER Alex Cornejo <acornejo@gmail.com>
 
 # to prevent dialog warnings
@@ -50,12 +50,12 @@ RUN apt-get update && apt-get install -y \
 
 RUN cd /tmp && \
     curl -O http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz && \
-    curl -O http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && \
     tar xzvf /tmp/android-sdk_r24.3.4-linux.tgz && \
-    chmod 755 /tmp/android-ndk* && /tmp/android-ndk-r10e-linux-x86_64.bin && \
+    curl -o ndk.zip http://dl.google.com/android/repository/android-ndk-r11-linux-x86_64.zip && \
+    unzip ndk.zip && \
     mkdir /root/lib && \
     mv /tmp/android-sdk-linux /root/lib/android-sdk && \
-    mv /tmp/android-ndk-r10e  /root/lib/android-ndk && \
+    mv /tmp/android-ndk-r11-linux-x86_64.tar.bz2 /root/lib/android-ndk && \
     rm -fr /tmp/*
 
 RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \
@@ -64,7 +64,7 @@ RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages &
     luarocks install lua-MessagePack && \
     luarocks install luabitop
 
-ADD *.py /root/termux-packages/
+ADD scripts /root/termux-packages/scripts
 ADD *.sh /root/termux-packages/
 ADD *.spec /root/termux-packages/
 ADD packages /root/termux-packages/packages

README.md

@@ -23,7 +23,7 @@ setup steps:
 * Install the Android SDK at `$HOME/lib/android-sdk`. Override this by setting the environment
 variable `$ANDROID_HOME` to point at another location.
 
-* Install the Android NDK, version r10e, at `$HOME/lib/android-ndk`. Override this by setting
+* Install the Android NDK, version r11, at `$HOME/lib/android-ndk`. Override this by setting
 the environment variable `$NDK` to point at another location.
 
 Alternatively a Dockerfile is provided which sets up a pristine image

build-package.sh

@@ -34,15 +34,19 @@ TERMUX_ARCH_BITS="32"
 if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then
 	TERMUX_ARCH_BITS="64"
 fi
+: ${TERMUX_CLANG:=""} # Set to non-empty to use clang.
 : ${TERMUX_HOST_PLATFORM:="${TERMUX_ARCH}-linux-android"}
 if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi
 : ${TERMUX_PREFIX:='/data/data/com.termux/files/usr'}
 : ${TERMUX_ANDROID_HOME:='/data/data/com.termux/files/home'}
 : ${TERMUX_DEBUG:=""}
 : ${TERMUX_PROCESS_DEB:=""}
-: ${TERMUX_GCC_VERSION:="4.9"}
 : ${TERMUX_API_LEVEL:="21"}
-: ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"}
+if [ "$TERMUX_CLANG" = "" ]; then
+	: ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc4.9"}
+else
+	: ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-clang38"}
+fi
 : ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"}
 # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH
 # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
@@ -59,15 +63,31 @@ export TERMUX_TOUCH="touch"
 test `uname` = "Darwin" && TERMUX_TOUCH=gtouch
 
 # Compute NDK version. We remove the first character (the r in e.g. r9d) to get a version number which can be used in packages):
-export TERMUX_NDK_VERSION=`cut -d ' ' -f 1 $NDK/RELEASE.TXT | cut -c 2-`
+export TERMUX_NDK_VERSION=11
+if grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" $NDK/source.properties; then
+	:
+else
+	echo "Wrong NDK version - we need $TERMUX_NDK_VERSION"
+	exit 1
+fi
 
 export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles
 #export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal"
 export AR=$TERMUX_HOST_PLATFORM-ar
+if [ "$TERMUX_CLANG" = "" ]; then
 	export AS=${TERMUX_HOST_PLATFORM}-gcc
 	export CC=$TERMUX_HOST_PLATFORM-gcc
-export CPP=${TERMUX_HOST_PLATFORM}-cpp
 	export CXX=$TERMUX_HOST_PLATFORM-g++
+	_SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec"
+else
+	export AS=${TERMUX_HOST_PLATFORM}-clang
+	export CC=$TERMUX_HOST_PLATFORM-clang
+	export CXX=$TERMUX_HOST_PLATFORM-clang++
+	# TODO: clang does not have specs file, how to ensure pie
+	# binaries gets built?
+	_SPECSFLAG=""
+fi
+export CPP=${TERMUX_HOST_PLATFORM}-cpp
 export CC_FOR_BUILD=gcc
 export LD=$TERMUX_HOST_PLATFORM-ld
 export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump
@@ -78,7 +98,6 @@ export RANLIB=$TERMUX_HOST_PLATFORM-ranlib
 export READELF=$TERMUX_HOST_PLATFORM-readelf
 export STRIP=$TERMUX_HOST_PLATFORM-strip
 
-_SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec"
 export CFLAGS="$_SPECSFLAG"
 export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib"
 
@@ -126,11 +145,17 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
 	else
 		_TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM"
 	fi
-	bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_NDK_TOOLCHAIN_NAME}-${TERMUX_GCC_VERSION} \
+
-		--install-dir=$TERMUX_STANDALONE_TOOLCHAIN --system=`uname | tr '[:upper:]' '[:lower:]'`-x86_64
+	if [ "$TERMUX_CLANG" = "" ]; then
+		_TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-4.9"
+	else
+		_TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang"
+	fi
+	bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_TOOLCHAIN} \
+		--install-dir=$TERMUX_STANDALONE_TOOLCHAIN
         if [ "arm" = $TERMUX_ARCH ]; then
                 # Fix to allow e.g. <bits/c++config.h> to be included:
-                cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/$TERMUX_GCC_VERSION/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/$TERMUX_GCC_VERSION/bits
+                cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/bits
         fi
 	cd $TERMUX_STANDALONE_TOOLCHAIN/sysroot
 	for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do
@@ -356,6 +381,8 @@ termux_step_configure () {
 	# <https://github.com/termux/termux-packages/issues/76>.
 	AVOID_AUTOCONF_WRAPPERS+=" gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no"
 	AVOID_AUTOCONF_WRAPPERS+=" gl_cv_header_working_fcntl_h=yes gl_cv_func_fcntl_f_dupfd_cloexec=yes gl_cv_func_fcntl_f_dupfd_works=yes"
+	# Remove rpl_gettimeofday reference when building at least coreutils:
+	AVOID_AUTOCONF_WRAPPERS+=" gl_cv_func_tzset_clobber=no gl_cv_func_gettimeofday_clobber=no gl_cv_func_gettimeofday_posix_signature=yes"
 
 	env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \
 		--disable-dependency-tracking \
@@ -445,12 +472,14 @@ termux_step_massage () {
                 find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*'
 	fi
         # Fix shebang paths:
-        for file in `find . -type f`; do
+        for file in `find -L . -type f`; do
-                head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file
+                head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "1 s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file
         done
 	set -e -o pipefail
         # Remove DT_ entries which the android 5.1 linker warns about:
+	if [ "$TERMUX_DEBUG" = "" ]; then
 		find . -type f -print0 | xargs -0 $TERMUX_ELF_CLEANER
+	fi
 
 	test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL
 
@@ -488,7 +517,8 @@ termux_step_massage () {
                 for includeset in $TERMUX_SUBPKG_INCLUDE; do
                         _INCLUDE_DIRSET=`dirname $includeset`
                         test "$_INCLUDE_DIRSET" = "." && _INCLUDE_DIRSET=""
-                        if [ -e $includeset ]; then
+                        if [ -e $includeset -o -L $includeset ]; then
+				# Add the -L clause to handle relative symbolic links:
                                 mkdir -p $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET
                                 mv $includeset $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET
                         fi
@@ -563,7 +593,7 @@ termux_setup_golang () {
 		exit 1
 	fi
 
-	local TERMUX_GO_VERSION=go1.6beta2
+	local TERMUX_GO_VERSION=go1.6
 	local TERMUX_GO_PLATFORM=linux-amd64
 	test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
 

disabled-packages/clisp/build.sh

@@ -0,0 +1,28 @@
+TERMUX_PKG_HOMEPAGE=http://www.clisp.org/
+TERMUX_PKG_DESCRIPTION="GNU CLISP - an ANSI Common Lisp Implementation"
+TERMUX_PKG_VERSION=2.49
+TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/clisp/clisp/${TERMUX_PKG_VERSION}/clisp-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_DEPENDS="readline, libandroid-support"
+TERMUX_MAKE_PROCESSES=1
+
+termux_step_configure () {
+	cd $TERMUX_PKG_BUILDDIR
+
+	export XCPPFLAGS="$CPPFLAGS"
+	export XCFLAGS="$CFLAGS"
+	export XLDFLAGS="$LDFLAGS"
+
+	unset CC
+	unset CPPFLAGS
+	unset CFLAGS
+	unset LDFLAGS
+
+	$TERMUX_PKG_SRCDIR/configure \
+		--host=$TERMUX_HOST_PLATFORM \
+		--prefix=$TERMUX_PREFIX \
+		--enable-shared \
+		--disable-static \
+		--srcdir=$TERMUX_PKG_SRCDIR \
+		--ignore-absence-of-libsigsegv \
+		ac_cv_func_select=yes
+}

disabled-packages/clisp/src-gllib-stdint.in.h.patch

@@ -0,0 +1,573 @@
+diff -u -r ../clisp-2.49/src/gllib/stdint.in.h ./src/gllib/stdint.in.h
+--- ../clisp-2.49/src/gllib/stdint.in.h	2010-05-18 14:38:04.000000000 -0400
++++ ./src/gllib/stdint.in.h	2016-02-17 15:35:07.664544781 -0500
+@@ -1,568 +1 @@
+-/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc.
+-   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+-   This file is part of gnulib.
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3, or (at your option)
+-   any later version.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with this program; if not, write to the Free Software Foundation,
+-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+-
+-/*
+- * ISO C 99 <stdint.h> for platforms that lack it.
+- * <http://www.opengroup.org/susv3xbd/stdint.h.html>
+- */
+-
+-#ifndef _gl_GL_STDINT_H
+-
+-#if __GNUC__ >= 3
+-@PRAGMA_SYSTEM_HEADER@
+-#endif
+-
+-/* When including a system file that in turn includes <inttypes.h>,
+-   use the system <inttypes.h>, not our substitute.  This avoids
+-   problems with (for example) VMS, whose <sys/bitypes.h> includes
+-   <inttypes.h>.  */
+-#define _gl_GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+-
+-/* Get those types that are already defined in other system include
+-   files, so that we can "#define int8_t signed char" below without
+-   worrying about a later system include file containing a "typedef
+-   signed char int8_t;" that will get messed up by our macro.  Our
+-   macros should all be consistent with the system versions, except
+-   for the "fast" types and macros, which we recommend against using
+-   in public interfaces due to compiler differences.  */
+-
+-#if @HAVE_STDINT_H@
+-# if defined __sgi && ! defined __c99
+-   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
+-      with "This header file is to be used only for c99 mode compilations"
+-      diagnostics.  */
+-#  define __STDINT_H__
+-# endif
+-  /* Other systems may have an incomplete or buggy <stdint.h>.
+-     Include it before <inttypes.h>, since any "#include <stdint.h>"
+-     in <inttypes.h> would reinclude us, skipping our contents because
+-     _gl_GL_STDINT_H is defined.
+-     The include_next requires a split double-inclusion guard.  */
+-# @INCLUDE_NEXT@ @NEXT_STDINT_H@
+-#endif
+-
+-#if ! defined _gl_GL_STDINT_H && ! defined _gl_GL_JUST_INCLUDE_SYSTEM_STDINT_H
+-#define _gl_GL_STDINT_H
+-
+-/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
+-   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+-   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
+-   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+-   relies on the system <stdint.h> definitions, so include
+-   <sys/types.h> after @NEXT_STDINT_H@.  */
+-#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+-# include <sys/types.h>
+-#endif
+-
+-/* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
+-#include <limits.h>
+-
+-#if @HAVE_INTTYPES_H@
+-  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
+-     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+-     <inttypes.h> also defines intptr_t and uintptr_t.  */
+-# include <inttypes.h>
+-#elif @HAVE_SYS_INTTYPES_H@
+-  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
+-     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
+-# include <sys/inttypes.h>
+-#endif
+-
+-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+-  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+-     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
+-     included by <sys/types.h>.  */
+-# include <sys/bitypes.h>
+-#endif
+-
+-#undef _gl_GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+-
+-/* Minimum and maximum values for a integer type under the usual assumption.
+-   Return an unspecified value if BITS == 0, adding a check to pacify
+-   picky compilers.  */
+-
+-#define _STDINT_MIN(signed, bits, zero) \
+-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+-
+-#define _STDINT_MAX(signed, bits, zero) \
+-  ((signed) \
+-   ? ~ _STDINT_MIN (signed, bits, zero) \
+-   : /* The expression for the unsigned case.  The subtraction of (signed) \
+-        is a nop in the unsigned case and avoids "signed integer overflow" \
+-        warnings in the signed case.  */ \
+-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+-
+-/* 7.18.1.1. Exact-width integer types */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits.  */
+-
+-#undef int8_t
+-#undef uint8_t
+-typedef signed char gl_int8_t;
+-typedef unsigned char gl_uint8_t;
+-#define int8_t gl_int8_t
+-#define uint8_t gl_uint8_t
+-
+-#undef int16_t
+-#undef uint16_t
+-typedef short int gl_int16_t;
+-typedef unsigned short int gl_uint16_t;
+-#define int16_t gl_int16_t
+-#define uint16_t gl_uint16_t
+-
+-#undef int32_t
+-#undef uint32_t
+-typedef int gl_int32_t;
+-typedef unsigned int gl_uint32_t;
+-#define int32_t gl_int32_t
+-#define uint32_t gl_uint32_t
+-
+-/* Do not undefine int64_t if gnulib is not being used with 64-bit
+-   types, since otherwise it breaks platforms like Tandem/NSK.  */
+-#if LONG_MAX >> 31 >> 31 == 1
+-# undef int64_t
+-typedef long int gl_int64_t;
+-# define int64_t gl_int64_t
+-# define GL_INT64_T
+-#elif defined _MSC_VER
+-# undef int64_t
+-typedef __int64 gl_int64_t;
+-# define int64_t gl_int64_t
+-# define GL_INT64_T
+-#elif @HAVE_LONG_LONG_INT@
+-# undef int64_t
+-typedef long long int gl_int64_t;
+-# define int64_t gl_int64_t
+-# define GL_INT64_T
+-#endif
+-
+-#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+-# undef uint64_t
+-typedef unsigned long int gl_uint64_t;
+-# define uint64_t gl_uint64_t
+-# define GL_UINT64_T
+-#elif defined _MSC_VER
+-# undef uint64_t
+-typedef unsigned __int64 gl_uint64_t;
+-# define uint64_t gl_uint64_t
+-# define GL_UINT64_T
+-#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+-# undef uint64_t
+-typedef unsigned long long int gl_uint64_t;
+-# define uint64_t gl_uint64_t
+-# define GL_UINT64_T
+-#endif
+-
+-/* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
+-#define _UINT8_T
+-#define _UINT32_T
+-#define _UINT64_T
+-
+-
+-/* 7.18.1.2. Minimum-width integer types */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+-   are the same as the corresponding N_t types.  */
+-
+-#undef int_least8_t
+-#undef uint_least8_t
+-#undef int_least16_t
+-#undef uint_least16_t
+-#undef int_least32_t
+-#undef uint_least32_t
+-#undef int_least64_t
+-#undef uint_least64_t
+-#define int_least8_t int8_t
+-#define uint_least8_t uint8_t
+-#define int_least16_t int16_t
+-#define uint_least16_t uint16_t
+-#define int_least32_t int32_t
+-#define uint_least32_t uint32_t
+-#ifdef GL_INT64_T
+-# define int_least64_t int64_t
+-#endif
+-#ifdef GL_UINT64_T
+-# define uint_least64_t uint64_t
+-#endif
+-
+-/* 7.18.1.3. Fastest minimum-width integer types */
+-
+-/* Note: Other <stdint.h> substitutes may define these types differently.
+-   It is not recommended to use these types in public header files. */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+-   are taken from the same list of types.  Assume that 'long int'
+-   is fast enough for all narrower integers.  */
+-
+-#undef int_fast8_t
+-#undef uint_fast8_t
+-#undef int_fast16_t
+-#undef uint_fast16_t
+-#undef int_fast32_t
+-#undef uint_fast32_t
+-#undef int_fast64_t
+-#undef uint_fast64_t
+-typedef long int gl_int_fast8_t;
+-typedef unsigned long int gl_uint_fast8_t;
+-typedef long int gl_int_fast16_t;
+-typedef unsigned long int gl_uint_fast16_t;
+-typedef long int gl_int_fast32_t;
+-typedef unsigned long int gl_uint_fast32_t;
+-#define int_fast8_t gl_int_fast8_t
+-#define uint_fast8_t gl_uint_fast8_t
+-#define int_fast16_t gl_int_fast16_t
+-#define uint_fast16_t gl_uint_fast16_t
+-#define int_fast32_t gl_int_fast32_t
+-#define uint_fast32_t gl_uint_fast32_t
+-#ifdef GL_INT64_T
+-# define int_fast64_t int64_t
+-#endif
+-#ifdef GL_UINT64_T
+-# define uint_fast64_t uint64_t
+-#endif
+-
+-/* 7.18.1.4. Integer types capable of holding object pointers */
+-
+-#undef intptr_t
+-#undef uintptr_t
+-typedef long int gl_intptr_t;
+-typedef unsigned long int gl_uintptr_t;
+-#define intptr_t gl_intptr_t
+-#define uintptr_t gl_uintptr_t
+-
+-/* 7.18.1.5. Greatest-width integer types */
+-
+-/* Note: These types are compiler dependent. It may be unwise to use them in
+-   public header files. */
+-
+-#undef intmax_t
+-#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+-typedef long long int gl_intmax_t;
+-# define intmax_t gl_intmax_t
+-#elif defined GL_INT64_T
+-# define intmax_t int64_t
+-#else
+-typedef long int gl_intmax_t;
+-# define intmax_t gl_intmax_t
+-#endif
+-
+-#undef uintmax_t
+-#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+-typedef unsigned long long int gl_uintmax_t;
+-# define uintmax_t gl_uintmax_t
+-#elif defined GL_UINT64_T
+-# define uintmax_t uint64_t
+-#else
+-typedef unsigned long int gl_uintmax_t;
+-# define uintmax_t gl_uintmax_t
+-#endif
+-
+-/* Verify that intmax_t and uintmax_t have the same size.  Too much code
+-   breaks if this is not the case.  If this check fails, the reason is likely
+-   to be found in the autoconf macros.  */
+-typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
+-
+-/* 7.18.2. Limits of specified-width integer types */
+-
+-#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
+-
+-/* 7.18.2.1. Limits of exact-width integer types */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits.  */
+-
+-#undef INT8_MIN
+-#undef INT8_MAX
+-#undef UINT8_MAX
+-#define INT8_MIN  (~ INT8_MAX)
+-#define INT8_MAX  127
+-#define UINT8_MAX  255
+-
+-#undef INT16_MIN
+-#undef INT16_MAX
+-#undef UINT16_MAX
+-#define INT16_MIN  (~ INT16_MAX)
+-#define INT16_MAX  32767
+-#define UINT16_MAX  65535
+-
+-#undef INT32_MIN
+-#undef INT32_MAX
+-#undef UINT32_MAX
+-#define INT32_MIN  (~ INT32_MAX)
+-#define INT32_MAX  2147483647
+-#define UINT32_MAX  4294967295U
+-
+-#undef INT64_MIN
+-#undef INT64_MAX
+-#ifdef GL_INT64_T
+-/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+-   evaluates the latter incorrectly in preprocessor expressions.  */
+-# define INT64_MIN  (- INTMAX_C (1) << 63)
+-# define INT64_MAX  INTMAX_C (9223372036854775807)
+-#endif
+-
+-#undef UINT64_MAX
+-#ifdef GL_UINT64_T
+-# define UINT64_MAX  UINTMAX_C (18446744073709551615)
+-#endif
+-
+-/* 7.18.2.2. Limits of minimum-width integer types */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+-   are the same as the corresponding N_t types.  */
+-
+-#undef INT_LEAST8_MIN
+-#undef INT_LEAST8_MAX
+-#undef UINT_LEAST8_MAX
+-#define INT_LEAST8_MIN  INT8_MIN
+-#define INT_LEAST8_MAX  INT8_MAX
+-#define UINT_LEAST8_MAX  UINT8_MAX
+-
+-#undef INT_LEAST16_MIN
+-#undef INT_LEAST16_MAX
+-#undef UINT_LEAST16_MAX
+-#define INT_LEAST16_MIN  INT16_MIN
+-#define INT_LEAST16_MAX  INT16_MAX
+-#define UINT_LEAST16_MAX  UINT16_MAX
+-
+-#undef INT_LEAST32_MIN
+-#undef INT_LEAST32_MAX
+-#undef UINT_LEAST32_MAX
+-#define INT_LEAST32_MIN  INT32_MIN
+-#define INT_LEAST32_MAX  INT32_MAX
+-#define UINT_LEAST32_MAX  UINT32_MAX
+-
+-#undef INT_LEAST64_MIN
+-#undef INT_LEAST64_MAX
+-#ifdef GL_INT64_T
+-# define INT_LEAST64_MIN  INT64_MIN
+-# define INT_LEAST64_MAX  INT64_MAX
+-#endif
+-
+-#undef UINT_LEAST64_MAX
+-#ifdef GL_UINT64_T
+-# define UINT_LEAST64_MAX  UINT64_MAX
+-#endif
+-
+-/* 7.18.2.3. Limits of fastest minimum-width integer types */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+-   are taken from the same list of types.  */
+-
+-#undef INT_FAST8_MIN
+-#undef INT_FAST8_MAX
+-#undef UINT_FAST8_MAX
+-#define INT_FAST8_MIN  LONG_MIN
+-#define INT_FAST8_MAX  LONG_MAX
+-#define UINT_FAST8_MAX  ULONG_MAX
+-
+-#undef INT_FAST16_MIN
+-#undef INT_FAST16_MAX
+-#undef UINT_FAST16_MAX
+-#define INT_FAST16_MIN  LONG_MIN
+-#define INT_FAST16_MAX  LONG_MAX
+-#define UINT_FAST16_MAX  ULONG_MAX
+-
+-#undef INT_FAST32_MIN
+-#undef INT_FAST32_MAX
+-#undef UINT_FAST32_MAX
+-#define INT_FAST32_MIN  LONG_MIN
+-#define INT_FAST32_MAX  LONG_MAX
+-#define UINT_FAST32_MAX  ULONG_MAX
+-
+-#undef INT_FAST64_MIN
+-#undef INT_FAST64_MAX
+-#ifdef GL_INT64_T
+-# define INT_FAST64_MIN  INT64_MIN
+-# define INT_FAST64_MAX  INT64_MAX
+-#endif
+-
+-#undef UINT_FAST64_MAX
+-#ifdef GL_UINT64_T
+-# define UINT_FAST64_MAX  UINT64_MAX
+-#endif
+-
+-/* 7.18.2.4. Limits of integer types capable of holding object pointers */
+-
+-#undef INTPTR_MIN
+-#undef INTPTR_MAX
+-#undef UINTPTR_MAX
+-#define INTPTR_MIN  LONG_MIN
+-#define INTPTR_MAX  LONG_MAX
+-#define UINTPTR_MAX  ULONG_MAX
+-
+-/* 7.18.2.5. Limits of greatest-width integer types */
+-
+-#undef INTMAX_MIN
+-#undef INTMAX_MAX
+-#ifdef INT64_MAX
+-# define INTMAX_MIN  INT64_MIN
+-# define INTMAX_MAX  INT64_MAX
+-#else
+-# define INTMAX_MIN  INT32_MIN
+-# define INTMAX_MAX  INT32_MAX
+-#endif
+-
+-#undef UINTMAX_MAX
+-#ifdef UINT64_MAX
+-# define UINTMAX_MAX  UINT64_MAX
+-#else
+-# define UINTMAX_MAX  UINT32_MAX
+-#endif
+-
+-/* 7.18.3. Limits of other integer types */
+-
+-/* ptrdiff_t limits */
+-#undef PTRDIFF_MIN
+-#undef PTRDIFF_MAX
+-#if @APPLE_UNIVERSAL_BUILD@
+-# ifdef _LP64
+-#  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
+-#  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+-# else
+-#  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
+-#  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
+-# endif
+-#else
+-# define PTRDIFF_MIN  \
+-    _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+-# define PTRDIFF_MAX  \
+-    _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
+-#endif
+-
+-/* sig_atomic_t limits */
+-#undef SIG_ATOMIC_MIN
+-#undef SIG_ATOMIC_MAX
+-#define SIG_ATOMIC_MIN  \
+-   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+-                0@SIG_ATOMIC_T_SUFFIX@)
+-#define SIG_ATOMIC_MAX  \
+-   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
+-                0@SIG_ATOMIC_T_SUFFIX@)
+-
+-
+-/* size_t limit */
+-#undef SIZE_MAX
+-#if @APPLE_UNIVERSAL_BUILD@
+-# ifdef _LP64
+-#  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+-# else
+-#  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+-# endif
+-#else
+-# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+-#endif
+-
+-/* wchar_t limits */
+-/* Get WCHAR_MIN, WCHAR_MAX.
+-   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
+-   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+-   <stdint.h> and assumes its types are already defined.  */
+-#if ! (defined WCHAR_MIN && defined WCHAR_MAX)
+-# define _gl_GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+-# include <wchar.h>
+-# undef _gl_GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+-#endif
+-#undef WCHAR_MIN
+-#undef WCHAR_MAX
+-#define WCHAR_MIN  \
+-   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+-#define WCHAR_MAX  \
+-   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
+-
+-/* wint_t limits */
+-#undef WINT_MIN
+-#undef WINT_MAX
+-#define WINT_MIN  \
+-   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+-#define WINT_MAX  \
+-   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
+-
+-#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
+-
+-/* 7.18.4. Macros for integer constants */
+-
+-#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
+-
+-/* 7.18.4.1. Macros for minimum-width integer constants */
+-/* According to ISO C 99 Technical Corrigendum 1 */
+-
+-/* Here we assume a standard architecture where the hardware integer
+-   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
+-
+-#undef INT8_C
+-#undef UINT8_C
+-#define INT8_C(x) x
+-#define UINT8_C(x) x
+-
+-#undef INT16_C
+-#undef UINT16_C
+-#define INT16_C(x) x
+-#define UINT16_C(x) x
+-
+-#undef INT32_C
+-#undef UINT32_C
+-#define INT32_C(x) x
+-#define UINT32_C(x) x ## U
+-
+-#undef INT64_C
+-#undef UINT64_C
+-#if LONG_MAX >> 31 >> 31 == 1
+-# define INT64_C(x) x##L
+-#elif defined _MSC_VER
+-# define INT64_C(x) x##i64
+-#elif @HAVE_LONG_LONG_INT@
+-# define INT64_C(x) x##LL
+-#endif
+-#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+-# define UINT64_C(x) x##UL
+-#elif defined _MSC_VER
+-# define UINT64_C(x) x##ui64
+-#elif @HAVE_UNSIGNED_LONG_LONG_INT@
+-# define UINT64_C(x) x##ULL
+-#endif
+-
+-/* 7.18.4.2. Macros for greatest-width integer constants */
+-
+-#undef INTMAX_C
+-#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+-# define INTMAX_C(x)   x##LL
+-#elif defined GL_INT64_T
+-# define INTMAX_C(x)   INT64_C(x)
+-#else
+-# define INTMAX_C(x)   x##L
+-#endif
+-
+-#undef UINTMAX_C
+-#if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+-# define UINTMAX_C(x)  x##ULL
+-#elif defined GL_UINT64_T
+-# define UINTMAX_C(x)  UINT64_C(x)
+-#else
+-# define UINTMAX_C(x)  x##UL
+-#endif
+-
+-#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
+-
+-#endif /* _gl_GL_STDINT_H */
+-#endif /* !defined _gl_GL_STDINT_H && !defined _gl_GL_JUST_INCLUDE_SYSTEM_STDINT_H */
++#include_next <stdint.h>

disabled-packages/clisp/src-makefile.in.patch

@@ -0,0 +1,13 @@
+diff -u -r ../clisp-2.49/src/makemake.in ./src/makemake.in
+--- ../clisp-2.49/src/makemake.in	2010-07-07 11:15:35.000000000 -0400
++++ ./src/makemake.in	2016-02-17 15:27:00.420198622 -0500
+@@ -651,9 +651,6 @@
+   # We can cross-compile only with GCC
+   XCC=${COMPILER}  # ${TSYS}-gcc
+   XCPP="${XCC} -E"
+-  XCPPFLAGS=''
+-  XCFLAGS=''
+-  XLDFLAGS=''
+   XCC_GCC=true
+   XCC_NEED_DEEMA=false
+ else

disabled-packages/gcc5/build.sh

@@ -1,67 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/
-TERMUX_PKG_DESCRIPTION="GNU C compiler"
-TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot"
-TERMUX_PKG_VERSION=5.3.0
-TERMUX_PKG_SRCURL=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-languages=c,c++ --with-system-zlib --disable-multilib --disable-lto"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-gmp=$TERMUX_PREFIX --with-mpfr=$TERMUX_PREFIX --with-mpc=$TERMUX_PREFIX"
-# To build gcc as a PIE binary:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-stage1-ldflags=\"-specs=$TERMUX_SCRIPTDIR/termux.spec\""
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-headers --with-local-prefix=$TERMUX_PREFIX/include" # FIXME: gcc5 trying
-if [ "$TERMUX_ARCH" = "arm" ]; then
-        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv7-a --with-fpu=neon --with-float=hard"
-elif [ "$TERMUX_ARCH" = "i686" ]; then
-        # -mstackrealign -msse3 -m32
-        TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=i686 --with-tune=atom --with-fpmath=sse"
-fi
-TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
-TERMUX_PKG_RM_AFTER_INSTALL="bin/gcc-ar bin/gcc-ranlib bin/c++ bin/gcc-nm bin/*-linux-* lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/include-fixed lib/gcc/*-linux-*/$TERMUX_PKG_VERSION/install-tools libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/install-tools share/man/man7"
-
-export AR_FOR_TARGET="$AR"
-export AS_FOR_TARGET="$AS"
-export CC_FOR_TARGET="$CC"
-export CFLAGS_FOR_TARGET="$CFLAGS" 
-export CPP_FOR_TARGET="$CPP"
-export CPPFLAGS_FOR_TARGET="$CPPFLAGS"
-export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
-export CXX_FOR_TARGET="$CXX"
-export LDFLAGS_FOR_TARGET="$LDFLAGS"
-export LD_FOR_TARGET="$LD"
-export PKG_CONFIG_FOR_TARGET="$PKG_CONFIG"
-export RANLIB_FOR_TARGET="$RANLIB"
-
-unset AR
-unset AS
-unset CC
-unset CFLAGS
-unset CPP
-unset CPPFLAGS
-unset CXXFLAGS
-unset CXX
-unset LDFLAGS
-unset LD
-unset PKG_CONFIG
-unset RANLIB
-
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=x86-linux-android"
-
-termux_step_make () {
-	make -j $TERMUX_MAKE_PROCESSES all-gcc
-	make -j $TERMUX_MAKE_PROCESSES all-target-libgcc
-}
-
-termux_step_make_install () {
-	make install-gcc 
-        make install-target-libgcc
-}
-
-termux_step_post_make_install () {
-	if [ $TERMUX_ARCH = "arm" ]; then
-		# Note that moving to $TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/${TERMUX_PKG_VERSION}/
-        	# allows compilation but fails to link at runtime
-		mv $TERMUX_PREFIX/lib/armv7-a/hard/libgcc_s* $TERMUX_PREFIX/lib/
-	fi
-
-	# Android 5.0 only supports PIE binaries, so build that by default with a specs file:
-	cp $TERMUX_SCRIPTDIR/termux.spec $TERMUX_PREFIX/lib/gcc/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_VERSION/specs
-}

disabled-packages/gcc5/g++.subpackage.sh

@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="bin/g++ share/man/man1/g++.1 libexec/gcc/arm-linux-androideabi/4.9.2/cc1plus"
-TERMUX_SUBPKG_DESCRIPTION="GNU C++ compiler"
-TERMUX_SUBPKG_DEPENDS="gcc,ndk-stl"

disabled-packages/gcc5/gcov.subpackage.sh

@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="bin/gcov share/man/man1/gcov.1 lib/gcc/arm-linux-androideabi/4.9.1/libgcov.a"
-TERMUX_SUBPKG_DESCRIPTION="GNU coverage testing tool"
-TERMUX_SUBPKG_DEPENDS="gcc"

disabled-packages/ghostscript/build.sh

@@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="Interpreter for the PostScript language and for PDF"
 TERMUX_PKG_VERSION=9.18
 TERMUX_PKG_SRCURL=http://downloads.ghostscript.com/public/ghostscript-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libtiff"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-libtiff"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-libtiff --enable-little-endian"
 
 # See " it possible to cross compile GhostPCL/GhostXPS" at bottom of
 # http://ghostscript.com/FAQ.html
 
 termux_step_pre_configure () {
+	export CCAUX=gcc
+
 	local _ARCHFILE=$TERMUX_PKG_BUILDER_DIR/arch-arm.h
 	$TERMUX_TOUCH -d "next hour" $_ARCHFILE
 	perl -p -i -e "s|TARGET_ARCH_FILE=.*|TARGET_ARCH_FILE=$_ARCHFILE|" $TERMUX_PKG_SRCDIR/Makefile.in

disabled-packages/proot/src-arch.h.patch

@@ -1,15 +0,0 @@
-From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788113
-
-diff -u -r ../PRoot-5.1.0/src/arch.h ./src/arch.h
---- ../PRoot-5.1.0/src/arch.h	2014-12-15 09:18:11.000000000 -0500
-+++ ./src/arch.h	2016-01-08 19:53:23.789378336 -0500
-@@ -125,6 +125,9 @@
-     #define OFFSETOF_STAT_UID_32 0
-     #define OFFSETOF_STAT_GID_32 0
- 
-+    #define EXEC_PIC_ADDRESS   0x500000000000
-+    #define INTERP_PIC_ADDRESS 0x6f0000000000
-+
- #elif defined(ARCH_X86)
- 
-     #define SYSNUMS_HEADER1 "syscall/sysnums-i386.h"

disabled-packages/proot/src-loader-assemble-arm64.h.patch

@@ -1,99 +0,0 @@
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788113
-
-diff -N -u -r ../PRoot-5.1.0/src/loader/assemble-arm64.h ./src/loader/assemble-arm64.h
---- ../PRoot-5.1.0/src/loader/assembly-arm64.h	1969-12-31 19:00:00.000000000 -0500
-+++ ./src/loader/assembly-arm64.h	2016-01-08 20:12:46.494779723 -0500
-@@ -0,0 +1,93 @@
-+/* -*- c-set-style: "K&R"; c-basic-offset: 8 -*-
-+ *
-+ * This file is part of PRoot.
-+ *
-+ * Copyright (C) 2014 STMicroelectronics
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+ * 02110-1301 USA.
-+ */
-+
-+#define BRANCH(stack_pointer, destination) do {			\
-+	asm volatile (						\
-+		"// Restore initial stack pointer.	\n\t"	\
-+		"mov sp, %0				\n\t"	\
-+		"					\n\t"	\
-+		"// Clear rtld_fini.			\n\t"	\
-+		"mov x0, #0				\n\t"	\
-+		"					\n\t"	\
-+		"// Start the program.			\n\t"	\
-+		"br %1					\n"	\
-+		: /* no output */				\
-+		: "r" (stack_pointer), "r" (destination)	\
-+		: "memory", "sp", "x0");			\
-+	__builtin_unreachable();				\
-+	} while (0)
-+
-+#define PREPARE_ARGS_1(arg1_)				\
-+	register word_t arg1 asm("x0") = arg1_;		\
-+
-+#define PREPARE_ARGS_3(arg1_, arg2_, arg3_)		\
-+	PREPARE_ARGS_1(arg1_)				\
-+	register word_t arg2 asm("x1") = arg2_;		\
-+	register word_t arg3 asm("x2") = arg3_;		\
-+
-+#define PREPARE_ARGS_4(arg1_, arg2_, arg3_, arg4_)	\
-+	PREPARE_ARGS_3(arg1_, arg2_, arg3_)		\
-+	register word_t arg4 asm("x3") = arg4_;
-+
-+#define PREPARE_ARGS_6(arg1_, arg2_, arg3_, arg4_, arg5_, arg6_)	\
-+	PREPARE_ARGS_3(arg1_, arg2_, arg3_)				\
-+	register word_t arg4 asm("x3") = arg4_;				\
-+	register word_t arg5 asm("x4") = arg5_;				\
-+	register word_t arg6 asm("x5") = arg6_;
-+
-+#define OUTPUT_CONTRAINTS_1			\
-+	"r" (arg1)
-+
-+#define OUTPUT_CONTRAINTS_3			\
-+	OUTPUT_CONTRAINTS_1,			\
-+	"r" (arg2), "r" (arg3)
-+
-+#define OUTPUT_CONTRAINTS_4			\
-+	OUTPUT_CONTRAINTS_3,			\
-+	"r" (arg4)
-+
-+#define OUTPUT_CONTRAINTS_6				\
-+	OUTPUT_CONTRAINTS_3,				\
-+	"r" (arg4), "r" (arg5), "r" (arg6)
-+
-+#define SYSCALL(number_, nb_args, args...)			\
-+	({							\
-+		register word_t number asm("w8") = number_;	\
-+		register word_t result asm("x0");		\
-+		PREPARE_ARGS_##nb_args(args)			\
-+			asm volatile (				\
-+				"svc #0x00000000	\n\t"	\
-+				: "=r" (result)			\
-+				: "r" (number),			\
-+				OUTPUT_CONTRAINTS_##nb_args	\
-+				: "memory");			\
-+			result;					\
-+	})
-+
-+#define OPENAT	56
-+#define CLOSE	57
-+#define MMAP	222
-+#define MMAP_OFFSET_SHIFT 0
-+#define EXECVE	221
-+#define EXIT	93
-+#define PRCTL	167
-+

disabled-packages/proot/src-loader-loader.c.patch

@@ -1,26 +0,0 @@
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788113
-
-diff -N -u -r ../PRoot-5.1.0/src/loader/loader.c ./src/loader/loader.c
---- ../PRoot-5.1.0/src/loader/loader.c	2014-12-15 09:18:11.000000000 -0500
-+++ ./src/loader/loader.c	2016-01-08 20:16:54.746809929 -0500
-@@ -39,6 +39,8 @@
- #    include "loader/assembly-x86_64.h"
- #elif defined(ARCH_ARM_EABI)
- #    include "loader/assembly-arm.h"
-+#elif defined(ARCH_ARM64)
-+#    include "loader/assembly-arm64.h"
- #elif defined(ARCH_X86)
- #    include "loader/assembly-x86.h"
- #else
-@@ -134,7 +136,11 @@
- 			/* Fall through.  */
- 
- 		case LOAD_ACTION_OPEN:
-+#ifdef OPENAT
-+			fd = SYSCALL(OPENAT, 4, AT_FDCWD, stmt->open.string_address, O_RDONLY, 0);
-+#else
- 			fd = SYSCALL(OPEN, 3, stmt->open.string_address, O_RDONLY, 0);
-+#endif
- 			if (unlikely((int) fd < 0))
- 				FATAL();
- 

ndk_patches/pwd.patch

@@ -1,6 +1,6 @@
 diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
---- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h	2014-10-14 22:53:49.000000000 -0400
+--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h	2016-03-03 16:54:24.000000000 -0500
-+++ ./usr/include/pwd.h	2015-07-15 09:42:32.974621965 -0400
++++ ./usr/include/pwd.h	2016-03-10 08:11:16.795710172 -0500
 @@ -65,6 +65,10 @@
  #include <sys/cdefs.h>
  #include <sys/types.h>
@@ -12,10 +12,11 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
  #define _PATH_PASSWD        "/etc/passwd"
  #define _PATH_MASTERPASSWD  "/etc/master.passwd"
  #define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
-@@ -119,6 +122,36 @@
+@@ -119,7 +123,40 @@
  int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
  int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
  
+-void endpwent(void);
 +static void android_setup_pwd(struct passwd* pw) {
 +       static char realpath_buffer[4096/*PATH_MAX*/];
 +       char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer);
@@ -28,6 +29,9 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +       }
 +       pw->pw_dir = "@TERMUX_HOME@";
 +       pw->pw_passwd = "*";
++#ifdef __LP64__
++       pw->pw_gecos = ""; /* Avoid NULL field. */
++#endif
 +}
 +
 +static struct passwd* android_polyfill_getpwuid(uid_t t) {
@@ -46,6 +50,6 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +
 +#define getpwnam android_polyfill_getpwnam
 +#define getpwuid android_polyfill_getpwuid
- void endpwent(void);
++static void endpwent(void) { /* Do nothing. */ }
  struct passwd* getpwent(void);
  int setpwent(void);

ndk_patches/stdlib.h.patch

@@ -0,0 +1,14 @@
+diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/stdlib.h ./usr/include/stdlib.h
+--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/include/stdlib.h	2016-03-03 16:54:24.000000000 -0500
++++ ./usr/include/stdlib.h	2016-03-22 16:38:58.589340159 -0400
+@@ -161,8 +161,8 @@
+ extern int	wctomb(char *, wchar_t);
+ extern size_t	wcstombs(char *, const wchar_t *, size_t);
+ 
+-extern size_t __ctype_get_mb_cur_max(void);
+-#define MB_CUR_MAX __ctype_get_mb_cur_max()
++/* Termux modification: Always utf-8. */
++#define MB_CUR_MAX 4
+ 
+ __END_DECLS
+ 

ndk_patches/sys-user.h.patch

@@ -15,23 +15,3 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm64/usr/in
  #elif defined(__x86_64__)
  
  struct user_fpregs_struct {
-@@ -234,7 +240,18 @@
- 
- #elif defined(__aarch64__)
- 
--// There are no user structures for 64 bit arm.
-+/* From https://codereview.chromium.org/1291983003 */
-+struct user_regs_struct {
-+  __u64 regs[31];
-+  __u64 sp;
-+  __u64 pc;
-+  __u64 pstate;
-+};
-+struct user_fpsimd_struct {
-+  __uint128_t vregs[32];
-+  __u32 fpsr;
-+  __u32 fpcr;
-+};
- 
- #else
- 

packages/abduco/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.brain-dump.org/projects/abduco/
 TERMUX_PKG_DESCRIPTION="Clean and simple terminal session manager"
-TERMUX_PKG_VERSION=0.5
+TERMUX_PKG_VERSION=0.6
 TERMUX_PKG_SRCURL=http://www.brain-dump.org/projects/abduco/abduco-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libutil,dvtm"

packages/apt/apt-pkg-deb-debindexfile.cc.patch

@@ -0,0 +1,14 @@
+diff -u -r ../apt-1.2.3/apt-pkg/deb/debindexfile.cc ./apt-pkg/deb/debindexfile.cc
+--- ../apt-1.2.3/apt-pkg/deb/debindexfile.cc	2016-02-10 12:02:45.000000000 -0500
++++ ./apt-pkg/deb/debindexfile.cc	2016-02-18 02:44:56.707323056 -0500
+@@ -26,8 +26,10 @@
+ 
+ #include <stdio.h>
+ #include <iostream>
++#include <stdlib.h>
+ #include <string>
+ #include <sstream>
++#include <unistd.h>
+ 
+ #include <sys/stat.h>
+ 									/*}}}*/

packages/apt/apt-pkg-edsp-edspsystem.cc.patch

@@ -1,11 +0,0 @@
-diff -u -r ../apt-1.1.3/apt-pkg/edsp/edspsystem.cc ./apt-pkg/edsp/edspsystem.cc
---- ../apt-1.1.3/apt-pkg/edsp/edspsystem.cc	2015-11-30 03:08:24.000000000 -0500
-+++ ./apt-pkg/edsp/edspsystem.cc	2015-12-03 16:33:49.052450163 -0500
-@@ -21,6 +21,7 @@
- 
- #include <stddef.h>
- #include <unistd.h>
-+#include <stdlib.h> /* For mkdtemp */
- 
- #include <string>
- #include <vector>

packages/apt/build.sh

@@ -1,14 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_DEPENDS="liblzma, libgnustl, dpkg, gnupg"
-TERMUX_PKG_VERSION=1.2.1
+TERMUX_PKG_VERSION=1.2.6
-TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--host=${TERMUX_ARCH}-linux --disable-rpath acl_cv_rpath=$TERMUX_PREFIX/lib gt_cv_func_CFPreferencesCopyAppValue=no gt_cv_func_CFLocaleCopyCurrent=no ac_cv_c_bigendian=no --no-create"
 # When ready to drop bz2 support:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_bz2_BZ2_bzopen=no"
 TERMUX_PKG_FOLDERNAME=apt-${TERMUX_PKG_VERSION}
 TERMUX_PKG_ESSENTIAL=yes
+TERMUX_PKG_CONFFILES="etc/apt/sources.list"
 
 # $NDK/docs/STANDALONE-TOOLCHAIN.html: "If you use the GNU libstdc++, you will need to explicitly link with libsupc++ if you use these features"
 export LDFLAGS="$LDFLAGS -lgnustl_shared" # -lsupc++"

packages/aria2/a2io.h.patch

@@ -1,7 +1,7 @@
-diff -u -r ../aria2-1.18.8/src/a2io.h ./src/a2io.h
+diff -u -r ../aria2-1.20.0/src/a2io.h ./src/a2io.h
---- ../aria2-1.18.8/src/a2io.h	2014-09-11 12:24:10.000000000 -0400
+--- ../aria2-1.20.0/src/a2io.h	2016-02-15 10:36:34.000000000 -0500
-+++ ./src/a2io.h	2014-12-21 13:11:23.147655665 -0500
++++ ./src/a2io.h	2016-03-07 18:34:51.855777471 -0500
-@@ -149,7 +149,7 @@
+@@ -148,7 +148,7 @@
  #define a2fstat(fd, buf) fstat64(fd, buf)
  // # define a2ftell(fd): No ftell64 and not used in aria2
  #define a2_struct_stat struct stat

packages/aria2/build.sh

@@ -1,7 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://aria2.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Multi-protocol & multi-source command-line download utility supporting HTTP/HTTPS, FTP, BitTorrent and Metalink"
-TERMUX_PKG_VERSION=1.19.3
+TERMUX_PKG_VERSION=1.20.0
-TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/tatsuhiro-t/aria2/releases/download/release-$TERMUX_PKG_VERSION/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="c-ares, openssl, libxml2, libgnustl"
 # sqlite3 is only used for loading cookies from firefox or chrome:

packages/asciinema/Makefile.patch

@@ -1,22 +1,14 @@
-diff -u -r ../asciinema-1.1.1/Makefile ./Makefile
+diff -u -r ../asciinema-1.2.0/Makefile ./Makefile
---- ../asciinema-1.1.1/Makefile	2015-06-21 17:58:14.000000000 +0200
+--- ../asciinema-1.2.0/Makefile	2016-02-22 06:00:31.000000000 -0500
-+++ ./Makefile	2015-08-20 01:39:05.000000000 +0200
++++ ./Makefile	2016-03-07 18:42:26.516807994 -0500
-@@ -1,6 +1,6 @@
+@@ -13,8 +13,8 @@
- NAME=asciinema
- VERSION=$(shell grep 'const Version' main.go | awk -F '"' '{print $$2}')
--COMMIT=$(shell git rev-parse --short HEAD)
-+COMMIT=1.1.1
- 
- DIRS=bin
- INSTALL_DIRS=`find $(DIRS) -type d 2>/dev/null`
-@@ -14,8 +14,8 @@
  
  all: build
  
 -build: test
--	go build -o bin/asciinema -ldflags "-X main.GitCommit $(COMMIT)"
+-	go build -o bin/asciinema
 +build:
-+	go build -o bin/asciinema -ldflags "-extldflags=-pie -X main.GitCommit $(COMMIT)"
++	go build -o bin/asciinema -ldflags "-extldflags=-pie"
  
  test:
  	go test ./...

packages/asciinema/build.sh

@@ -1,7 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://asciinema.org/
 TERMUX_PKG_DESCRIPTION="Record and share your terminal sessions, the right way"
-TERMUX_PKG_VERSION=1.1.1
+TERMUX_PKG_VERSION=1.2.0
-TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME=asciinema-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
@@ -18,4 +17,7 @@ termux_step_make_install () {
 	cd $GOPATH/src/github.com/asciinema/asciinema
 	PREFIX=$TERMUX_PREFIX make build
 	PREFIX=$TERMUX_PREFIX make install
+
+	mkdir -p $TERMUX_PREFIX/share/man/man1/
+	cp $TERMUX_PKG_SRCDIR/man/asciinema.1 $TERMUX_PREFIX/share/man/man1/
 }

packages/bash-completion/build.sh

@@ -1,7 +1,7 @@
-TERMUX_PKG_HOMEPAGE=https://bash-completion.alioth.debian.org/
+TERMUX_PKG_HOMEPAGE=https://github.com/scop/bash-completion
 TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
-TERMUX_PKG_VERSION=2.1
+TERMUX_PKG_VERSION=2.2
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SRCURL=https://bash-completion.alioth.debian.org/files/bash-completion-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_FOLDERNAME=bash-completion-${TERMUX_PKG_VERSION}
 TERMUX_PKG_DEPENDS="bash"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes

packages/bash-completion/words-bad-array-subscript.patch

@@ -1,23 +0,0 @@
-From: Barry Warsaw <barry@python.org>
-Subject: Fix bash: words: bad array subscript
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741479
-Origin: vendor, https://bugs.launchpad.net/ubuntu/+source/bash-completion/+bug/1289597
-Forwarded: yes, <20140312212729.17788.38099.reportbug@samba4.Chuck.local>
-
----
- bash_completion |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- bash-completion.orig/bash_completion
-+++ bash-completion/bash_completion
-@@ -718,7 +718,7 @@ _init_completion()
-         fi
-     done
- 
--    [[ $cword -eq 0 ]] && return 1
-+    [[ $cword -le 0 ]] && return 1
-     prev=${words[cword-1]}
- 
-     [[ ${split-} ]] && _split_longopt && split=true
-

packages/bash/build.sh

@@ -4,13 +4,16 @@ TERMUX_PKG_DEPENDS="ncurses, readline, libandroid-support, termux-tools, command
 _MAIN_VERSION=4.3
 _PATCH_VERSION=42
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
-TERMUX_PKG_BUILD_REVISION=6
+TERMUX_PKG_BUILD_REVISION=7
 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+=" 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"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_unusable_rtsigs=no"
+# Use bash_cv_dev_fd=whacky to use /proc/self/fd instead of /dev/fd.
+# After making this change process substitution such as in 'cat <(ls)' works.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_dev_fd=whacky"
 
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"
 

packages/bison/build.sh

@@ -1,6 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/bison/
 TERMUX_PKG_DESCRIPTION="General-purpose parser generator"
 TERMUX_PKG_VERSION=3.0.4
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_HOSTBUILD=true
+
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="M4=m4"

packages/busybox/build.sh

@@ -2,7 +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.24.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 

packages/busybox/busybox.config

@@ -586,7 +586,7 @@ CONFIG_HD=y
 CONFIG_LSUSB=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
+CONFIG_MORE=y
 # CONFIG_MOUNT is not set
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set

packages/busybox/editors-diff.c.patch

@@ -0,0 +1,12 @@
+diff -u -r ../busybox-1.24.1/editors/diff.c ./editors/diff.c
+--- ../busybox-1.24.1/editors/diff.c	2015-10-11 09:31:50.000000000 -0400
++++ ./editors/diff.c	2016-02-08 05:23:45.890302334 -0500
+@@ -734,7 +734,7 @@
+ 		 * When we meet non-seekable file, we must make a temp copy.
+ 		 */
+ 		if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) {
+-			char name[] = "/tmp/difXXXXXX";
++			char name[] = "@TERMUX_PREFIX@/tmp/difXXXXXX";
+ 			int fd_tmp = xmkstemp(name);
+ 
+ 			unlink(name);

packages/busybox/include-platform.h.patch

@@ -0,0 +1,18 @@
+The r11 of NDK removed dprintf.
+
+diff -u -r ../busybox-1.24.1/include/platform.h ./include/platform.h
+--- ../busybox-1.24.1/include/platform.h	2015-07-13 04:18:47.000000000 +0200
++++ ./include/platform.h	2016-03-10 11:47:06.000000000 +0100
+@@ -480,11 +480,7 @@
+ #endif
+ 
+ #if defined(ANDROID) || defined(__ANDROID__)
+-# if __ANDROID_API__ < 8
+-#  undef HAVE_DPRINTF
+-# else
+-#  define dprintf fdprintf
+-# endif
++# undef HAVE_DPRINTF
+ # if __ANDROID_API__ < 21
+ #  undef HAVE_TTYNAME_R
+ #  undef HAVE_GETLINE

packages/busybox/include-platform.h.patch64

@@ -1,14 +0,0 @@
-fdprintf() does not exist in 64-bit bionic.
-
-diff -u -r ../busybox-1.24.1/include/platform.h ./include/platform.h
---- ../busybox-1.24.1/include/platform.h	2015-07-12 22:18:47.000000000 -0400
-+++ ./include/platform.h	2015-11-26 16:14:37.061610995 -0500
-@@ -480,7 +480,7 @@
- #endif
- 
- #if defined(ANDROID) || defined(__ANDROID__)
--# if __ANDROID_API__ < 8
-+# if __ANDROID_API__ < 8 || defined(__LP64__)
- #  undef HAVE_DPRINTF
- # else
- #  define dprintf fdprintf

packages/c-ares/build.sh

@@ -1,5 +1,4 @@
 TERMUX_PKG_HOMEPAGE=http://c-ares.haxx.se/
 TERMUX_PKG_DESCRIPTION="C library for asynchronous DNS requests (including name resolves)"
-TERMUX_PKG_VERSION=1.10.0
+TERMUX_PKG_VERSION=1.11.0
 TERMUX_PKG_SRCURL=http://c-ares.haxx.se/download/c-ares-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_BUILD_REVISION=1

packages/clang/Makefile.patch

@@ -0,0 +1,11 @@
+diff -u -r ../llvm-3.8.0.src/Makefile ./Makefile
+--- ../llvm-3.8.0.src/Makefile	2014-03-25 17:45:41.000000000 -0400
++++ ./Makefile	2016-03-10 16:28:00.142389801 -0500
+@@ -69,7 +69,6 @@
+ ifeq ($(MAKECMDGOALS),install-clang)
+   DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
+           tools/clang/tools/libclang \
+-          tools/clang/tools/c-index-test \
+           tools/clang/include/clang-c \
+           tools/clang/runtime tools/clang/docs \
+           tools/lto

packages/clang/build.sh

@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
-_PKG_MAJOR_VERSION=3.7
+_PKG_MAJOR_VERSION=3.8
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"
-TERMUX_PKG_DEPENDS="binutils, libgnustl, ncurses, ndk-sysroot"
+TERMUX_PKG_DEPENDS="binutils, libgnustl, ncurses, ndk-sysroot, libgcc"
 
 termux_step_post_extract_package () {
 	CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
@@ -32,8 +33,6 @@ termux_step_host_build () {
 }
 
 termux_step_configure () {
-	CXXFLAGS+=" -fno-devirtualize" # Avoid hitting https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61659
-
 	cd $TERMUX_PKG_BUILDDIR
         LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
         LLVM_TARGET_ARCH=$TERMUX_ARCH

packages/clang/dont-build-c-index-test.patch

@@ -1,11 +1,11 @@
 diff -u -r ../orig-src/tools/clang/tools/CMakeLists.txt ./tools/clang/tools/CMakeLists.txt
---- ../orig-src/tools/clang/tools/CMakeLists.txt       2014-03-06 11:07:50.000000000 +0100
+--- ../orig-src/tools/clang/tools/CMakeLists.txt	2016-01-12 21:03:50.000000000 -0500
-+++ ./tools/clang/tools/CMakeLists.txt 2014-03-06 11:06:10.000000000 +0100
++++ ./tools/clang/tools/CMakeLists.txt	2016-03-10 16:32:04.320055824 -0500
-@@ -3,7 +3,6 @@
+@@ -6,7 +6,6 @@
- add_subdirectory(clang-format)
+ add_clang_subdirectory(clang-format-vs)
- add_subdirectory(clang-format-vs)
+ add_clang_subdirectory(clang-fuzzer)
  
--add_subdirectory(c-index-test)
+-add_clang_subdirectory(c-index-test)
- add_subdirectory(libclang)
+ add_clang_subdirectory(libclang)
  
  if(CLANG_ENABLE_ARCMT)

packages/cmake/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
 _MAJOR_VERSION=3.4
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
 TERMUX_PKG_SRCURL=http://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, ncurses, jsoncpp"
 

packages/command-not-found/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com
 TERMUX_PKG_DESCRIPTION="Suggest installation of packages in interactive shell sessions"
-TERMUX_PKG_VERSION=1.3
+TERMUX_PKG_VERSION=1.5
 
 termux_step_make_install () {
 	TERMUX_LIBEXEC_DIR=$TERMUX_PREFIX/libexec/termux

packages/command-not-found/commands.h

@@ -1,6 +1,8 @@
 char const* const commands[] = {
 "aapt",
 " aapt",
+"abduco",
+" abduco",
 "angband",
 " angband",
 "apt",
@@ -74,7 +76,7 @@ char const* const commands[] = {
 "clang",
 " clang",
 " clang++",
-" clang-3.7",
+" clang-3.8",
 " clang-check",
 " clang-cl",
 " clang-format",
@@ -92,6 +94,7 @@ char const* const commands[] = {
 " llvm-dis",
 " llvm-dsymutil",
 " llvm-dwarfdump",
+" llvm-dwp",
 " llvm-extract",
 " llvm-lib",
 " llvm-link",
@@ -106,10 +109,14 @@ char const* const commands[] = {
 " llvm-readobj",
 " llvm-rtdyld",
 " llvm-size",
+" llvm-split",
 " llvm-stress",
 " llvm-symbolizer",
 " obj2yaml",
 " opt",
+" sancov",
+" scan-build",
+" scan-view",
 " verify-uselistorder",
 " yaml2obj",
 "cmake",
@@ -130,7 +137,6 @@ char const* const commands[] = {
 " chgrp",
 " chmod",
 " chown",
-" chroot",
 " cksum",
 " comm",
 " coreutils",
@@ -225,6 +231,9 @@ char const* const commands[] = {
 " corkscrew",
 "cppi",
 " cppi",
+"ctags",
+" ctags",
+" readtags",
 "curl",
 " curl",
 "curseofwar",
@@ -271,8 +280,12 @@ char const* const commands[] = {
 " dropbearconvert",
 " dropbearkey",
 " dropbearmulti",
+"dvtm",
+" dvtm",
+" dvtm-status",
+"elinks",
+" elinks",
 "emacs",
-" ctags",
 " ebrowse",
 " emacs",
 " emacsclient",
@@ -324,15 +337,14 @@ char const* const commands[] = {
 " fzf",
 " fzf-tmux",
 "g++",
+" arm-linux-androideabi-g++",
 " g++",
 "gawk",
 " awk",
 " gawk",
 "gcc",
-" arm-linux-androideabi-c++",
-" arm-linux-androideabi-g++",
 " arm-linux-androideabi-gcc",
-" arm-linux-androideabi-gcc-4.9.3",
+" arm-linux-androideabi-gcc-5.3.0",
 " arm-linux-androideabi-gcc-ar",
 " arm-linux-androideabi-gcc-nm",
 " arm-linux-androideabi-gcc-ranlib",
@@ -340,6 +352,7 @@ char const* const commands[] = {
 " gcc",
 "gcov",
 " gcov",
+" gcov-tool",
 "gdb",
 " gcore",
 " gdb",
@@ -397,7 +410,6 @@ char const* const commands[] = {
 " gpg-connect-agent",
 " gpg2",
 " gpgconf",
-" gpgkey2ssh",
 " gpgparsemail",
 " gpgsm",
 " gpgtar",
@@ -627,6 +639,8 @@ char const* const commands[] = {
 " lynx",
 "m4",
 " m4",
+"macchanger",
+" macchanger",
 "make",
 " make",
 "man",
@@ -669,6 +683,10 @@ char const* const commands[] = {
 " tset",
 "neovim",
 " nvim",
+"netcat",
+" nc",
+" ncat",
+" netcat",
 "netpbm",
 " 411toppm",
 " anytopnm",
@@ -1037,7 +1055,6 @@ char const* const commands[] = {
 " pkcs1-conv",
 " sexp-conv",
 "nmap",
-" ncat",
 " nmap",
 " nping",
 "nodejs",
@@ -1071,11 +1088,6 @@ char const* const commands[] = {
 " 7zr",
 "pango",
 " pango-view",
-"parallel",
-" niceload",
-" parallel",
-" sem",
-" sql",
 "patch",
 " patch",
 "pathpicker",
@@ -1115,9 +1127,6 @@ char const* const commands[] = {
 " xsubpp",
 " zipdetails",
 "php",
-" pear",
-" peardev",
-" pecl",
 " phar",
 " phar.phar",
 " php",
@@ -1164,6 +1173,9 @@ char const* const commands[] = {
 " vmstat",
 " w",
 " watch",
+"proot",
+" proot",
+" termux-chroot",
 "protobuf",
 " protoc",
 "psmisc",
@@ -1266,6 +1278,7 @@ char const* const commands[] = {
 "taskwarrior",
 " task",
 "tcl",
+" sqlite3_analyzer",
 " tclsh",
 " tclsh8.6",
 "tcpdump",
@@ -1291,8 +1304,13 @@ char const* const commands[] = {
 "termux-tools",
 " am",
 " chsh",
+" dalvikvm",
 " df",
+" getprop",
+" logcat",
+" ping",
 " pm",
+" su",
 " termux-elf-cleaner",
 " termux-fix-shebang",
 " termux-open-url",
@@ -1303,6 +1321,8 @@ char const* const commands[] = {
 " teseq",
 "tig",
 " tig",
+"tinyscheme",
+" tinyscheme",
 "tmux",
 " tmux",
 "toilet",
@@ -1311,12 +1331,13 @@ char const* const commands[] = {
 " tracepath",
 " tracepath6",
 "transmission",
-" transmission-cli",
 " transmission-create",
 " transmission-daemon",
 " transmission-edit",
 " transmission-remote",
 " transmission-show",
+"tree",
+" tree",
 "ttyrec",
 " ttyplay",
 " ttyrec",
@@ -1324,8 +1345,6 @@ char const* const commands[] = {
 "units",
 " units",
 " units_cur",
-"unnethack",
-" unnethack",
 "unrar",
 " unrar",
 "unzip",
@@ -1364,6 +1383,10 @@ char const* const commands[] = {
 " weechat",
 "wget",
 " wget",
+"wol",
+" wol",
+" wol-bootptab",
+" wol-dhcpdconf",
 "x264",
 " x264",
 "xmlstarlet",
@@ -1418,6 +1441,13 @@ char const* const commands[] = {
 " ecj",
 "jack",
 " jack",
+"parallel",
+" niceload",
+" parallel",
+" sem",
+" sql",
+"pass",
+" pass",
 "ranger",
 " ranger",
 " rifle",

packages/coreutils/build.sh

@@ -1,12 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/coreutils/
 TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
 TERMUX_PKG_VERSION=8.25
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_mkfifo=yes gl_cv_host_operating_system=Android --without-gmp --enable-single-binary=symlinks ac_cv_func_endpwent=no"
 # pinky has no usage on Android.
 # realpath has permission denied problem with relative paths, let busybox version prevail.
 # df does not work either, let system binary prevail.
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="  --enable-no-install-program=pinky,realpath,df"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="  --enable-no-install-program=pinky,realpath,df,chroot"
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="$TERMUX_PKG_EXTRA_CONFIGURE_ARGS"
 TERMUX_PKG_BUILD_IN_SRC=yes
 # Host build for man pages generated by help2man, see makefile.patch:

packages/ctags/build.sh

@@ -0,0 +1,14 @@
+TERMUX_PKG_HOMEPAGE=https://ctags.io/
+TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"
+TERMUX_PKG_VERSION=0.0.20160317
+_COMMIT=6126cb13375fd659e53e7cd9a943446f72048c07
+TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
+TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
+TERMUX_PKG_BUILD_IN_SRC="yes"
+
+termux_step_post_extract_package () {
+	export regcomp_works=yes
+	cd $TERMUX_PKG_SRCDIR
+	./autogen.sh
+}

packages/dialog/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_DESCRIPTION="Application used in shell scripts which displays text user interface widgets"
 TERMUX_PKG_HOMEPAGE=http://invisible-island.net/dialog/
 TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_VERSION="1.3-20160126"
+TERMUX_PKG_VERSION="1.3-20160209"
 TERMUX_PKG_SRCURL=http://invisible-island.net/datafiles/release/dialog.tar.gz
 # This will break when a new version is released (the URL unfortunately does not change)
 TERMUX_PKG_FOLDERNAME="dialog-$TERMUX_PKG_VERSION"

packages/dnsutils/build.sh

@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/
 TERMUX_PKG_DESCRIPTION="Clients provided with BIND"
 # NOTE: When changing this version, you also needo to change TERMUX_PKG_SRCURL
 # and TERMUX_PKG_FOLDERNAME.
-TERMUX_PKG_VERSION=9.10.3.3
+_PATCHLEVEL=4
-# TERMUX_PKG_SRCURL="https://www.isc.org/downloads/file/bind-9-10-3-p2/?version=tar-gz"
+TERMUX_PKG_VERSION=9.10.3.$_PATCHLEVEL
-TERMUX_PKG_SRCURL="https://ftp.isc.org/isc/bind/cur/9.10/bind-9.10.3-P3.tar.gz"
+TERMUX_PKG_SRCURL="https://ftp.isc.org/isc/bind/cur/9.10/bind-9.10.3-P${_PATCHLEVEL}.tar.gz"
-TERMUX_PKG_FOLDERNAME="bind-9.10.3-P3"
+TERMUX_PKG_FOLDERNAME="bind-9.10.3-P${_PATCHLEVEL}"
 TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-gssapi=no --with-randomdev=/dev/random -with-ecdsa=no --with-gost=no --with-libxml2=no --with-libtool"
 

packages/dpkg/build.sh

@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/dpkg
 TERMUX_PKG_DESCRIPTION="Debian package management system"
 TERMUX_PKG_VERSION=1.18.4
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-dselect --disable-shared --disable-start-stop-daemon --disable-largefile --disable-update-alternatives --host=${TERMUX_ARCH}-linux --without-selinux dpkg_cv_c99_snprintf=yes ac_cv_lib_selinux_setexecfilecon=no HAVE_SETEXECFILECON_FALSE=#"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-bz2"

packages/dpkg/lib-dpkg-atomic-file.c.patch

@@ -1,15 +1,18 @@
 diff -u -r ../dpkg-1.18.2/lib/dpkg/atomic-file.c ./lib/dpkg/atomic-file.c
 --- ../dpkg-1.18.2/lib/dpkg/atomic-file.c	2015-07-12 22:38:47.000000000 -0400
 +++ ./lib/dpkg/atomic-file.c	2015-08-25 18:06:51.689715379 -0400
-@@ -90,8 +90,11 @@
+@@ -90,8 +90,14 @@
  
  	if (unlink(name_old) && errno != ENOENT)
  		ohshite(_("error removing old backup file '%s'"), name_old);
 -	if (link(file->name, name_old) && errno != ENOENT)
 -		ohshite(_("error creating new backup file '%s'"), name_old);
++#ifdef __ANDROID__
++	/* Termux: Use rename(2) since Android does not support hardlinks. */
++	if (rename(file->name, name_old) && errno != ENOENT) {
++#else
 +	if (link(file->name, name_old) && errno != ENOENT) {
-+		/* Termux modification: Try with rename(2) for systems not supporting hardlinks. */
++#endif
-+		if (rename(file->name, name_old))
 +		ohshite(_("error creating new backup file '%s'"), name_old);
 +	}
  

packages/dpkg/lib-dpkg-dpkg.h.patch

@@ -0,0 +1,12 @@
+diff -u -r ../dpkg-1.18.4/lib/dpkg/dpkg.h ./lib/dpkg/dpkg.h
+--- ../dpkg-1.18.4/lib/dpkg/dpkg.h	2015-12-12 15:49:24.000000000 -0500
++++ ./lib/dpkg/dpkg.h	2016-03-03 17:30:57.812372682 -0500
+@@ -92,7 +92,7 @@
+ #define MAXUPDATES         250
+ 
+ #define DEFAULTSHELL        "sh"
+-#define DEFAULTPAGER        "pager"
++#define DEFAULTPAGER        "less"
+ 
+ #define MD5HASHLEN           32
+ #define MAXTRIGDIRECTIVE     256

packages/dpkg/src-configure.c.patch

@@ -0,0 +1,16 @@
+diff -u -r ../dpkg-1.18.4/src/configure.c ./src/configure.c
+--- ../dpkg-1.18.4/src/configure.c	2015-11-26 18:53:41.000000000 -0500
++++ ./src/configure.c	2016-03-03 17:41:42.494272593 -0500
+@@ -496,8 +496,10 @@
+ 			        pkg_name(pkg, pnaw_nonambig), cdr2.buf,
+ 			        strerror(errno));
+ 		if (!(what & CFOF_USER_DEL))
+-			if (link(cdr.buf, cdr2.buf))
+-				warning(_("%s: failed to link '%.250s' to '%.250s': %s"),
++			/** Termux modification: Use rename(2) instead of link(2), to avoid hard
++			    links which does not work on Android 6.0 or later. */
++			if (rename(cdr.buf, cdr2.buf))
++				warning(_("%s: failed to rename '%.250s' to '%.250s': %s"),
+ 				        pkg_name(pkg, pnaw_nonambig), cdr.buf,
+ 				        cdr2.buf, strerror(errno));
+ 		/* Fall through. */

packages/emacs/Makefile.in.patch

@@ -1,12 +0,0 @@
-diff -u -r ../emacs-24.5/Makefile.in ./Makefile.in
---- ../emacs-24.5/Makefile.in	2015-04-02 03:23:06.000000000 -0400
-+++ ./Makefile.in	2015-08-03 19:41:45.006522243 -0400
-@@ -307,7 +307,7 @@
- 	  sed < ${srcdir}/src/epaths.in > epaths.h.$$$$		\
- 	  -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \
- 	  -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \
--	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \
-+	  -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \
- 	  -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'		\
- 	  -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'			\
- 	  -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'			\

packages/emacs/build.sh

@@ -1,49 +1,35 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
-TERMUX_PKG_VERSION=24.5
+TERMUX_PKG_VERSION=25.0.92
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SRCURL=http://ftp.gnu.org/pub/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --without-all"
+# Ensure use of system malloc:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
+# Prevent configure from adding -nopie:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_prog_cc_nopie=no"
 TERMUX_PKG_HOSTBUILD="yes"
 
-# Note that we remove leim:
+# Remove some irrelevant files:
-TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.* share/emacs/${TERMUX_PKG_VERSION}/leim"
+TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.*"
 
-# http://www.gnu.org/software/emacs/manual/html_node/elisp/Building-Emacs.html#Building-Emacs
+# Remove ctags from the emacs package to prevent conflicting with
-# "Compilation of the C source files in the src directory produces an executable file called temacs, also called a
+# the Universal Ctags from the 'ctags' package (the bin/etags
-# bare impure Emacs. It contains the Emacs Lisp interpreter and I/O routines, but not the editing commands.
+# program still remain in the emacs package):
-# The command temacs -l loadup would run temacs and direct it to load loadup.el. The loadup library loads additional Lisp libraries,
+TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1"
-# which set up the normal Emacs editing environment. After this step, the Emacs executable is no longer bare.
-# Because it takes some time to load the standard Lisp files, the temacs executable usually isn't run directly by users. Instead, as
-# one of the last steps of building Emacs, the command 'temacs -batch -l loadup dump' is run. The special 'dump' argument causes temacs
-# to dump out an executable program, called emacs, which has all the standard Lisp files preloaded. (The '-batch' argument prevents
-# temacs from trying to initialize any of its data on the terminal, so that the tables of terminal information are empty in the dumped Emacs.)"
 
-########## FROM src/Makefile:
+termux_step_post_extract_package () {
-## The dumped Emacs is as functional and more efficient than
+	# XXX: We have to start with new host build each time
-## bootstrap-emacs, so we replace the latter with the former.
+	#      to avoid build error when cross compiling.
-## Strictly speaking, emacs does not depend directly on all of $lisp,
+	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
-## since not all pieces are used on all platforms.  But DOC depends
+}
-## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
-# emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
-# if test "$(CANNOT_DUMP)" = "yes"; then \
-# 	rm -f emacs$(EXEEXT); \
-# 	ln temacs$(EXEEXT) emacs$(EXEEXT); \
-# else \
-#	LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
-# 	test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
-#	rm -f bootstrap-emacs$(EXEEXT); \
-# 	ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
-# fi
- 
-# so emacs => temacs, and then it tries to execute emacs, leading to error
-
-# We can build without dump, but a bootstrap-emacs is still needed to produce bytecode-compiled (platform-independent) emacs lisp .elc files.
 
 termux_step_host_build () {
-	$TERMUX_PKG_SRCDIR/configure $TERMUX_PKG_EXTRA_CONFIGURE_ARGS
+	# Build a bootstrap-emacs binary to be used in termux_step_post_configure.
+	$TERMUX_PKG_SRCDIR/configure --prefix=$TERMUX_PREFIX --without-x --with-xpm=no --with-jpeg=no \
+	                             --with-png=no --with-tiff=no --without-gconf --without-gsettings --without-all
 	make
+	export CANNOT_DUMP=yes
 }
 
 termux_step_post_configure () {
@@ -54,10 +40,5 @@ termux_step_post_configure () {
 }
 
 termux_step_post_make_install () {
-	rm $TERMUX_PREFIX/bin/emacs $TERMUX_PREFIX/bin/emacs-$TERMUX_PKG_VERSION
+	cp $TERMUX_PKG_BUILDER_DIR/site-init.el $TERMUX_PREFIX/share/emacs/${TERMUX_PKG_VERSION}/lisp/emacs-lisp/
-	echo "#!/$TERMUX_PREFIX/bin/sh" > $TERMUX_PREFIX/bin/emacs
-	echo "exec temacs -l loadup \$@" >> $TERMUX_PREFIX/bin/emacs
-	chmod +x $TERMUX_PREFIX/bin/emacs
-	cp $TERMUX_PKG_BUILDDIR/src/temacs $TERMUX_PREFIX/bin/temacs
 }
-

packages/emacs/lib-src-Makefile.in.patch

@@ -1,27 +0,0 @@
-diff -u -r ../emacs-24.4/lib-src/Makefile.in ./lib-src/Makefile.in
---- ../emacs-24.4/lib-src/Makefile.in	2014-04-29 16:52:57.000000000 +0200
-+++ ./lib-src/Makefile.in	2014-11-01 12:29:44.881760880 +0100
-@@ -128,7 +128,7 @@
- UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \
-             update-game-score${EXEEXT}
- 
--DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
-+DONT_INSTALL= make-docfile${EXEEXT}
- 
- # Like UTILITIES, but they're not system-dependent, and should not be
- #  deleted by the distclean target.
-@@ -303,14 +303,6 @@
- TAGS: etags${EXEEXT}
- 	etags *.[ch]
- 
--## This verifies that the non-ASCII characters in the file \`testfile\'
--## have not been clobbered by whatever means were used to copy and
--## distribute Emacs.  If they were clobbered, all the .elc files were
--## clobbered too.
--test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
--	$(CC) ${ALL_CFLAGS} -o test-distrib${EXEEXT} ${srcdir}/test-distrib.c
--	./test-distrib ${srcdir}/testfile
--
- ../lib/libgnu.a: $(config_h)
- 	cd ../lib && $(MAKE) libgnu.a
- 

packages/emacs/lisp-loadup.el.patch.beforehostbuild

@@ -0,0 +1,32 @@
+diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
+--- ../emacs-25.0.92/lisp/loadup.el	2016-03-02 05:21:42.000000000 -0500
++++ ./lisp/loadup.el	2016-03-25 21:40:48.314906360 -0400
+@@ -1,3 +1,7 @@
++;; Termux patch: See
++;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
++(setq-default bidi-display-reordering nil)
++
+ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
+ 
+ ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2016 Free Software
+@@ -110,6 +114,12 @@
+ (load "format")
+ (load "bindings")
+ (load "window")  ; Needed here for `replace-buffer-in-windows'.
++;; Termux patch: See
++;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00679.html
++;; We are now capable of resizing the mini-windows, so give the
++;; variable its advertised default value (it starts as nil, see
++;; xdisp.c).
++(setq resize-mini-windows 'grow-only)
+ (setq load-source-file-function 'load-with-code-conversion)
+ (load "files")
+ 
+@@ -465,3 +475,7 @@
+ ;; End:
+ 
+ ;;; loadup.el ends here
++
++;; Termux patch: See
++;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
++(setq-default bidi-display-reordering t)

packages/emacs/lisp-subr.el.patch.beforehostbuild

@@ -0,0 +1,21 @@
+diff -u -r ../emacs-25.0.92/lisp/subr.el ./lisp/subr.el
+--- ../emacs-25.0.92/lisp/subr.el	2016-03-02 05:21:42.000000000 -0500
++++ ./lisp/subr.el	2016-03-25 22:03:57.240066240 -0400
+@@ -2975,7 +2975,7 @@
+   (declare (advertised-calling-convention (name buffer command) "23.1"))
+   (start-file-process
+    name buffer
+-   (if (file-remote-p default-directory) "/bin/sh" shell-file-name)
++   (if (file-remote-p default-directory) "@TERMUX_PREFIX@/bin/sh" shell-file-name)
+    (if (file-remote-p default-directory) "-c" shell-command-switch)
+    (mapconcat 'identity args " ")))
+ 
+@@ -3019,7 +3019,7 @@
+   (declare (advertised-calling-convention
+             (command &optional infile buffer display) "24.5"))
+   (process-file
+-   (if (file-remote-p default-directory) "/bin/sh" shell-file-name)
++   (if (file-remote-p default-directory) "@TERMUX_PREFIX@/bin/sh" shell-file-name)
+    infile buffer display
+    (if (file-remote-p default-directory) "-c" shell-command-switch)
+    (mapconcat 'identity (cons command args) " ")))

packages/emacs/lisp-term.el.patch.beforehostbuild

@@ -0,0 +1,30 @@
+diff -u -r ../emacs-25.0.92/lisp/term.el ./lisp/term.el
+--- ../emacs-25.0.92/lisp/term.el	2016-03-02 05:21:42.000000000 -0500
++++ ./lisp/term.el	2016-03-25 22:01:42.366218150 -0400
+@@ -1346,7 +1346,7 @@
+ 					   (or explicit-shell-file-name
+ 					       (getenv "ESHELL")
+ 					       (getenv "SHELL")
+-					       "/bin/sh"))))
++					       "@TERMUX_PREFIX@/bin/sh"))))
+   (set-buffer (make-term "terminal" program))
+   (term-mode)
+   (term-char-mode)
+@@ -1466,7 +1466,7 @@
+ 	;; do the decoding by hand on the parts that are made of chars.
+ 	(coding-system-for-read 'binary))
+     (apply 'start-process name buffer
+-	   "/bin/sh" "-c"
++	   "@TERMUX_PREFIX@/bin/sh" "-c"
+ 	   (format "stty -nl echo rows %d columns %d sane 2>/dev/null;\
+ if [ $1 = .. ]; then shift; fi; exec \"$@\""
+ 		   term-height term-width)
+@@ -4108,7 +4108,7 @@
+ 					   (or explicit-shell-file-name
+ 					       (getenv "ESHELL")
+ 					       (getenv "SHELL")
+-					       "/bin/sh"))))
++					       "@TERMUX_PREFIX@/bin/sh"))))
+ 
+   ;; Pick the name of the new buffer.
+   (setq term-ansi-buffer-name

packages/emacs/site-init.el

@@ -0,0 +1,2 @@
+; Enable terminal mouse events:
+(xterm-mouse-mode 1)

packages/emacs/src-Makefile.in.patch

@@ -1,15 +0,0 @@
-diff -u -r ../emacs-24.5/src/Makefile.in ./src/Makefile.in
---- ../emacs-24.5/src/Makefile.in	2015-04-02 03:23:06.000000000 -0400
-+++ ./src/Makefile.in	2015-08-03 19:25:48.870287123 -0400
-@@ -434,10 +434,7 @@
- 	  rm -f emacs$(EXEEXT); \
- 	  ln temacs$(EXEEXT) emacs$(EXEEXT); \
- 	else \
--	  LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
--	  test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
--	  rm -f bootstrap-emacs$(EXEEXT); \
--	  ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
-+	  cp temacs emacs; \
- 	fi
- 
- ## We run make-docfile twice because the command line may get too long

packages/emacs/src-callproc.c.patch

@@ -0,0 +1,12 @@
+diff -u -r ../emacs-25.0.92/src/callproc.c ./src/callproc.c
+--- ../emacs-25.0.92/src/callproc.c	2016-03-02 05:21:43.000000000 -0500
++++ ./src/callproc.c	2016-03-25 22:02:38.977310920 -0400
+@@ -1619,7 +1619,7 @@
+     dir_warning ("arch-independent data dir", Vdata_directory);
+ 
+   sh = getenv ("SHELL");
+-  Vshell_file_name = build_string (sh ? sh : "/bin/sh");
++  Vshell_file_name = build_string (sh ? sh : "@TERMUX_PREFIX@/bin/sh");
+ 
+ #ifdef DOS_NT
+   Vshared_game_score_directory = Qnil;

packages/emacs/src-xdisp.c.patch

@@ -0,0 +1,21 @@
+See https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00679.html
+
+The other part of that patch is in lisp-loadup.el.patch
+
+diff -u -r ../emacs-25.0.92/src/xdisp.c ./src/xdisp.c
+--- ../emacs-25.0.92/src/xdisp.c	2016-03-02 05:21:43.000000000 -0500
++++ ./src/xdisp.c	2016-03-25 21:25:36.960819633 -0400
+@@ -31598,7 +31598,12 @@
+ A value of `grow-only', the default, means let mini-windows grow only;
+ they return to their normal size when the minibuffer is closed, or the
+ echo area becomes empty.  */);
+-  Vresize_mini_windows = Qgrow_only;
++  /* Contrary to the doc string, we initialize this to nil, so that
++     loading loadup.el won't try to resize windows before loading
++     window.el, where some functions we need to call for this live.
++     We assign the 'grow-only' value right after loading window.el
++     during loadup.  */
++  Vresize_mini_windows = Qnil;
+ 
+   DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
+     doc: /* Alist specifying how to blink the cursor off.

packages/emacs/unexelf.c.patch

@@ -1,12 +0,0 @@
-diff -u -r ../emacs-24.4/src/unexelf.c ./src/unexelf.c
---- ../emacs-24.4/src/unexelf.c	2014-03-21 01:34:40.000000000 -0400
-+++ ./src/unexelf.c	2015-01-01 15:26:13.000318635 -0500
-@@ -1323,7 +1323,7 @@
-   if (stat (new_name, &stat_buf) != 0)
-     fatal ("Can't stat (%s): %s", new_name, strerror (errno));
- 
--  mask = umask (777);
-+  mask = umask (0777);
-   umask (mask);
-   stat_buf.st_mode |= 0111 & ~mask;
-   if (chmod (new_name, stat_buf.st_mode) != 0)

packages/ffmpeg/build.sh

@@ -1,32 +1,44 @@
 TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
-TERMUX_PKG_VERSION=2.8.5
+TERMUX_PKG_VERSION=3.0
-TERMUX_PKG_SRCURL=https://github.com/FFmpeg/FFmpeg/archive/n${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_FOLDERNAME=FFmpeg-n$TERMUX_PKG_VERSION
+TERMUX_PKG_SRCURL=https://github.com/FFmpeg/FFmpeg/releases/download/n${TERMUX_PKG_VERSION}/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, liblzma"
+TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, libmp3lame, liblzma"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"
 
 termux_step_configure () {
 	cd $TERMUX_PKG_BUILDDIR
+
+	local _EXTRA_CONFIGURE_FLAGS=""
 	if [ $TERMUX_ARCH = "arm" ]; then
 		_ARCH="armeabi-v7a"
+		_EXTRA_CONFIGURE_FLAGS="--enable-neon"
 	elif [ $TERMUX_ARCH = "i686" ]; then
 		_ARCH="x86"
-	else
+		# Specify --disable-asm to prevent text relocations on i686,
+		# see https://trac.ffmpeg.org/ticket/4928
+		_EXTRA_CONFIGURE_FLAGS="--disable-asm"
+	elif [ $TERMUX_ARCH = "aarch64" ]; then
 		_ARCH=$TERMUX_ARCH
+		_EXTRA_CONFIGURE_FLAGS="--enable-neon"
+	else
+		echo "Unsupported arch $TERMUX_ARCH"
+		exit 1
 	fi
-        # --disable-asm to prevent text relocations
+
 	$TERMUX_PKG_SRCDIR/configure \
 		--arch=${_ARCH} \
 		--cross-prefix=${TERMUX_HOST_PLATFORM}- \
-                --disable-asm \
+		--disable-avdevice \
 		--disable-ffserver \
 		--disable-static \
                 --disable-symver \
 		--enable-cross-compile \
 		--enable-gpl \
+		--enable-libmp3lame \
 		--enable-libfaac \
 		--enable-libvorbis \
 		--enable-libx264 \
@@ -35,6 +47,7 @@ termux_step_configure () {
 		--enable-openssl \
 		--enable-shared \
 		--prefix=$TERMUX_PREFIX \
-		--target-os=linux
+		--target-os=linux \
+		$_EXTRA_CONFIGURE_FLAGS
 }
 

packages/ffmpeg/configure.patch

@@ -0,0 +1,19 @@
+Avoid issue with strtod on arm:
+	https://github.com/termux/termux-packages/issues/179
+
+diff -u -r ../ffmpeg-3.0/configure ./configure
+--- ../ffmpeg-3.0/configure	2016-02-14 21:29:37.000000000 -0500
++++ ./configure	2016-03-24 20:44:33.472274113 -0400
+@@ -4814,12 +4814,6 @@
+ probe_libc host_
+ test -n "$host_libc_type" && enable host_libc_$host_libc_type
+ 
+-case $libc_type in
+-    bionic)
+-        add_compat strtod.o strtod=avpriv_strtod
+-        ;;
+-esac
+-
+ # hacks for compiler/libc/os combinations
+ 
+ if enabled_all tms470 libc_glibc; then

packages/fish/build.sh

@@ -1,12 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://fishshell.com/
 TERMUX_PKG_DESCRIPTION="Shell geared towards interactive use"
-TERMUX_PKG_VERSION=2.2.`date "+%Y%m%d%H%M"`
+_COMMIT=b1b2698a843b52ea18ae0f8fc1e5a2b6e003f409
-# TERMUX_PKG_SRCURL=http://fishshell.com/files/${TERMUX_PKG_VERSION}/fish-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION=2.2.201603181154
-TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/master.zip
+TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/archive/${_COMMIT}.zip
-TERMUX_PKG_NO_SRC_CACHE=yes
 TERMUX_PKG_DEPENDS="ncurses, libgnustl, libandroid-support"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_FOLDERNAME=fish-shell-master
+TERMUX_PKG_FOLDERNAME=fish-shell-$_COMMIT
 
 termux_step_pre_configure () {
 	cd $TERMUX_PKG_SRCDIR

packages/fish/env_universal_common.cpp.patch

@@ -1,7 +1,16 @@
-diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
+diff -u -r ../fish-shell-master/src/env_universal_common.cpp ./src/env_universal_common.cpp
---- ../fish-2.2.0/env_universal_common.cpp	2015-07-03 15:46:59.000000000 -0400
+--- ../fish-shell-master/src/env_universal_common.cpp	2016-03-09 07:07:04.000000000 -0500
-+++ ./src/env_universal_common.cpp	2015-07-13 02:16:14.591286575 -0400
++++ ./src/env_universal_common.cpp	2016-03-12 15:47:14.502255105 -0500
-@@ -1089,6 +1089,7 @@
+@@ -166,7 +166,7 @@
+         }
+ 
+         // /tmp/fish.user
+-        std::string tmpdir = "/tmp/fish.";
++        std::string tmpdir = "@TERMUX_PREFIX@/tmp/fish.";
+         tmpdir.append(uname);
+         if (check_runtime_path(tmpdir.c_str()) != 0)
+         {
+@@ -1142,6 +1142,7 @@
      return result;
  }
  
@@ -9,7 +18,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
  class universal_notifier_shmem_poller_t : public universal_notifier_t
  {
      /* This is what our shared memory looks like. Everything here is stored in network byte order (big-endian) */
-@@ -1251,6 +1252,7 @@
+@@ -1304,6 +1305,7 @@
          }
      }
  };
@@ -17,7 +26,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
  
  /* A notifyd-based notifier. Very straightforward. */
  class universal_notifier_notifyd_t : public universal_notifier_t
-@@ -1572,7 +1574,9 @@
+@@ -1625,7 +1627,9 @@
      } options[] =
      {
          {"default", universal_notifier_t::strategy_default},
@@ -27,7 +36,7 @@ diff -u -r ../fish-2.2.0/env_universal_common.cpp ./env_universal_common.cpp
          {"pipe", universal_notifier_t::strategy_named_pipe},
          {"notifyd", universal_notifier_t::strategy_notifyd}
      };
-@@ -1632,8 +1636,10 @@
+@@ -1687,8 +1691,10 @@
      }
      switch (strat)
      {

packages/fish/share-functions-fish_prompt.fish.patch

@@ -0,0 +1,15 @@
+Avoid calling 'hostname' which may not exist (and will probably
+return "localhost" anyway").
+
+diff -u -r ../fish-shell-master/share/functions/fish_prompt.fish ./share/functions/fish_prompt.fish
+--- ../fish-shell-master/share/functions/fish_prompt.fish	2016-03-12 15:26:01.000000000 -0500
++++ ./share/functions/fish_prompt.fish	2016-03-13 17:49:30.550445275 -0400
+@@ -5,7 +5,7 @@
+ function fish_prompt --description "Write out the prompt"
+ 	# Just calculate this once, to save a few cycles when displaying the prompt
+ 	if not set -q __fish_prompt_hostname
+-		set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
++		set -g __fish_prompt_hostname "localhost"
+ 	end
+ 
+ 	set -l color_cwd

packages/fish/share-functions-help.fish.patch

@@ -0,0 +1,12 @@
+diff -u -r ../fish-shell-master/share/functions/help.fish ./share/functions/help.fish
+--- ../fish-shell-master/share/functions/help.fish	2016-03-12 15:26:01.000000000 -0500
++++ ./share/functions/help.fish	2016-03-14 12:08:13.804718800 -0400
+@@ -125,7 +125,7 @@
+ 		end
+ 	else
+ 		# Go to the web. Only include one dot in the version string
+-		set -l version_string (echo $FISH_VERSION| cut -d . -f 1,2)
++		set -l version_string current # Termux: We're building from git master for now.
+ 		set page_url http://fishshell.com/docs/$version_string/$fish_help_page
+ 	end
+ 	

packages/freetype/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.freetype.org/
 TERMUX_PKG_DESCRIPTION="Software font engine capable of producing high-quality output"
-TERMUX_PKG_VERSION=2.6.2
+TERMUX_PKG_VERSION=2.6.3
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/freetype/freetype2/${TERMUX_PKG_VERSION}/freetype-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libbz2, libpng"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/freetype-config share/man/man1/freetype-config.1"

packages/fzf/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
 TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
-TERMUX_PKG_VERSION=0.11.2
+TERMUX_PKG_VERSION=0.11.4
 TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC="yes"
@@ -45,7 +45,7 @@ termux_step_make_install () {
 	cp $TERMUX_PKG_SRCDIR/plugin/fzf.vim $TERMUX_PREFIX/share/nvim/runtime/plugin/
 }
 
-termux_step_post_make_install () {
+termux_step_post_massage () {
 	# Remove so that the vim build doesn't add it to vim-runtime:
 	rm $TERMUX_PREFIX/share/vim/vim74/plugin/fzf.vim
 }

packages/gcc/build.sh

@@ -1,21 +1,27 @@
 TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/
 TERMUX_PKG_DESCRIPTION="GNU C compiler"
-TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot"
+TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot, libgcc, libisl"
-TERMUX_PKG_VERSION=4.9.3
+TERMUX_PKG_VERSION=5.3.0
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-languages=c,c++ --with-system-zlib --disable-multilib --disable-lto"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=$TERMUX_HOST_PLATFORM"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-gmp=$TERMUX_PREFIX --with-mpfr=$TERMUX_PREFIX --with-mpc=$TERMUX_PREFIX"
 # To build gcc as a PIE binary:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-stage1-ldflags=\"-specs=$TERMUX_SCRIPTDIR/termux.spec\""
+# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-isl-include=$TERMUX_PREFIX/include --with-isl-lib=$TERMUX_PREFIX/lib"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-isl-version-check"
+
+# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-headers --with-local-prefix=$TERMUX_PREFIX/include" # FIXME: gcc5 trying
 if [ "$TERMUX_ARCH" = "arm" ]; then
         TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv7-a --with-fpu=neon --with-float=hard"
+elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=armv8-a"
 elif [ "$TERMUX_ARCH" = "i686" ]; then
         # -mstackrealign -msse3 -m32
         TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=i686 --with-tune=atom --with-fpmath=sse"
 fi
-TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
+TERMUX_PKG_RM_AFTER_INSTALL="bin/gcc-ar bin/gcc-ranlib bin/*c++ bin/gcc-nm lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/include-fixed lib/gcc/*-linux-*/$TERMUX_PKG_VERSION/install-tools libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/install-tools share/man/man7"
-TERMUX_PKG_RM_AFTER_INSTALL="bin/gcc-ar bin/gcc-ranlib bin/c++ bin/gcc-nm lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/include-fixed lib/gcc/*-linux-*/$TERMUX_PKG_VERSION/install-tools libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/install-tools share/man/man7"
 
 export AR_FOR_TARGET="$AR"
 export AS_FOR_TARGET="$AS"
@@ -45,21 +51,13 @@ unset RANLIB
 
 termux_step_make () {
 	make -j $TERMUX_MAKE_PROCESSES all-gcc
-	make -j $TERMUX_MAKE_PROCESSES all-target-libgcc
 }
 
 termux_step_make_install () {
 	make install-gcc
-        make install-target-libgcc
 }
 
 termux_step_post_make_install () {
-	if [ $TERMUX_ARCH = "arm" ]; then
-		# Note that moving to $TERMUX_PREFIX/lib/gcc/arm-linux-androideabi/${TERMUX_PKG_VERSION}/
-        	# allows compilation but fails to link at runtime
-		mv $TERMUX_PREFIX/lib/armv7-a/hard/libgcc_s* $TERMUX_PREFIX/lib/
-	fi
-
 	# Android 5.0 only supports PIE binaries, so build that by default with a specs file:
 	local GCC_SPECS=$TERMUX_PREFIX/lib/gcc/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_VERSION/specs
 	cp $TERMUX_SCRIPTDIR/termux.spec $GCC_SPECS
@@ -76,4 +74,10 @@ elf_i386
 /system/bin/linker
 HERE
 	fi
+
+	# Replace hardlinks with symlinks:
+	cd $TERMUX_PREFIX/bin
+	rm ${TERMUX_HOST_PLATFORM}-g++; ln -s g++ ${TERMUX_HOST_PLATFORM}-g++
+	rm ${TERMUX_HOST_PLATFORM}-gcc; ln -s gcc ${TERMUX_HOST_PLATFORM}-gcc
+	rm ${TERMUX_HOST_PLATFORM}-gcc-${TERMUX_PKG_VERSION}; ln -s gcc ${TERMUX_HOST_PLATFORM}-gcc-${TERMUX_PKG_VERSION}
 }

packages/gcc/g++.subpackage.sh

@@ -1,3 +1,3 @@
-TERMUX_SUBPKG_INCLUDE="bin/g++ share/man/man1/g++.1 libexec/gcc/arm-linux-androideabi/4.9.2/cc1plus"
+TERMUX_SUBPKG_INCLUDE="bin/g++ bin/*-g++ share/man/man1/g++.1"
 TERMUX_SUBPKG_DESCRIPTION="GNU C++ compiler"
 TERMUX_SUBPKG_DEPENDS="gcc,ndk-stl"

packages/gcc/gcc-Makefile.in.patch

@@ -1,58 +0,0 @@
-The first block is to install aliases such as arm-linux-androideabi-gcc->gcc
-as symlinks instead of hard links.
-
-diff -u -r ../gcc-4.9.3/gcc/Makefile.in ./gcc/Makefile.in
---- ../gcc-4.9.3/gcc/Makefile.in	2014-10-16 09:50:42.000000000 -0400
-+++ ./gcc/Makefile.in	2015-08-16 18:12:44.446098799 -0400
-@@ -260,7 +260,7 @@
- INSTALL = @INSTALL@
- # Some systems may be missing symbolic links, regular links, or both.
- # Allow configure to check this and use "ln -s", "ln", or "cp" as appropriate.
--LN=@LN@
-+LN=@LN_S@
- LN_S=@LN_S@
- # These permit overriding just for certain files.
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -2430,27 +2430,29 @@
- 
- gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H)
- gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H)
--CFLAGS-gengtype-lex.o += -DGENERATOR_FILE
-+CFLAGS-build/gengtype-lex.o += -DGENERATOR_FILE
- build/gengtype-lex.o: $(BCONFIG_H)
- 
- gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
-   $(SYSTEM_H)
- gengtype-parse.o: $(CONFIG_H)
--CFLAGS-gengtype-parse.o += -DGENERATOR_FILE
-+CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE
- build/gengtype-parse.o: $(BCONFIG_H)
- 
- gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
-   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
-   $(XREGEX_H)
- gengtype-state.o: $(CONFIG_H)
--CFLAGS-gengtype-state.o += -DGENERATOR_FILE
-+CFLAGS-gengtype-state.o += -DGENERATOR_FILE2
-+CFLAGS-build/gengtype-state.o += -DGENERATOR_FILE
- build/gengtype-state.o: $(BCONFIG_H)
- 
- gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h 	\
-   rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \
-   $(OBSTACK_H) $(XREGEX_H)
- gengtype.o: $(CONFIG_H)
--CFLAGS-gengtype.o += -DGENERATOR_FILE
-+CFLAGS-gengtype.o += -DGENERATOR_FILE2
-+CFLAGS-build/gengtype.o += -DGENERATOR_FILE
- build/gengtype.o: $(BCONFIG_H)
- 
- build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h	\
-@@ -2515,7 +2517,7 @@
- # any system header is included.
- gengtype-lex.c : gengtype-lex.l
- 	-$(FLEX) $(FLEXFLAGS) -o$@ $< && { \
--	  echo '#include "bconfig.h"' > $@.tmp; \
-+	  echo '' > $@.tmp; \
- 	  cat $@ >> $@.tmp; \
- 	  mv $@.tmp $@; \
- 	}

packages/gcc/gcc-config-aarch64-aarch64-linux-android.h.patch

@@ -0,0 +1,65 @@
+From https://github.com/crystax/android-toolchain-gcc-5/commit/1e57465b9b81699ce8eb603dd4794a839a74c635
+
+diff -N -u -r ../gcc-5.3.0/gcc/config/aarch64/aarch64-linux-android.h ./gcc/config/aarch64/aarch64-linux-android.h
+--- ../gcc-5.3.0/gcc/config/aarch64/aarch64-linux-android.h	1969-12-31 19:00:00.000000000 -0500
++++ ./gcc/config/aarch64/aarch64-linux-android.h	2016-03-19 21:08:15.423913071 -0400
+@@ -0,0 +1,59 @@
++/* Machine description for AArch64 architecture.
++   Copyright (C) 2014 Free Software Foundation, Inc.
++
++   This file is part of GCC.
++
++   GCC is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3, or (at your option)
++   any later version.
++
++   GCC is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with GCC; see the file COPYING3.  If not see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef GCC_AARCH64_LINUX_ANDROID_H
++#define GCC_AARCH64_LINUX_ANDROID_H
++
++
++#undef TARGET_OS_CPP_BUILTINS
++#define TARGET_OS_CPP_BUILTINS()		\
++  do						\
++    {						\
++	GNU_USER_TARGET_OS_CPP_BUILTINS();	\
++	ANDROID_TARGET_OS_CPP_BUILTINS();	\
++    }						\
++  while (0)
++
++#undef  LINK_SPEC
++#define LINK_SPEC							\
++  LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
++		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
++
++#undef  CC1_SPEC
++#define CC1_SPEC							\
++  LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC,			\
++		       GNU_USER_TARGET_CC1_SPEC " " ANDROID_CC1_SPEC)
++
++#define CC1PLUS_SPEC \
++  LINUX_OR_ANDROID_CC ("", ANDROID_CC1PLUS_SPEC)
++
++#undef  LIB_SPEC
++#define LIB_SPEC							\
++  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC,			\
++		    GNU_USER_TARGET_NO_PTHREADS_LIB_SPEC " " ANDROID_LIB_SPEC)
++
++#undef	STARTFILE_SPEC
++#define STARTFILE_SPEC \
++  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_STARTFILE_SPEC, ANDROID_STARTFILE_SPEC)
++
++#undef	ENDFILE_SPEC
++#define ENDFILE_SPEC \
++  LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
++
++#endif  /* GCC_AARCH64_LINUX_ANDROID_H */

packages/gcc/gcc-config-aarch64-aarch64-linux.h.patch

@@ -0,0 +1,18 @@
+From https://github.com/crystax/android-toolchain-gcc-5/commit/1e57465b9b81699ce8eb603dd4794a839a74c635
+
+diff -u -r ../gcc-5.3.0/gcc/config/aarch64/aarch64-linux.h ./gcc/config/aarch64/aarch64-linux.h
+--- ../gcc-5.3.0/gcc/config/aarch64/aarch64-linux.h	2015-07-24 12:00:26.000000000 -0400
++++ ./gcc/config/aarch64/aarch64-linux.h	2016-03-19 21:35:07.467502590 -0400
+@@ -23,6 +23,12 @@
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
++/* Use /sysystem/bin/linker64 as linker instead of 32-bit /system/bin/linker */
++#ifdef BIONIC_DYNAMIC_LINKER
++# undef BIONIC_DYNAMIC_LINKER
++#endif
++#define BIONIC_DYNAMIC_LINKER "/system/bin/linker64"
++
+ #undef  ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
+ 

packages/gcc/gcc-config.gcc.patch

@@ -0,0 +1,22 @@
+diff -u -r ../gcc-5.3.0/gcc/config.gcc ./gcc/config.gcc
+--- ../gcc-5.3.0/gcc/config.gcc	2015-09-10 10:17:53.000000000 -0400
++++ ./gcc/config.gcc	2016-03-19 21:07:44.888339715 -0400
+@@ -910,13 +910,17 @@
+ 	TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
+ 	;;
+ aarch64*-*-linux*)
+-	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
++	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h"
+ 	tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-linux.h"
++	extra_options="${extra_options} linux-android.opt"
+ 	tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-linux"
+ 	case $target in
+ 	aarch64_be-*)
+ 		tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+ 		;;
++	aarch64*-*-linux-android*)
++		tm_file="${tm_file} aarch64/aarch64-linux-android.h"
++		;;
+ 	esac
+ 	aarch64_multilibs="${with_multilib_list}"
+ 	if test "$aarch64_multilibs" = "default"; then

packages/gcc/gcc.patch

@@ -1,51 +0,0 @@
-diff -u -r ../gcc-4.8.2/libcpp/files.c ./libcpp/files.c
---- ../gcc-4.8.2/libcpp/files.c	2013-03-06 17:18:40.000000000 +0100
-+++ ./libcpp/files.c	2014-01-09 00:29:34.940181542 +0100
-@@ -716,11 +716,13 @@
-     cpp_error (pfile, CPP_DL_WARNING,
- 	       "%s is shorter than expected", file->path);
- 
-+  off_t ot = (off_t) &file->st.st_size;
-   file->buffer = _cpp_convert_input (pfile,
- 				     CPP_OPTION (pfile, input_charset),
- 				     buf, size + 16, total,
- 				     &file->buffer_start,
--				     &file->st.st_size);
-+				     &ot);
-+  file->st.st_size = ot;
-   file->buffer_valid = true;
- 
-   return true;
-diff -u -r ../gcc-4.8.2/libcpp/macro.c ./libcpp/macro.c
---- ../gcc-4.8.2/libcpp/macro.c	2013-01-14 19:13:59.000000000 +0100
-+++ ./libcpp/macro.c	2014-01-09 00:30:49.416179764 +0100
-@@ -245,8 +245,10 @@
- 		   looks like "Sun Sep 16 01:03:52 1973".  */
- 		struct tm *tb = NULL;
- 		struct stat *st = _cpp_get_file_stat (file);
--		if (st)
--		  tb = localtime (&st->st_mtime);
-+		if (st) {
-+                  const time_t mtime = (const time_t) st->st_mtime;
-+		  tb = localtime (&mtime);
-+                }
- 		if (tb)
- 		  {
- 		    char *str = asctime (tb);
-Index: gcc-4.8.1/gcc/double-int.h
-===================================================================
---- ../gcc-4.8.1.orig/gcc/double-int.h	2013-01-30 11:04:30.000000000 +0000
-+++ ./gcc/double-int.h	2013-08-19 11:41:51.564012719 +0000
-@@ -448,10 +448,12 @@
- 
- 
- #ifndef GENERATOR_FILE
-+#ifndef GENERATOR_FILE2
- /* Conversion to and from GMP integer representations.  */
- 
- void mpz_set_double_int (mpz_t, double_int, bool);
- double_int mpz_get_double_int (const_tree, mpz_t, bool);
- #endif
-+#endif
- 
- #endif /* DOUBLE_INT_H */

packages/gcc/gcov.subpackage.sh

@@ -1,3 +1,3 @@
-TERMUX_SUBPKG_INCLUDE="bin/gcov share/man/man1/gcov.1 lib/gcc/arm-linux-androideabi/4.9.1/libgcov.a"
+TERMUX_SUBPKG_INCLUDE="bin/gcov bin/gcov-tool share/man/man1/gcov.1 lib/gcc/arm-linux-androideabi/4.9.1/libgcov.a"
 TERMUX_SUBPKG_DESCRIPTION="GNU coverage testing tool"
 TERMUX_SUBPKG_DEPENDS="gcc"

disabled-packages/gcc5/gcc.patch → packages/gcc/libcpp-files.c.patch

@@ -16,19 +16,3 @@ diff -u -r ../gcc-4.8.2/libcpp/files.c ./libcpp/files.c
    file->buffer_valid = true;
  
    return true;
-diff -u -r ../gcc-4.8.2/libcpp/macro.c ./libcpp/macro.c
---- ../gcc-4.8.2/libcpp/macro.c	2013-01-14 19:13:59.000000000 +0100
-+++ ./libcpp/macro.c	2014-01-09 00:30:49.416179764 +0100
-@@ -245,8 +245,10 @@
- 		   looks like "Sun Sep 16 01:03:52 1973".  */
- 		struct tm *tb = NULL;
- 		struct stat *st = _cpp_get_file_stat (file);
--		if (st)
--		  tb = localtime (&st->st_mtime);
-+		if (st) {
-+                  const time_t mtime = (const time_t) st->st_mtime;
-+		  tb = localtime (&mtime);
-+                }
- 		if (tb)
- 		  {
- 		    char *str = asctime (tb);

packages/gcc/libcpp-macro.c.patch

@@ -0,0 +1,16 @@
+diff -u -r ../gcc-4.8.2/libcpp/macro.c ./libcpp/macro.c
+--- ../gcc-4.8.2/libcpp/macro.c	2013-01-14 19:13:59.000000000 +0100
++++ ./libcpp/macro.c	2014-01-09 00:30:49.416179764 +0100
+@@ -245,8 +245,10 @@
+ 		   looks like "Sun Sep 16 01:03:52 1973".  */
+ 		struct tm *tb = NULL;
+ 		struct stat *st = _cpp_get_file_stat (file);
+-		if (st)
+-		  tb = localtime (&st->st_mtime);
++		if (st) {
++                  const time_t mtime = (const time_t) st->st_mtime;
++		  tb = localtime (&mtime);
++                }
+ 		if (tb)
+ 		  {
+ 		    char *str = asctime (tb);

packages/gdb/build.sh

@@ -1,7 +1,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.10.1
+TERMUX_PKG_VERSION=7.11
 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"
@@ -12,3 +12,15 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 
 # For frexp(3) usage:
 LDFLAGS+=" -lm"
+
+# Fix "undefined reference to 'rpl_gettimeofday'" when building on x86:
+export gl_cv_func_gettimeofday_clobber=no
+export gl_cv_func_gettimeofday_posix_signature=yes
+
+termux_step_post_extract_package () {
+	if [ $TERMUX_ARCH = aarch64 ]; then
+		# Fix problem with <stdlib.h> including <memory.h>:
+		mv $TERMUX_PKG_SRCDIR/sim/aarch64/{memory.h,memory_sim.h}
+		perl -p -i -e 's/memory.h/memory_sim.h/' $TERMUX_PKG_SRCDIR/sim/aarch64/*c
+	fi
+}

packages/gdb/gdb-arm-linux-nac.c.patch

@@ -1,14 +1,6 @@
 diff -u -r ../gdb-7.10/gdb/arm-linux-nat.c ./gdb/arm-linux-nat.c
 --- ../gdb-7.10/gdb/arm-linux-nat.c	2015-08-28 17:22:07.000000000 -0400
 +++ ./gdb/arm-linux-nat.c	2015-08-29 08:06:52.000680658 -0400
-@@ -34,7 +34,6 @@
- #include <sys/user.h>
- #include <sys/ptrace.h>
- #include <sys/utsname.h>
--#include <sys/procfs.h>
- 
- #include "nat/linux-ptrace.h"
- 
 @@ -63,6 +62,10 @@
  #define PTRACE_SETHBPREGS 30
  #endif

packages/gdb/gdb-gdbserver-configure.patch

@@ -0,0 +1,21 @@
+diff -u -r ../gdb-7.11/gdb/gdbserver/configure ./gdb/gdbserver/configure
+--- ../gdb-7.11/gdb/gdbserver/configure	2016-02-09 22:19:39.000000000 -0500
++++ ./gdb/gdbserver/configure	2016-03-10 10:17:40.111988028 -0500
+@@ -6735,17 +6735,6 @@
+ 
+ 
+ case "${target}" in
+-  *-android*)
+-    # Starting with NDK version 9, <elf.h> actually includes definitions
+-    # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes
+-    # <sys/exec_elf.h> which defines some of the ELF types incorrectly,
+-    # leading to conflicts with the defintions from <linux/elf.h>.
+-    # This makes it impossible for us to include both <elf.h> and
+-    # <linux/elf.h>, which means that, in practice, we do not have
+-    # access to Elf32_auxv_t and Elf64_auxv_t on this platform.
+-    # Therefore, do not try to auto-detect availability, as it would
+-    # get it wrong on this platform.
+-    ;;
+   *)
+     ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
+ 

packages/gdb/gdb-inflow.c.patch

@@ -0,0 +1,18 @@
+diff -u -r ../gdb-7.10.1/gdb/inflow.c ./gdb/inflow.c
+--- ../gdb-7.10.1/gdb/inflow.c	2015-12-05 10:16:45.000000000 -0500
++++ ./gdb/inflow.c	2016-02-07 19:28:38.979181296 -0500
+@@ -862,10 +862,10 @@
+     {
+ #if defined (HAVE_TERMIOS) || defined (TIOCGPGRP)
+ #ifdef HAVE_SETPGID
+-      /* The call setpgid (0, 0) is supposed to work and mean the same
+-         thing as this, but on Ultrix 4.2A it fails with EPERM (and
+-         setpgid (getpid (), getpid ()) succeeds).  */
+-      retval = setpgid (getpid (), getpid ());
++      /* Termux change: setpgid(getpid(), getpid()), which is used upstream
++	 for working around Ultrix 4.2A issue, does not work on Android but
++	 fails with ESRCH. So revert back to simple setpgid(0,0). */
++      retval = setpgid (0, 0);
+ #else
+ #ifdef HAVE_SETPGRP
+ #ifdef SETPGRP_VOID 

packages/gdb/gdb-solib.c.patch

@@ -0,0 +1,20 @@
+diff -u -r ../gdb-7.10.1/gdb/solib.c ./gdb/solib.c
+--- ../gdb-7.10.1/gdb/solib.c	2015-12-05 10:16:45.000000000 -0500
++++ ./gdb/solib.c	2016-02-07 17:29:11.431584611 -0500
+@@ -1703,6 +1703,16 @@
+   add_alias_cmd ("solib-absolute-prefix", "sysroot", class_support, 0,
+ 		 &showlist);
+ 
++#ifdef __ANDROID__
++  /* Termux modification to find system shared libraries. */
++  solib_search_path =
++# ifdef __LP64__
++    "/system/lib64:/system/vendor/lib64";
++# else
++    "/system/lib:/system/vendor/lib";
++# endif
++#endif
++
+   add_setshow_optional_filename_cmd ("solib-search-path", class_support,
+ 				     &solib_search_path, _("\
+ Set the search path for loading non-absolute shared library symbol files."),

packages/gdb/gdbserver_gdb_proc_service.h.patch

@@ -1,12 +0,0 @@
-diff -u -r ../gdb-7.8.1/gdb/gdbserver/gdb_proc_service.h ./gdb/gdbserver/gdb_proc_service.h
---- ../gdb-7.8.1/gdb/gdbserver/gdb_proc_service.h	2014-06-11 12:34:41.000000000 -0400
-+++ ./gdb/gdbserver/gdb_proc_service.h	2014-12-22 07:53:22.855702229 -0500
-@@ -38,6 +38,8 @@
- # endif
- #endif
- 
-+#include "../gregset.h" /* for elf_gregset_t */
-+
- typedef enum
- {
-   PS_OK,			/* Success.  */

packages/gdb/i386-linux-nat.c.patch

@@ -1,15 +0,0 @@
-diff -u -r ../gdb-7.9/gdb/i386-linux-nat.c ./gdb/i386-linux-nat.c
---- ../gdb-7.9/gdb/i386-linux-nat.c	2015-02-19 06:58:07.000000000 -0500
-+++ ./gdb/i386-linux-nat.c	2015-03-17 18:14:06.728805213 -0400
-@@ -35,6 +35,11 @@
- 
- #include "x86-linux-nat.h"
- 
-+#ifdef __ANDROID__
-+#include <sys/ucontext.h>
-+typedef fpregset_t elf_fpxregset_t;
-+#endif
-+
- /* The register sets used in GNU/Linux ELF core-dumps are identical to
-    the register sets in `struct user' that is used for a.out
-    core-dumps, and is also used by `ptrace'.  The corresponding types

packages/gdb/linux-arm-low.c.patch

@@ -1,11 +0,0 @@
-diff -u -r ../gdb-7.8.1/gdb/gdbserver/linux-arm-low.c ./gdb/gdbserver/linux-arm-low.c
---- ../gdb-7.8.1/gdb/gdbserver/linux-arm-low.c	2014-10-29 15:45:50.000000000 -0400
-+++ ./gdb/gdbserver/linux-arm-low.c	2014-12-22 07:57:06.035702383 -0500
-@@ -26,6 +26,7 @@
- #endif
- #include <sys/ptrace.h>
- #include <signal.h>
-+#include <linux/auxvec.h> /* for AT_HWCAP define */
- 
- /* Defined in auto-generated files.  */
- void init_registers_arm (void);

packages/gdb/linux-x86-low.c.patch

@@ -1,23 +0,0 @@
-diff -u -r ../gdb-7.9/gdb/gdbserver/linux-x86-low.c ./gdb/gdbserver/linux-x86-low.c
---- ../gdb-7.9/gdb/gdbserver/linux-x86-low.c	2015-02-19 06:58:07.000000000 -0500
-+++ ./gdb/gdbserver/linux-x86-low.c	2015-03-17 18:29:50.412805866 -0400
-@@ -38,6 +38,11 @@
- #include "tracepoint.h"
- #include "ax.h"
- 
-+#ifdef __ANDROID__
-+#include <sys/ucontext.h>
-+typedef fpregset_t elf_fpxregset_t;
-+#endif
-+
- #ifdef __x86_64__
- /* Defined in auto-generated file amd64-linux.c.  */
- void init_registers_amd64_linux (void);
-@@ -113,7 +118,6 @@
- #endif
- 
- #include <sys/reg.h>
--#include <sys/procfs.h>
- #include <sys/ptrace.h>
- #include <sys/uio.h>
- 

packages/gdb/linux_low.patch

@@ -1,37 +0,0 @@
-diff -u -r ../gdb-7.8.1/gdb/gdbserver/linux-low.c ./gdb/gdbserver/linux-low.c
---- ../gdb-7.8.1/gdb/gdbserver/linux-low.c	2014-10-29 15:45:50.000000000 -0400
-+++ ./gdb/gdbserver/linux-low.c	2014-12-22 07:51:39.355702157 -0500
-@@ -47,6 +47,7 @@
- #include "filestuff.h"
- #include "tracepoint.h"
- #include "hostio.h"
-+#include <linux/auxvec.h> /* For AT_PHDR and AT_PHNUM defines */
- #ifndef ELFMAG0
- /* Don't include <linux/elf.h> here.  If it got included by gdb_proc_service.h
-    then ELFMAG0 will have been defined.  If it didn't get included by
-@@ -108,7 +109,6 @@
- # include "linux-btrace.h"
- #endif
- 
--#ifndef HAVE_ELF32_AUXV_T
- /* Copied from glibc's elf.h.  */
- typedef struct
- {
-@@ -121,9 +121,7 @@
- 	 on 64-bit platforms and vice versa.  */
-     } a_un;
- } Elf32_auxv_t;
--#endif
- 
--#ifndef HAVE_ELF64_AUXV_T
- /* Copied from glibc's elf.h.  */
- typedef struct
- {
-@@ -136,7 +134,6 @@
- 	 on 64-bit platforms and vice versa.  */
-     } a_un;
- } Elf64_auxv_t;
--#endif
- 
- /* A list of all unknown processes which receive stop signals.  Some
-    other process will presumably claim each of these as forked

packages/gdb/linux_nat.patch

@@ -1,14 +1,6 @@
 diff -u -r ../gdb-7.7/gdb/linux-nat.c ./gdb/linux-nat.c
 --- ../gdb-7.7/gdb/linux-nat.c	2014-02-06 03:21:29.000000000 +0100
 +++ ./gdb/linux-nat.c	2014-02-12 01:55:15.000000000 +0100
-@@ -41,7 +41,6 @@
- #include "inf-child.h"
- #include "inf-ptrace.h"
- #include "auxv.h"
--#include <sys/procfs.h>		/* for elf_gregset etc.  */
- #include "elf-bfd.h"		/* for elfcore_write_* */
- #include "gregset.h"		/* for gregset */
- #include "gdbcore.h"		/* for get_exec_file */
 @@ -68,6 +67,10 @@
  #include "target-descriptions.h"
  #include "filestuff.h"
@@ -20,12 +12,3 @@ diff -u -r ../gdb-7.7/gdb/linux-nat.c ./gdb/linux-nat.c
  #ifndef SPUFS_MAGIC
  #define SPUFS_MAGIC 0x23c9b64e
  #endif
-@@ -3789,7 +3792,7 @@
-   if (last.kind == TARGET_WAITKIND_FORKED
-       || last.kind == TARGET_WAITKIND_VFORKED)
-     {
--      ptrace (PT_KILL, ptid_get_pid (last.value.related_pid), 0, 0);
-+      ptrace (PTRACE_KILL, ptid_get_pid (last.value.related_pid), 0, 0);
-       wait (&status);
- 
-       /* Let the arch-specific native code know this process is

packages/gdb/nm-linux.h.patch

@@ -1,24 +0,0 @@
-diff -u -r ../gdb-7.8.1/gdb/config/nm-linux.h ./gdb/config/nm-linux.h
---- ../gdb-7.8.1/gdb/config/nm-linux.h	2014-06-11 12:34:41.000000000 -0400
-+++ ./gdb/config/nm-linux.h	2014-12-22 07:45:14.127701891 -0500
-@@ -20,5 +20,20 @@
- /* Use elf_gregset_t and elf_fpregset_t, rather than
-    gregset_t and fpregset_t.  */
- 
-+#ifndef NM_CONFIG_LINUX_H
-+#define NM_CONFIG_LINUX_H
-+
-+#include <sys/ucontext.h>
-+
-+#ifdef __arm__
-+/* Structure to describe FPU registers.  */
-+typedef struct fpregset { } fpregset_t;
-+#endif
-+
-+typedef gregset_t elf_gregset_t;
-+typedef fpregset_t elf_fpregset_t;
-+
- #define GDB_GREGSET_T  elf_gregset_t
- #define GDB_FPREGSET_T elf_fpregset_t
-+
-+#endif

packages/gdb/proc_server_c_procfs.patch

@@ -1,11 +0,0 @@
-diff -u -r ../gdb-7.6.2/gdb/proc-service.c ./gdb/proc-service.c
---- ../gdb-7.6.2/gdb/proc-service.c	2013-12-08 05:33:13.000000000 +0100
-+++ ./gdb/proc-service.c	2014-01-07 16:43:01.866311352 +0100
-@@ -27,7 +27,6 @@
- 
- #include "gdb_proc_service.h"
- 
--#include <sys/procfs.h>
- 
- /* Prototypes for supply_gregset etc.  */
- #include "gregset.h"

packages/gdb/x86-linux-nat.c.patch

@@ -1,23 +0,0 @@
-diff -u -r ../gdb-7.9/gdb/x86-linux-nat.c ./gdb/x86-linux-nat.c
---- ../gdb-7.9/gdb/x86-linux-nat.c	2015-02-20 12:11:44.000000000 -0500
-+++ ./gdb/x86-linux-nat.c	2015-03-17 18:20:50.044805492 -0400
-@@ -23,7 +23,6 @@
- #include "gdb_proc_service.h"
- #include <sys/ptrace.h>
- #include <sys/user.h>
--#include <sys/procfs.h>
- #include <sys/uio.h>
- 
- #include "x86-nat.h"
-@@ -39,6 +38,11 @@
- #include "x86-xstate.h"
- #include "nat/linux-btrace.h"
- 
-+#ifdef __ANDROID__
-+#include <sys/ucontext.h>
-+typedef fpregset_t elf_fpxregset_t;
-+#endif
-+
- /* Per-thread arch-specific data we want to keep.  */
- 
- struct arch_lwp_info

packages/gdk-pixbuf/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/gdk-pixbuf/
 TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation"
-TERMUX_PKG_VERSION=2.32.1
+TERMUX_PKG_VERSION=2.32.3
 TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo"
 # Avoid runtime test which does not work when cross compiling:

packages/git/build.sh

@@ -2,21 +2,30 @@ TERMUX_PKG_HOMEPAGE=http://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less"
-TERMUX_PKG_VERSION=2.7.0
+TERMUX_PKG_VERSION=2.7.4
-TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-tcltk --with-curl --with-shell=$TERMUX_PREFIX/bin/sh ac_cv_header_libintl_h=no ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes"
 # expat is only used by git-http-push for remote lock management over DAV, so disable:
 # NO_INSTALL_HARDLINKS to use symlinks instead of hardlinks (which does not work on Android M):
-TERMUX_PKG_EXTRA_MAKE_ARGS="NO_NSEC=1 NO_PERL=1 NO_GETTEXT=1 NO_EXPAT=1 NO_INSTALL_HARDLINKS=1 PERL_PATH=$TERMUX_PREFIX/bin/perl"
+TERMUX_PKG_EXTRA_MAKE_ARGS="NO_NSEC=1 NO_GETTEXT=1 NO_EXPAT=1 NO_INSTALL_HARDLINKS=1 PERL_PATH=$TERMUX_PREFIX/bin/perl"
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 # Things to remove to save space:
 #  bin/git-cvsserver - server emulating CVS
 #  bin/git-shell - restricted login shell for Git-only SSH access
-#  lib/perl5 - perl scripts
+TERMUX_PKG_RM_AFTER_INSTALL="bin/git-cvsserver bin/git-shell Library"
-TERMUX_PKG_RM_AFTER_INSTALL="bin/git-cvsserver bin/git-shell lib/perl5 Library"
+
+termux_step_pre_configure () {
+	# Setup perl so that the build process can execute it:
+	rm -f $TERMUX_PREFIX/bin/perl
+	ln -s `which perl` $TERMUX_PREFIX/bin/perl
+
+	# Force fresh perl files (otherwise files from earlier builds
+	# remains without bumped modification times, so are not picked
+	# up by the package):
+	rm -Rf $TERMUX_PREFIX/share/git-perl
+}
 
 termux_step_post_make_install () {
 	# Installing man requires asciidoc and xmlto, so git uses separate make targets for man pages
@@ -25,6 +34,12 @@ termux_step_post_make_install () {
 	mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/
 	cp $TERMUX_PKG_SRCDIR/contrib/completion/git-completion.bash \
 	   $TERMUX_PREFIX/etc/bash_completion.d/
+
+	# Remove the build machine perl setup in termux_step_pre_configure to avoid it being packaged:
+	rm $TERMUX_PREFIX/bin/perl
+
+	# Remove clutter:
+	rm -Rf $TERMUX_PREFIX/lib/*-linux*/perl
 }
 
 termux_step_post_massage () {

packages/git/makefile.patch

@@ -1,7 +1,13 @@
-diff -u -r ../git-2.5.0/Makefile ./Makefile
+The librt functionality is built into libc on Android.
---- ../git-2.5.0/Makefile	2015-07-27 16:34:56.000000000 -0400
+
-+++ ./Makefile	2015-07-30 03:43:04.011455306 -0400
+The Termux git package installs git perl files to $PREFIX/share/git-perl
-@@ -1431,7 +1431,6 @@
+by patching perl/Makefile.PL, so setup that path when building perl
+files in this Makefile.
+
+diff -u -r ../git-2.7.4/Makefile ./Makefile
+--- ../git-2.7.4/Makefile	2016-03-17 16:47:59.000000000 -0400
++++ ./Makefile	2016-03-24 22:46:20.335193973 -0400
+@@ -1455,7 +1455,6 @@
  
  ifdef HAVE_CLOCK_GETTIME
  	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@@ -9,3 +15,12 @@ diff -u -r ../git-2.5.0/Makefile ./Makefile
  endif
  
  ifdef HAVE_CLOCK_MONOTONIC
+@@ -1789,7 +1788,7 @@
+ 	sed -e '1{' \
+ 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+ 	    -e '	h' \
+-	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'"));=' \
++	    -e '	s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"@TERMUX_PREFIX@/share/git-perl"'"));=' \
+ 	    -e '	H' \
+ 	    -e '	x' \
+ 	    -e '}' \

packages/git/perl-Makefile.PL.patch

@@ -0,0 +1,24 @@
+Install git perl files to a local git-specific folder and
+be sure to bring the private Error.pm copy with it.
+
+diff -u -r ../git-2.7.4/perl/Makefile.PL ./perl/Makefile.PL
+--- ../git-2.7.4/perl/Makefile.PL	2016-03-17 16:47:59.000000000 -0400
++++ ./perl/Makefile.PL	2016-03-24 22:38:12.222059955 -0400
+@@ -38,15 +38,13 @@
+ 	my $pm_path = $File::Find::name;
+ 	$pm_path =~ s{^\./}{};
+ 
+-	$pm{$pm_path} = '$(INST_LIBDIR)/'.$pm_path;
++	$pm{$pm_path} = '@TERMUX_PREFIX@/share/git-perl/'.$pm_path;
+ }, "Git", "Git.pm";
+ 
+ 
+ # We come with our own bundled Error.pm. It's not in the set of default
+ # Perl modules so install it if it's not available on the system yet.
+-if ( !eval { require Error } || $Error::VERSION < 0.15009) {
+-	$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';
+-}
++	$pm{'private-Error.pm'} = '@TERMUX_PREFIX@/share/git-perl/Error.pm';
+ 
+ # redirect stdout, otherwise the message "Writing perl.mak for Git"
+ # disrupts the output for the target 'instlibdir'

packages/glib/build.sh

@@ -2,12 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
 _TERMUX_GLIB_MAJOR_VERSION=2.46
 TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libffi, pcre"
 
 # --enable-compile-warnings=no to get rid of format strings causing errors
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-compile-warnings --disable-gtk-doc --disable-gtk-doc-html --cache-file=termux_configure.cache --with-pcre=system"
+# --disable-znodelete to avoid DF_1_NODELETE which most Android 5.0 linkers
+# does not support:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-znodelete"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb lib/glib-2.0/include bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
 
 # glib checks for __BIONIC__ instead of __ANDROID__

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.11
+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"

packages/gnuplot/build.sh

@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnuplot.info/
 TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
-TERMUX_PKG_VERSION=4.6.6
+TERMUX_PKG_VERSION=4.6.7
 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"
 TERMUX_PKG_DEPENDS="libandroid-support, readline, pango"

packages/golang/build.sh

@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.6rc1
+_MAJOR_VERSION=1.6
-# Need to be considered a higher version than "1.5rc1":
+# Use the ~ deb versioning construct in the future:
-TERMUX_PKG_VERSION=1:$_MAJOR_VERSION
+TERMUX_PKG_VERSION=2:$_MAJOR_VERSION
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz
 TERMUX_PKG_FOLDERNAME=go
 TERMUX_PKG_KEEP_STATIC_LIBRARIES=true