From e8c88e69649fd7074a27d4889b5ca0f0666431aa Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Jan 2016 17:26:52 -0500
Subject: [PATCH 01/39] git: Install git-completion.bash from contrib/

---
 packages/git/build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 3bbc291bd..177c3bf7e 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle ev
 # escape sequences:
 TERMUX_PKG_DEPENDS="openssl, libcurl, less"
 TERMUX_PKG_VERSION=2.7.0
+TERMUX_PKG_BUILD_REVISION=1
 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"
@@ -22,4 +23,8 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/git-cvsserver bin/git-shell lib/perl5 Library"
 termux_step_post_make_install () {
 	# Installing man requires asciidoc and xmlto, so git uses separate make targets for man pages
 	make install-man
+
+	mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/
+	cp $TERMUX_PKG_SRCDIR/contrib/completion/git-completion.bash \
+	   $TERMUX_PREFIX/etc/bash_completion.d/
 }

From dc68cb1e023c44282c6f12567ae78db39ba39d06 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Jan 2016 17:27:34 -0500
Subject: [PATCH 02/39] nodejs: Update from 5.4.1 to 5.5.0

---
 packages/nodejs/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index e30adc148..5ec39c0eb 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
-TERMUX_PKG_VERSION=5.4.1
+TERMUX_PKG_VERSION=5.5.0
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="openssl, libuv"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"

From f18a9f6041513e96bad653010afc6d24a74d1915 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Jan 2016 17:29:25 -0500
Subject: [PATCH 03/39] bash-completion: Mark as arch-independent

Also add patch from coming version
---
 packages/bash-completion/build.sh             |  2 ++
 .../words-bad-array-subscript.patch           | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 packages/bash-completion/words-bad-array-subscript.patch

diff --git a/packages/bash-completion/build.sh b/packages/bash-completion/build.sh
index 2ca9c56bc..c01501367 100644
--- a/packages/bash-completion/build.sh
+++ b/packages/bash-completion/build.sh
@@ -1,5 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://bash-completion.alioth.debian.org/
 TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
 TERMUX_PKG_VERSION=2.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://bash-completion.alioth.debian.org/files/bash-completion-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="bash"
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
diff --git a/packages/bash-completion/words-bad-array-subscript.patch b/packages/bash-completion/words-bad-array-subscript.patch
new file mode 100644
index 000000000..7cbccedba
--- /dev/null
+++ b/packages/bash-completion/words-bad-array-subscript.patch
@@ -0,0 +1,23 @@
+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
+

From 9b4c5fc90f72858d5a87c5732f392faffe4e7d31 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 24 Jan 2016 17:30:00 -0500
Subject: [PATCH 04/39] vim: Update to latest patch

---
 packages/vim-python/build.sh              |  2 +-
 packages/vim-python/src-osdef1.h.in.patch | 15 +++++++++++++++
 packages/vim/build.sh                     |  2 +-
 packages/vim/src-osdef1.h.in.patch        | 15 +++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 packages/vim-python/src-osdef1.h.in.patch
 create mode 100644 packages/vim/src-osdef1.h.in.patch

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index f280d8e80..2a37a7071 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
 
 # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-TERMUX_PKG_VERSION=7.4.1147
+TERMUX_PKG_VERSION=7.4.1174
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
diff --git a/packages/vim-python/src-osdef1.h.in.patch b/packages/vim-python/src-osdef1.h.in.patch
new file mode 100644
index 000000000..416040c6f
--- /dev/null
+++ b/packages/vim-python/src-osdef1.h.in.patch
@@ -0,0 +1,15 @@
+bzero() is a define in the NDK header files (but should probably
+not be used at all, bzero as deprecated and then removed in POSIX).
+
+diff -u -r ../vim-7.4.1174/src/osdef1.h.in ./src/osdef1.h.in
+--- ../vim-7.4.1174/src/osdef1.h.in	2016-01-24 16:17:03.000000000 -0500
++++ ./src/osdef1.h.in	2016-01-24 17:01:12.816949231 -0500
+@@ -70,8 +70,6 @@
+ #  endif
+ # endif
+ #endif
+-/* used inside of FD_ZERO macro: */
+-extern void	bzero(void *, size_t);
+ #ifdef HAVE_SETSID
+ extern pid_t	setsid(void);
+ #endif
diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 6629cf22a..f557c5b24 100755
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
 
 # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-TERMUX_PKG_VERSION=7.4.1147
+TERMUX_PKG_VERSION=7.4.1174
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
diff --git a/packages/vim/src-osdef1.h.in.patch b/packages/vim/src-osdef1.h.in.patch
new file mode 100644
index 000000000..416040c6f
--- /dev/null
+++ b/packages/vim/src-osdef1.h.in.patch
@@ -0,0 +1,15 @@
+bzero() is a define in the NDK header files (but should probably
+not be used at all, bzero as deprecated and then removed in POSIX).
+
+diff -u -r ../vim-7.4.1174/src/osdef1.h.in ./src/osdef1.h.in
+--- ../vim-7.4.1174/src/osdef1.h.in	2016-01-24 16:17:03.000000000 -0500
++++ ./src/osdef1.h.in	2016-01-24 17:01:12.816949231 -0500
+@@ -70,8 +70,6 @@
+ #  endif
+ # endif
+ #endif
+-/* used inside of FD_ZERO macro: */
+-extern void	bzero(void *, size_t);
+ #ifdef HAVE_SETSID
+ extern pid_t	setsid(void);
+ #endif

From ee49372d87ad718fa13e16a6dff25eec233fe4a1 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 25 Jan 2016 06:04:16 -0500
Subject: [PATCH 05/39] libconfig: Move out from disabled-packages

---
 {disabled-packages => packages}/libconfig/Makefile.in.patch | 0
 {disabled-packages => packages}/libconfig/build.sh          | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {disabled-packages => packages}/libconfig/Makefile.in.patch (100%)
 rename {disabled-packages => packages}/libconfig/build.sh (100%)

diff --git a/disabled-packages/libconfig/Makefile.in.patch b/packages/libconfig/Makefile.in.patch
similarity index 100%
rename from disabled-packages/libconfig/Makefile.in.patch
rename to packages/libconfig/Makefile.in.patch
diff --git a/disabled-packages/libconfig/build.sh b/packages/libconfig/build.sh
similarity index 100%
rename from disabled-packages/libconfig/build.sh
rename to packages/libconfig/build.sh

From de255e9c1520d010498315212778652a0af17dc2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 25 Jan 2016 06:28:25 -0500
Subject: [PATCH 06/39] git: Rebuild with https support

Also add test to ensure that the git package is built with
https support.
---
 packages/git/build.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 177c3bf7e..42cd02ce9 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -1,11 +1,9 @@
 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="openssl, libcurl, less"
+# 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_BUILD_REVISION=1
+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"
@@ -28,3 +26,10 @@ termux_step_post_make_install () {
 	cp $TERMUX_PKG_SRCDIR/contrib/completion/git-completion.bash \
 	   $TERMUX_PREFIX/etc/bash_completion.d/
 }
+
+termux_step_post_massage () {
+	if [ ! -f libexec/git-core/git-remote-https ]; then
+		echo "ERROR: Built without https support"
+		exit 1
+	fi
+}

From 039b43de923b14ebfe6345c1964ae4d464fc2798 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 09:00:41 -0500
Subject: [PATCH 07/39] apt: Update from 1.1.10 to 1.2.1

Also bundle the new bash completion for 'apt'.
---
 .../apt/apt-pkg-aptconfiguration.cc.patch     | 16 ++++++-----
 packages/apt/build.sh                         |  6 ++++-
 packages/apt/completions-bash-apt.patch       | 27 +++++++++++++++++++
 3 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 packages/apt/completions-bash-apt.patch

diff --git a/packages/apt/apt-pkg-aptconfiguration.cc.patch b/packages/apt/apt-pkg-aptconfiguration.cc.patch
index 49508e816..1cce5fea4 100644
--- a/packages/apt/apt-pkg-aptconfiguration.cc.patch
+++ b/packages/apt/apt-pkg-aptconfiguration.cc.patch
@@ -1,18 +1,20 @@
-diff -u -r ../apt-1.1.3/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc
---- ../apt-1.1.3/apt-pkg/aptconfiguration.cc	2015-11-30 03:08:24.000000000 -0500
-+++ ./apt-pkg/aptconfiguration.cc	2015-12-03 18:16:35.167212811 -0500
-@@ -35,8 +35,8 @@
+diff -u -r ../apt-1.2/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.cc
+--- ../apt-1.2/apt-pkg/aptconfiguration.cc	2016-01-15 13:53:52.000000000 -0500
++++ ./apt-pkg/aptconfiguration.cc	2016-01-25 06:12:27.102248821 -0500
+@@ -35,9 +35,9 @@
  // setDefaultConfigurationForCompressors				/*{{{*/
  static void setDefaultConfigurationForCompressors() {
  	// Set default application paths to check for optional compression types
 -	_config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
 -	_config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
+-	_config->CndSet("Dir::Bin::lz4", "/usr/bin/lz4");
 +	_config->CndSet("Dir::Bin::bzip2", "bin/bzip2");
 +	_config->CndSet("Dir::Bin::xz", "bin/xz");
++	_config->CndSet("Dir::Bin::lz4", "bin/lz4");
  	if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
  		_config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz"));
  		_config->Set("APT::Compressor::lzma::Binary", "xz");
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
  			_config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
  		}
  	} else {
@@ -20,8 +22,8 @@ diff -u -r ../apt-1.1.3/apt-pkg/aptconfiguration.cc ./apt-pkg/aptconfiguration.c
 +		_config->CndSet("Dir::Bin::lzma", "bin/lzma");
  		if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
  			_config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
- 			_config->Set("APT::Compressor::lzma::CompressArg::", "-9");
-@@ -218,7 +218,7 @@
+ 			_config->Set("APT::Compressor::lzma::CompressArg::", "-6");
+@@ -220,7 +220,7 @@
  	// get the environment language codes: LC_MESSAGES (and later LANGUAGE)
  	// we extract both, a long and a short code and then we will
  	// check if we actually need both (rare) or if the short is enough
diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 1d326713f..398630af7 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,7 +1,7 @@
 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.1.10
+TERMUX_PKG_VERSION=1.2.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:
@@ -52,4 +52,8 @@ termux_step_make_install () {
 
         # The trusted.gpg was created with "apt-key add public-key.key":
         cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/
+
+	mkdir -p $TERMUX_PREFIX/etc/bash_completion.d/
+	cp $TERMUX_PKG_SRCDIR/completions/bash/apt \
+	   $TERMUX_PREFIX/etc/bash_completion.d/
 }
diff --git a/packages/apt/completions-bash-apt.patch b/packages/apt/completions-bash-apt.patch
new file mode 100644
index 000000000..059a63a35
--- /dev/null
+++ b/packages/apt/completions-bash-apt.patch
@@ -0,0 +1,27 @@
+diff -u -r ../apt-1.2/completions/bash/apt ./completions/bash/apt
+--- ../apt-1.2/completions/bash/apt	2016-01-15 13:53:52.000000000 -0500
++++ ./completions/bash/apt	2016-01-25 06:15:46.747246153 -0500
+@@ -2,7 +2,7 @@
+ 
+ _apt()
+ {
+-    local sourcesdir="/etc/apt/sources.list.d"
++    local sourcesdir="@TERMUX_PREFIX@/etc/apt/sources.list.d"
+     local cur prev words cword
+     _init_completion || return
+ 
+@@ -66,14 +66,9 @@
+     if [[ -n $command ]]; then
+         case $command in
+             remove|purge|autoremove)
+-                if [[ -f /etc/debian_version ]]; then
+                     # Debian system
+                     COMPREPLY=( $( \
+                         _xfunc dpkg _comp_dpkg_installed_packages $cur ) )
+-                else
+-                    # assume RPM based
+-                    _xfunc rpm _rpm_installed_packages
+-                fi
+                 return 0
+                 ;;
+             show|list)

From fd000fc61c24a59dc96b5c3edebfec97692f432a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 10:48:48 -0500
Subject: [PATCH 08/39] binutils: Update from 2.25 to 2.26

---
 packages/binutils/build.sh                    |  4 ++--
 packages/binutils/ld-emultempl-elf32.em.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 packages/binutils/ld-emultempl-elf32.em.patch

diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh
index 27f60fe92..4cc4e3f33 100755
--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@@ -1,8 +1,8 @@
-TERMUX_PKG_VERSION=2.25
+TERMUX_PKG_VERSION=2.26
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/binutils/
 TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the GNU linker, and as, the GNU assembler"
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-werror"
 TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd"
 
diff --git a/packages/binutils/ld-emultempl-elf32.em.patch b/packages/binutils/ld-emultempl-elf32.em.patch
new file mode 100644
index 000000000..5dd80b84f
--- /dev/null
+++ b/packages/binutils/ld-emultempl-elf32.em.patch
@@ -0,0 +1,17 @@
+diff -u -r ../binutils-2.26/ld/emultempl/elf32.em ./ld/emultempl/elf32.em
+--- ../binutils-2.26/ld/emultempl/elf32.em	2015-11-13 03:27:42.000000000 -0500
++++ ./ld/emultempl/elf32.em	2016-01-28 10:20:11.534910516 -0500
+@@ -115,8 +115,13 @@
+ static void
+ gld${EMULATION_NAME}_after_parse (void)
+ {
++#ifndef __ANDROID__
++  /** The Android linker does not support DF_1_PIE but prints a warning:
++      'unsupported flags DT_FLAGS_1=0x8000000'
++      due to validation in linker.cpp (see "case DT_FLAGS_1" there. */ */
+   if (bfd_link_pie (&link_info))
+     link_info.flags_1 |= (bfd_vma) DF_1_PIE;
++#endif
+ 
+   after_parse_default ();
+ }

From d104e472bd1e3599f7cc951094c123222d3b325f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 11:17:28 -0500
Subject: [PATCH 09/39] binutils: Avoid linking to flex shared lib

---
 packages/binutils/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh
index 4cc4e3f33..17613ed90 100755
--- a/packages/binutils/build.sh
+++ b/packages/binutils/build.sh
@@ -6,6 +6,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-werror"
 TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/windmc.1 share/man/man1/windres.1 bin/ld.bfd"
 
+# Avoid linking against libfl.so from flex if available:
+export LEXLIB=
+
 termux_step_post_make_install () {
 	cp $TERMUX_PKG_BUILDER_DIR/ldd $TERMUX_PREFIX/bin/ldd
 }

From 41c3e84e2ad2d51172a9f24253869bcf1f854bd8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 12:49:06 -0500
Subject: [PATCH 10/39] openssl: Update from 1.0.2e to 1.0.2f

---
 packages/openssl/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh
index 267947359..458faf5a6 100755
--- a/packages/openssl/build.sh
+++ b/packages/openssl/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssl.org/
 TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions"
 TERMUX_PKG_DEPENDS="ca-certificates"
-TERMUX_PKG_VERSION=1.0.2e
+TERMUX_PKG_VERSION=1.0.2f
 TERMUX_PKG_SRCURL="http://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
 TERMUX_PKG_BUILD_IN_SRC=yes

From f6d776284c797fff02c9a00b5d9440c3768ea1ea Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 12:52:09 -0500
Subject: [PATCH 11/39] gnupg2: Update from 2.1.10 to 2.1.11

---
 packages/gnupg2/build.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/gnupg2/build.sh b/packages/gnupg2/build.sh
index 62a879534..a6c5973fd 100755
--- a/packages/gnupg2/build.sh
+++ b/packages/gnupg2/build.sh
@@ -1,7 +1,6 @@
 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.10
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=2.1.11
 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"

From 2633909c7dc54059378d621cd0d69aa913070591 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 13:51:50 -0500
Subject: [PATCH 12/39] wol: Remove info files, specify man dir

---
 packages/wol/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/wol/build.sh b/packages/wol/build.sh
index c28cbf12d..6c25580eb 100644
--- a/packages/wol/build.sh
+++ b/packages/wol/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://sourceforge.net/projects/wake-on-lan/
 TERMUX_PKG_DESCRIPTION="wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant"
 TERMUX_PKG_VERSION=0.7.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://downloads.openwrt.org/sources/wol-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--infodir=$TERMUX_PREFIX/share/info"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man"
+TERMUX_PKG_RM_AFTER_INSTALL="info/"
 
 termux_step_pre_configure() {
 	# https://dev.openwrt.org/browser/packages/net/wol/Makefile

From 13ccf6586fe53e9082c959d935f7b1e4cb82e74f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 13:52:06 -0500
Subject: [PATCH 13/39] elinks: Add libbz2 dependency

---
 packages/elinks/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/elinks/build.sh b/packages/elinks/build.sh
index 8a8904649..b67ed9a04 100644
--- a/packages/elinks/build.sh
+++ b/packages/elinks/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://elinks.or.cz
 TERMUX_PKG_DESCRIPTION="Full-Featured Text WWW Browser"
 TERMUX_PKG_VERSION=0.12pre6
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://elinks.or.cz/download/elinks-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libexpat, libidn, openssl"
+TERMUX_PKG_DEPENDS="libexpat, libidn, openssl, libbz2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-256-colors --with-openssl --mandir=$TERMUX_PREFIX/share/man"

From 52cedfe48cf24c3e907e9396a087584784537139 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 15:19:50 -0500
Subject: [PATCH 14/39] flex: Configure path to m4. Add dependency on m4.

---
 packages/flex/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/flex/build.sh b/packages/flex/build.sh
index e264f172c..40e8e067f 100644
--- a/packages/flex/build.sh
+++ b/packages/flex/build.sh
@@ -1,4 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://flex.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Fast lexical analyser generator"
 TERMUX_PKG_VERSION=2.6.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/flex/flex-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_DEPENDS="m4"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="ac_cv_path_M4=$TERMUX_PREFIX/bin/m4"

From b7abed4fd537dc95b5457b4cae4278e3331c1ace Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 15:28:32 -0500
Subject: [PATCH 15/39] binutils: Prepare for 64-bit build

---
 ...native_lib_dirs.patch => native_lib_dirs.patch32} |  0
 packages/binutils/native_lib_dirs.patch64            | 12 ++++++++++++
 2 files changed, 12 insertions(+)
 rename packages/binutils/{native_lib_dirs.patch => native_lib_dirs.patch32} (100%)
 create mode 100644 packages/binutils/native_lib_dirs.patch64

diff --git a/packages/binutils/native_lib_dirs.patch b/packages/binutils/native_lib_dirs.patch32
similarity index 100%
rename from packages/binutils/native_lib_dirs.patch
rename to packages/binutils/native_lib_dirs.patch32
diff --git a/packages/binutils/native_lib_dirs.patch64 b/packages/binutils/native_lib_dirs.patch64
new file mode 100644
index 000000000..b4415bf7c
--- /dev/null
+++ b/packages/binutils/native_lib_dirs.patch64
@@ -0,0 +1,12 @@
+diff -r -u ../binutils-2.24/ld/configure.tgt ./ld/configure.tgt
+--- ../binutils-2.24/ld/configure.tgt	2013-11-26 12:37:33.000000000 +0100
++++ ./ld/configure.tgt	2014-02-12 18:06:26.000000000 +0100
+@@ -769,7 +769,7 @@
+ 
+ esac
+ 
+-NATIVE_LIB_DIRS='/usr/local/lib /lib /usr/lib'
++NATIVE_LIB_DIRS='/system/lib64'
+ case "${target}" in
+ 
+ *-*-dragonfly*)

From 59b03545abd0b27a2bf159461cefd898ce5cb9d0 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 17:40:13 -0500
Subject: [PATCH 16/39] ca-certificates: Update to latest

---
 packages/ca-certificates/build.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh
index ed4b48663..aabfdfb20 100644
--- a/packages/ca-certificates/build.sh
+++ b/packages/ca-certificates/build.sh
@@ -1,13 +1,12 @@
 TERMUX_PKG_HOMEPAGE=http://curl.haxx.se/docs/caextract.html
 TERMUX_PKG_DESCRIPTION="Common CA certificates"
-TERMUX_PKG_VERSION=20151028
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=20160122
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 
 termux_step_make_install () {
 	CERTFILE=$TERMUX_PKG_TMPDIR/cert.pem
 	curl -o $CERTFILE https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt
-	if grep -q 'SHA1: 6d7d2f0a4fae587e7431be191a081ac1257d300a' $CERTFILE; then
+	if grep -q 'SHA1: 0ab47e2f41518f8d223eab517cb799e5b071231e' $CERTFILE; then
 		CERT_DIR=$TERMUX_PREFIX/etc/tls
 		mkdir -p $CERT_DIR
 		mv $CERTFILE $CERT_DIR/cert.pem

From 6dd6c071a0e2725a235fea78a24a7ea5c0f2df12 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 17:58:16 -0500
Subject: [PATCH 17/39] golang: Update from 1.6beta2 to 1.6rc1

---
 packages/golang/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/golang/build.sh b/packages/golang/build.sh
index 5a3cafc36..9d6316705 100644
--- a/packages/golang/build.sh
+++ b/packages/golang/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://golang.org/
 TERMUX_PKG_DESCRIPTION="Go programming language compiler"
-_MAJOR_VERSION=1.6beta2
+_MAJOR_VERSION=1.6rc1
 # Need to be considered a higher version than "1.5rc1":
 TERMUX_PKG_VERSION=1:$_MAJOR_VERSION
 TERMUX_PKG_SRCURL=https://storage.googleapis.com/golang/go${_MAJOR_VERSION}.src.tar.gz

From 6babd0d915bd0ce5d7beb81bb4819a0901c4d9ce Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 28 Jan 2016 18:31:31 -0500
Subject: [PATCH 18/39] dialog: Update to latest version

---
 packages/dialog/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dialog/build.sh b/packages/dialog/build.sh
index 1228c8974..ca81b007b 100755
--- a/packages/dialog/build.sh
+++ b/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.2-20150920"
+TERMUX_PKG_VERSION="1.3-20160126"
 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"

From d5dc248a8880d91db8ad4145eafe3df96ff67b82 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 04:00:43 -0500
Subject: [PATCH 19/39] stunnel: Update from 5.29 to 5.30

---
 packages/stunnel/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stunnel/build.sh b/packages/stunnel/build.sh
index 8085c5add..4975b91b1 100644
--- a/packages/stunnel/build.sh
+++ b/packages/stunnel/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/
 TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications"
-TERMUX_PKG_VERSION=5.29
+TERMUX_PKG_VERSION=5.30
 TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="openssl, libutil"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips"

From 41d50be2e2374827290b413060b3fe7727a07f54 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 05:24:06 -0500
Subject: [PATCH 20/39] imagemagick: Update to latest version

---
 packages/imagemagick/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 31df5b1d1..aab5539bd 100644
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.imagemagick.org/
 TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats"
-TERMUX_PKG_VERSION="6.9.3-1"
+TERMUX_PKG_VERSION="6.9.3-2"
 TERMUX_PKG_SRCURL=http://www.imagemagick.org/download/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-largefile --without-x --with-magick-plus-plus=no	--with-bzlib=no --with-xml=yes --with-lzma ac_cv_func_ftime=no ac_cv_header_complex_h=no"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/Magick-config bin/MagickCore-config bin/MagickWand-config bin/Wand-config share/ImageMagick-6/francais.xml share/man/man1/Magick-config.1 share/man/man1/MagickCore-config.1 share/man/man1/MagickWand-config.1 share/man/man1/Wand-config.1"

From de342bf4da3d126211915f8abf4d81ad2285557e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 05:24:19 -0500
Subject: [PATCH 21/39] ffmpeg: Update from 2.8.4 to 2.8.5

---
 packages/ffmpeg/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 3a873d8b9..a0692e429 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,6 +1,6 @@
 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.4
+TERMUX_PKG_VERSION=2.8.5
 TERMUX_PKG_SRCURL=https://github.com/FFmpeg/FFmpeg/archive/n${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME=FFmpeg-n$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:

From 1c0a06eae90ee3198d956bdef351f30488c0bd94 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 05:24:33 -0500
Subject: [PATCH 22/39] parallel: Update to latest version

---
 packages/parallel/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/parallel/build.sh b/packages/parallel/build.sh
index 3cf980801..69652af21 100644
--- a/packages/parallel/build.sh
+++ b/packages/parallel/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/parallel/
 TERMUX_PKG_DESCRIPTION="GNU Parallel is a shell tool for executing jobs in parallel using one or more machines"
-TERMUX_PKG_VERSION=20151222
+TERMUX_PKG_VERSION=20160122
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/parallel/parallel-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="perl"

From af0d7b02802692730b49762f43733466228f33ed Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 08:24:49 -0500
Subject: [PATCH 23/39] elinks: Avoid linking to libgc

---
 packages/elinks/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/elinks/build.sh b/packages/elinks/build.sh
index b67ed9a04..93f0fc2f2 100644
--- a/packages/elinks/build.sh
+++ b/packages/elinks/build.sh
@@ -4,4 +4,4 @@ TERMUX_PKG_VERSION=0.12pre6
 TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://elinks.or.cz/download/elinks-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libexpat, libidn, openssl, libbz2"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-256-colors --with-openssl --mandir=$TERMUX_PREFIX/share/man"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-256-colors --with-openssl --mandir=$TERMUX_PREFIX/share/man --without-gc"

From 66ccf9b586917f07d36d24a12184056a68aa78e6 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 29 Jan 2016 10:08:17 -0500
Subject: [PATCH 24/39] macchanger: Add new package

---
 packages/macchanger/autogen.sh.patch | 11 +++++++++++
 packages/macchanger/build.sh         | 12 ++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 packages/macchanger/autogen.sh.patch
 create mode 100644 packages/macchanger/build.sh

diff --git a/packages/macchanger/autogen.sh.patch b/packages/macchanger/autogen.sh.patch
new file mode 100644
index 000000000..d6b2ba1fb
--- /dev/null
+++ b/packages/macchanger/autogen.sh.patch
@@ -0,0 +1,11 @@
+diff -u -r ../macchanger-1.7.0/autogen.sh ./autogen.sh
+--- ../macchanger-1.7.0/autogen.sh	2014-01-01 12:10:25.000000000 -0500
++++ ./autogen.sh	2016-01-28 15:39:53.656299665 -0500
+@@ -84,7 +84,6 @@
+   exit;
+ fi
+ 
+-./configure "$@"
+ 
+ echo
+ echo "Now type 'make' to compile $PROJECT."
diff --git a/packages/macchanger/build.sh b/packages/macchanger/build.sh
new file mode 100644
index 000000000..8d5f3fa98
--- /dev/null
+++ b/packages/macchanger/build.sh
@@ -0,0 +1,12 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/alobbs/macchanger
+TERMUX_PKG_DESCRIPTION="Utility that makes the maniputation of MAC addresses of network interfaces easier"
+TERMUX_PKG_VERSION=1.7.0
+TERMUX_PKG_SRCURL=https://github.com/alobbs/macchanger/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_FOLDERNAME=macchanger-${TERMUX_PKG_VERSION}
+# TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
+# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
+
+termux_step_pre_configure() {
+	cd $TERMUX_PKG_SRCDIR
+	./autogen.sh
+}

From f5562736b59f3dee1b9edbe8b9d0a687fc607d61 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 31 Jan 2016 09:24:51 -0500
Subject: [PATCH 25/39] Add racket to disabled-packages/

---
 disabled-packages/racket/build.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 disabled-packages/racket/build.sh

diff --git a/disabled-packages/racket/build.sh b/disabled-packages/racket/build.sh
new file mode 100644
index 000000000..b59cd9a0e
--- /dev/null
+++ b/disabled-packages/racket/build.sh
@@ -0,0 +1,13 @@
+TERMUX_PKG_HOMEPAGE=https://racket-lang.org
+TERMUX_PKG_DESCRIPTION="Full-spectrum programming language going beyond Lisp and Scheme"
+TERMUX_PKG_VERSION=6.3
+TERMUX_PKG_SRCURL=https://mirror.racket-lang.org/releases/6.3/installers/racket-minimal-${TERMUX_PKG_VERSION}-src-builtpkgs.tgz
+TERMUX_PKG_DEPENDS="libffi, libandroid-support"
+# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
+# TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_FOLDERNAME=racket-${TERMUX_PKG_VERSION}
+TERMUX_MAKE_PROCESSES=1
+
+termux_step_post_extract_package () {
+	export TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
+}

From be0d31241fa3d89c0737d13b97890eac6a5dfcb8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 31 Jan 2016 09:25:09 -0500
Subject: [PATCH 26/39] Build specific commit for libvterm

---
 packages/libvterm/build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/libvterm/build.sh b/packages/libvterm/build.sh
index c42fa0889..35481bc81 100644
--- a/packages/libvterm/build.sh
+++ b/packages/libvterm/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://libvterm.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Terminal emulator library"
-TERMUX_PKG_VERSION=0.0.`date "+%Y%m%d%H%M"`
-TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/master.zip
-TERMUX_PKG_FOLDERNAME="libvterm-master"
+# libvterm does not do releases, take a specific commit for now:
+TERMUX_PKG_VERSION=0.0.201601301200
+TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c.zip
+TERMUX_PKG_FOLDERNAME=libvterm-a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 termux_step_make () {

From 362ea152144e3a692448dc85a67c5e8646432b4b Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 31 Jan 2016 09:29:07 -0500
Subject: [PATCH 27/39] Add tinyscheme

---
 packages/tinyscheme/build.sh       | 17 +++++++++++++++++
 packages/tinyscheme/makefile.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 packages/tinyscheme/build.sh
 create mode 100644 packages/tinyscheme/makefile.patch

diff --git a/packages/tinyscheme/build.sh b/packages/tinyscheme/build.sh
new file mode 100644
index 000000000..bbfd8082b
--- /dev/null
+++ b/packages/tinyscheme/build.sh
@@ -0,0 +1,17 @@
+TERMUX_PKG_HOMEPAGE=http://tinyscheme.sourceforge.net/home.html
+TERMUX_PKG_DESCRIPTION="Very small scheme implementation"
+TERMUX_PKG_VERSION=1.41
+TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyscheme-1.41/tinyscheme-1.41.tar.gz
+TERMUX_PKG_BUILD_IN_SRC=yes
+# TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
+# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
+
+AR+=" crs"
+LD=$CC
+
+# TODO: Add the tsx extension with file/networking (http://heras-gilsanz.com/manuel/tsx.html)
+#       and the regexp extension (http://downloads.sourceforge.net/project/tinyscheme/tinyscheme-regex/1.3/re-1.3.tar.gz)
+#termux_step_pre_make () {
+#TSX_TARFILE=$TERMUX_PKG_CACHEDIR/tsx-1.1.tar.gz
+#test ! -f $TSX_TARFILE && curl -o $TSX_TARFILE "http://heras-gilsanz.com/manuel/tsx-1.1.tgz"
+#}
diff --git a/packages/tinyscheme/makefile.patch b/packages/tinyscheme/makefile.patch
new file mode 100644
index 000000000..7d05976c8
--- /dev/null
+++ b/packages/tinyscheme/makefile.patch
@@ -0,0 +1,30 @@
+diff -u -r ../tinyscheme-1.41/makefile ./makefile
+--- ../tinyscheme-1.41/makefile	2013-04-14 16:08:33.000000000 -0400
++++ ./makefile	2016-01-24 18:02:10.122962806 -0500
+@@ -18,7 +18,6 @@
+ #AR= echo
+ 
+ # Unix, generally
+-CC = gcc -fpic -pedantic
+ DEBUG=-g -Wall -Wno-char-subscripts -O
+ Osuf=o
+ SOsuf=so
+@@ -27,11 +26,8 @@
+ LIBPREFIX=lib
+ OUT = -o $@
+ RM= -rm -f
+-AR= ar crs
+ 
+ # Linux
+-LD = gcc
+-LDFLAGS = -shared
+ DEBUG=-g -Wno-char-subscripts -O
+ SYS_LIBS= -ldl -lm
+ PLATFORM_FEATURES= -DSUN_DL=1
+@@ -96,3 +92,6 @@
+ tags: TAGS
+ TAGS: $(TAGS_SRCS)
+ 	etags $(TAGS_SRCS)
++
++install: scheme
++	cp scheme @TERMUX_PREFIX@/bin/tinyscheme

From 66d8fddacc464dadc63e7f94573c6525a8d44908 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 2 Feb 2016 10:35:07 -0500
Subject: [PATCH 28/39] Add libev package

---
 packages/libev/Makefile.in.patch | 12 ++++++++++++
 packages/libev/build.sh          |  6 ++++++
 2 files changed, 18 insertions(+)
 create mode 100644 packages/libev/Makefile.in.patch
 create mode 100644 packages/libev/build.sh

diff --git a/packages/libev/Makefile.in.patch b/packages/libev/Makefile.in.patch
new file mode 100644
index 000000000..1ec49c39a
--- /dev/null
+++ b/packages/libev/Makefile.in.patch
@@ -0,0 +1,12 @@
+diff -u -r ../libev-4.22/Makefile.in ./Makefile.in
+--- ../libev-4.22/Makefile.in	2015-12-20 16:12:45.000000000 -0500
++++ ./Makefile.in	2016-02-02 10:30:17.445084694 -0500
+@@ -343,7 +343,7 @@
+ 	     ev.3 ev.pod Symbols.ev Symbols.event
+ 
+ man_MANS = ev.3
+-include_HEADERS = ev.h ev++.h event.h
++include_HEADERS = ev.h ev++.h
+ lib_LTLIBRARIES = libev.la
+ libev_la_SOURCES = ev.c event.c
+ libev_la_LDFLAGS = -version-info $(VERSION_INFO)
diff --git a/packages/libev/build.sh b/packages/libev/build.sh
new file mode 100644
index 000000000..9d7212a14
--- /dev/null
+++ b/packages/libev/build.sh
@@ -0,0 +1,6 @@
+TERMUX_PKG_HOMEPAGE=http://software.schmorp.de/pkg/libev.html
+TERMUX_PKG_DESCRIPTION="Full-featured and high-performance event loop library"
+TERMUX_PKG_VERSION=4.22
+TERMUX_PKG_SRCURL=http://dist.schmorp.de/libev/libev-${TERMUX_PKG_VERSION}.tar.gz
+
+CFLAGS+=" -Dfd_mask=int"

From 60a83ae5b60940f1eabf3f1467d9ba3f177ce8b8 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 2 Feb 2016 10:37:04 -0500
Subject: [PATCH 29/39] Add some disabled packages

---
 disabled-packages/duplicity/build.sh          | 20 ++++++++++++++++
 disabled-packages/duplicity/setup.py.patch    | 13 ++++++++++
 disabled-packages/python2-lockfile/build.sh   | 15 ++++++++++++
 disabled-packages/python2-paramiko/build.sh   | 18 ++++++++++++++
 disabled-packages/python2-pycryptopp/build.sh | 24 +++++++++++++++++++
 .../python2-pycryptopp/setup.py.patch         | 23 ++++++++++++++++++
 6 files changed, 113 insertions(+)
 create mode 100644 disabled-packages/duplicity/build.sh
 create mode 100644 disabled-packages/duplicity/setup.py.patch
 create mode 100644 disabled-packages/python2-lockfile/build.sh
 create mode 100644 disabled-packages/python2-paramiko/build.sh
 create mode 100644 disabled-packages/python2-pycryptopp/build.sh
 create mode 100644 disabled-packages/python2-pycryptopp/setup.py.patch

diff --git a/disabled-packages/duplicity/build.sh b/disabled-packages/duplicity/build.sh
new file mode 100644
index 000000000..77367afec
--- /dev/null
+++ b/disabled-packages/duplicity/build.sh
@@ -0,0 +1,20 @@
+TERMUX_PKG_HOMEPAGE=http://duplicity.nongnu.org/
+TERMUX_PKG_DESCRIPTION="Encrypted bandwidth-efficient backup using the rsync algorithm"
+TERMUX_PKG_VERSION=0.7.06
+TERMUX_PKG_SRCURL=https://code.launchpad.net/duplicity/0.7-series/${TERMUX_PKG_VERSION}/+download/duplicity-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="librsync, python2, python2-lockfile"
+TERMUX_PKG_BUILD_IN_SRC="yes"
+
+termux_step_make_install () {
+	pip install http://pypi.python.org/packages/source/d/distutilscross/distutilscross-0.1.tar.gz
+
+	export PYTHONXCPREFIX=$TERMUX_PREFIX
+	export LDSHARED="${CC} -shared -lpython2.7"
+
+	python setup.py build -x
+	python setup.py install --prefix=$TERMUX_PREFIX --force
+}
+
+termux_step_post_massage () {
+	find . -path '*.pyc' -delete
+}
diff --git a/disabled-packages/duplicity/setup.py.patch b/disabled-packages/duplicity/setup.py.patch
new file mode 100644
index 000000000..5f0259ee6
--- /dev/null
+++ b/disabled-packages/duplicity/setup.py.patch
@@ -0,0 +1,13 @@
+diff -u -r ../duplicity-0.7.06/setup.py ./setup.py
+--- ../duplicity-0.7.06/setup.py	2015-12-07 07:03:39.000000000 -0500
++++ ./setup.py	2016-01-20 18:58:46.049638771 -0500
+@@ -34,7 +34,8 @@
+     print("Sorry, duplicity requires version 2.6 or 2.7 of python.")
+     sys.exit(1)
+ 
+-incdir_list = libdir_list = None
++incdir_list = ['@TERMUX_PREFIX@/include', '@TERMUX_PREFIX@/include/python2.7']
++libdir_list = ['@TERMUX_PREFIX@/lib']
+ 
+ if os.name == 'posix':
+     LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
diff --git a/disabled-packages/python2-lockfile/build.sh b/disabled-packages/python2-lockfile/build.sh
new file mode 100644
index 000000000..87f01cf51
--- /dev/null
+++ b/disabled-packages/python2-lockfile/build.sh
@@ -0,0 +1,15 @@
+TERMUX_PKG_HOMEPAGE=https://pypi.python.org/pypi/lockfile
+TERMUX_PKG_DESCRIPTION="Platform-independent file locking module for python 2"
+TERMUX_PKG_VERSION=0.12.2
+TERMUX_PKG_SRCURL=https://pypi.python.org/packages/source/l/lockfile/lockfile-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="python2"
+TERMUX_PKG_BUILD_IN_SRC=yes
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
+
+termux_step_make_install () {
+        python setup.py install --prefix=$TERMUX_PREFIX --force
+}
+
+termux_step_post_massage () {
+	find . -path '*.pyc' -delete
+}
diff --git a/disabled-packages/python2-paramiko/build.sh b/disabled-packages/python2-paramiko/build.sh
new file mode 100644
index 000000000..582fef9a3
--- /dev/null
+++ b/disabled-packages/python2-paramiko/build.sh
@@ -0,0 +1,18 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/paramiko/paramiko
+TERMUX_PKG_DESCRIPTION="Native Python 2 SSHv2 protocol library"
+TERMUX_PKG_VERSION=1.16.0
+TERMUX_PKG_SRCURL=https://github.com/paramiko/paramiko/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_FOLDERNAME=paramiko-$TERMUX_PKG_VERSION
+TERMUX_PKG_DEPENDS="python2"
+TERMUX_PKG_BUILD_IN_SRC=yes
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
+
+termux_step_make_install () {
+	export PYTHONUSERBASE=$TERMUX_PREFIX
+#python setup.py install --force --prefix=$TERMUX_PREFIX
+	python setup.py install --force --user
+}
+
+termux_step_post_massage () {
+	find . -path '*.pyc' -delete
+}
diff --git a/disabled-packages/python2-pycryptopp/build.sh b/disabled-packages/python2-pycryptopp/build.sh
new file mode 100644
index 000000000..fc40e974c
--- /dev/null
+++ b/disabled-packages/python2-pycryptopp/build.sh
@@ -0,0 +1,24 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/tahoe-lafs/pycryptopp
+TERMUX_PKG_DESCRIPTION="Python 2 interfaces to a few good crypto algorithms"
+TERMUX_PKG_VERSION=0.6.0
+TERMUX_PKG_SRCURL=https://github.com/tahoe-lafs/pycryptopp/archive/pycryptopp-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_FOLDERNAME=pycryptopp-pycryptopp-$TERMUX_PKG_VERSION
+TERMUX_PKG_DEPENDS="python2"
+TERMUX_PKG_BUILD_IN_SRC="yes"
+
+termux_step_make_install () {
+	pip install http://pypi.python.org/packages/source/d/distutilscross/distutilscross-0.1.tar.gz
+
+	export PYTHONXCPREFIX=$TERMUX_PREFIX
+	export LDSHARED="${CC} -shared -lpython2.7"
+
+	echo "__version__ = '$TERMUX_PKG_VERSION'" > src/pycryptopp/_version.py
+
+	python setup.py build -x
+	export PYTHONUSERBASE=$TERMUX_PREFIX/lib/python2.7/site-packages/
+	python setup.py install --prefix=$TERMUX_PREFIX --force --user
+}
+
+termux_step_post_massage () {
+	find . -path '*.pyc' -delete
+}
diff --git a/disabled-packages/python2-pycryptopp/setup.py.patch b/disabled-packages/python2-pycryptopp/setup.py.patch
new file mode 100644
index 000000000..0cbc56dd5
--- /dev/null
+++ b/disabled-packages/python2-pycryptopp/setup.py.patch
@@ -0,0 +1,23 @@
+diff -u -r ../pycryptopp-pycryptopp-0.6.0/setup.py ./setup.py
+--- ../pycryptopp-pycryptopp-0.6.0/setup.py	2012-03-13 04:16:09.000000000 -0400
++++ ./setup.py	2016-01-20 19:54:13.085989935 -0500
+@@ -57,8 +57,8 @@
+ undef_macros=[]
+ libraries=[]
+ ext_modules=[]
+-include_dirs=[]
+-library_dirs=[]
++include_dirs = ['/data/data/com.termux/files/usr/include', '/data/data/com.termux/files/usr/include/python2.7']
++library_dirs = ['/data/data/com.termux/files/usr/lib']
+ extra_srcs=[] # This is for Crypto++ .cpp files if they are needed.
+ 
+ #
+@@ -208,7 +208,7 @@
+                 for s in os.listdir(os.path.join("src-ed25519","supercop-ref"))
+                 if s.endswith(".c") and s!="test.c"])
+ m = Extension("pycryptopp.publickey.ed25519._ed25519",
+-              include_dirs=[os.path.join("src-ed25519","supercop-ref")],
++              include_dirs=[os.path.join("src-ed25519","supercop-ref")] + include_dirs,
+               sources=sources)
+ ext_modules.append(m)
+ 

From 68a532740cb7039409723d0f0e5184482ab5145a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 2 Feb 2016 16:25:46 -0500
Subject: [PATCH 30/39] apt: Add methods/store added to apt in 1.2

---
 packages/apt/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 398630af7..399fabff0 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -2,6 +2,7 @@ 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_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:
@@ -44,7 +45,7 @@ termux_step_make_install () {
         mkdir -p $TERMUX_PREFIX/lib/apt/methods $TERMUX_PREFIX/share/man/man{5,8}
         cp $TERMUX_PKG_BUILDDIR/docs/apt{,-cache,-get}.8 $TERMUX_PREFIX/share/man/man8/
         cp $TERMUX_PKG_BUILDDIR/docs/{apt.conf,sources.list}.5 $TERMUX_PREFIX/share/man/man5/
-        cp $TERMUX_PKG_BUILDDIR/bin/methods/{copy,file,gpgv,gzip,http,https} $TERMUX_PREFIX/lib/apt/methods
+        cp $TERMUX_PKG_BUILDDIR/bin/methods/{copy,file,gpgv,gzip,http,https,store} $TERMUX_PREFIX/lib/apt/methods
         (cd $TERMUX_PREFIX/lib/apt/methods; ln -f -s gzip xz)
 
         mkdir -p $TERMUX_PREFIX/etc/apt

From eba389771371618b5f74e62f3e9da58d02d2fa55 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 3 Feb 2016 09:23:58 -0500
Subject: [PATCH 31/39] tinyscheme: Fix non-PIE binary and init.scm path

Fixes #134.
---
 packages/tinyscheme/build.sh       |  8 ++++++--
 packages/tinyscheme/makefile.patch | 11 ++++++++++-
 packages/tinyscheme/schema.c.patch | 12 ++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 packages/tinyscheme/schema.c.patch

diff --git a/packages/tinyscheme/build.sh b/packages/tinyscheme/build.sh
index bbfd8082b..002a0d577 100644
--- a/packages/tinyscheme/build.sh
+++ b/packages/tinyscheme/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://tinyscheme.sourceforge.net/home.html
 TERMUX_PKG_DESCRIPTION="Very small scheme implementation"
 TERMUX_PKG_VERSION=1.41
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyscheme-1.41/tinyscheme-1.41.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
-# TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl --disable-iri"
 
 AR+=" crs"
 LD=$CC
@@ -15,3 +14,8 @@ LD=$CC
 #TSX_TARFILE=$TERMUX_PKG_CACHEDIR/tsx-1.1.tar.gz
 #test ! -f $TSX_TARFILE && curl -o $TSX_TARFILE "http://heras-gilsanz.com/manuel/tsx-1.1.tgz"
 #}
+
+termux_step_post_make_install () {
+	mkdir -p $TERMUX_PREFIX/share/tinyscheme/
+	cp $TERMUX_PKG_SRCDIR/init.scm $TERMUX_PREFIX/share/tinyscheme/
+}
diff --git a/packages/tinyscheme/makefile.patch b/packages/tinyscheme/makefile.patch
index 7d05976c8..8a51ddef7 100644
--- a/packages/tinyscheme/makefile.patch
+++ b/packages/tinyscheme/makefile.patch
@@ -1,6 +1,6 @@
 diff -u -r ../tinyscheme-1.41/makefile ./makefile
 --- ../tinyscheme-1.41/makefile	2013-04-14 16:08:33.000000000 -0400
-+++ ./makefile	2016-01-24 18:02:10.122962806 -0500
++++ ./makefile	2016-02-03 07:50:01.896212523 -0500
 @@ -18,7 +18,6 @@
  #AR= echo
  
@@ -21,6 +21,15 @@ diff -u -r ../tinyscheme-1.41/makefile ./makefile
  DEBUG=-g -Wno-char-subscripts -O
  SYS_LIBS= -ldl -lm
  PLATFORM_FEATURES= -DSUN_DL=1
+@@ -77,7 +73,7 @@
+ 	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
+ 
+ scheme$(EXE_EXT): $(OBJS)
+-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
++	$(CC) $(CFLAGS) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
+ 
+ $(STATICLIBTARGET): $(OBJS)
+ 	$(AR) $@ $(OBJS)
 @@ -96,3 +92,6 @@
  tags: TAGS
  TAGS: $(TAGS_SRCS)
diff --git a/packages/tinyscheme/schema.c.patch b/packages/tinyscheme/schema.c.patch
new file mode 100644
index 000000000..9e0698c5b
--- /dev/null
+++ b/packages/tinyscheme/schema.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../tinyscheme-1.41/scheme.c ./scheme.c
+--- ../tinyscheme-1.41/scheme.c	2013-04-14 16:08:33.000000000 -0400
++++ ./scheme.c	2016-02-03 08:22:19.137873950 -0500
+@@ -101,7 +101,7 @@
+ #endif
+ 
+ #ifndef InitFile
+-# define InitFile "init.scm"
++# define InitFile "@TERMUX_PREFIX@/share/tinyscheme/init.scm"
+ #endif
+ 
+ #ifndef FIRST_CELLSEGS

From 351431c6e7b0d9e958a6ad296e6955309ab7bd1a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 3 Feb 2016 16:26:13 -0500
Subject: [PATCH 32/39] libgnutls and libnettle: Update to latest versions

---
 packages/libgnutls/build.sh | 2 +-
 packages/libnettle/build.sh | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/libgnutls/build.sh b/packages/libgnutls/build.sh
index d09fcd5b6..379194488 100644
--- a/packages/libgnutls/build.sh
+++ b/packages/libgnutls/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.gnutls.org/
 TERMUX_PKG_DESCRIPTION="Secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them"
 TERMUX_PKG_DEPENDS="libgmp, libnettle, ca-certificates, libidn"
 _TERMUX_PKG_MAJOR_VERSION=3.4
-TERMUX_PKG_VERSION=${_TERMUX_PKG_MAJOR_VERSION}.8
+TERMUX_PKG_VERSION=${_TERMUX_PKG_MAJOR_VERSION}.9
 TERMUX_PKG_SRCURL=ftp://ftp.gnutls.org/gcrypt/gnutls/v${_TERMUX_PKG_MAJOR_VERSION}/gnutls-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-hardware-acceleration --disable-cxx --disable-openssl-compatibility --with-included-libtasn1 --without-p11-kit --with-default-trust-store-file=$TERMUX_PREFIX/etc/tls/cert.pem"
 
diff --git a/packages/libnettle/build.sh b/packages/libnettle/build.sh
index 97f10a603..0d875334f 100644
--- a/packages/libnettle/build.sh
+++ b/packages/libnettle/build.sh
@@ -1,7 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
 TERMUX_PKG_DESCRIPTION="Cryptographic library that is designed to fit easily in more or less any context"
 TERMUX_PKG_DEPENDS="libgmp"
-TERMUX_PKG_VERSION=3.1.1
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=3.2
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/nettle/nettle-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static" # needed for building

From 3a19b11880a7734a414f6c4f572426fedbc5d591 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 4 Feb 2016 09:30:24 -0500
Subject: [PATCH 33/39] libtool: Correct paths to some binaries

---
 packages/libtool/build.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/libtool/build.sh b/packages/libtool/build.sh
index 7ce44d47a..3a5f4fe01 100644
--- a/packages/libtool/build.sh
+++ b/packages/libtool/build.sh
@@ -1,4 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libtool/
 TERMUX_PKG_DESCRIPTION="Generic library support script hiding the complexity of using shared libraries behind a consistent, portable interface"
+TERMUX_PKG_DEPENDS="bash,grep,sed"
 TERMUX_PKG_VERSION=2.4.6
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://ftpmirror.gnu.org/libtool/libtool-${TERMUX_PKG_VERSION}.tar.gz
+
+termux_step_post_make_install () {
+	perl -p -i -e "s|\"/bin/|\"$TERMUX_PREFIX/bin/|" $TERMUX_PREFIX/bin/{libtool,libtoolize}
+}

From de726e938112d4ea2c3985f1a4b1660dfc260809 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 4 Feb 2016 09:38:32 -0500
Subject: [PATCH 34/39] libtool: Remove specs flag

---
 packages/libtool/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/libtool/build.sh b/packages/libtool/build.sh
index 3a5f4fe01..4ad88c829 100644
--- a/packages/libtool/build.sh
+++ b/packages/libtool/build.sh
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libtool/
 TERMUX_PKG_DESCRIPTION="Generic library support script hiding the complexity of using shared libraries behind a consistent, portable interface"
 TERMUX_PKG_DEPENDS="bash,grep,sed"
 TERMUX_PKG_VERSION=2.4.6
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftpmirror.gnu.org/libtool/libtool-${TERMUX_PKG_VERSION}.tar.gz
 
 termux_step_post_make_install () {
 	perl -p -i -e "s|\"/bin/|\"$TERMUX_PREFIX/bin/|" $TERMUX_PREFIX/bin/{libtool,libtoolize}
+	perl -p -i -e "s|${_SPECSFLAG}||g" $TERMUX_PREFIX/bin/{libtool,libtoolize}
 }

From 190ed8edcedbb8df0c68b87f47b69cb24acc9f59 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 5 Feb 2016 18:00:22 -0500
Subject: [PATCH 35/39] neovim: Update patch to apply against master

---
 packages/neovim/runtime-CMakeLists.txt.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/neovim/runtime-CMakeLists.txt.patch b/packages/neovim/runtime-CMakeLists.txt.patch
index ba45d1310..00fc72116 100644
--- a/packages/neovim/runtime-CMakeLists.txt.patch
+++ b/packages/neovim/runtime-CMakeLists.txt.patch
@@ -1,12 +1,12 @@
 diff -u -r ../neovim-master/runtime/CMakeLists.txt ./runtime/CMakeLists.txt
---- ../neovim-master/runtime/CMakeLists.txt	2015-08-03 15:36:33.000000000 -0400
-+++ ./runtime/CMakeLists.txt	2015-08-03 17:38:07.657949138 -0400
-@@ -35,7 +35,7 @@
+--- ../neovim-master/runtime/CMakeLists.txt	2016-02-05 10:02:38.000000000 -0500
++++ ./runtime/CMakeLists.txt	2016-02-05 17:56:54.645492669 -0500
+@@ -32,7 +32,7 @@
+ )
+ 
  add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
-   COMMAND ${CMAKE_COMMAND} -E copy_directory
-     ${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
 -  COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
 +  COMMAND "${PROJECT_BINARY_DIR}/../host-build/bin/nvim"
      -u NONE
      -i NONE
-     -esX
+     -es

From c734c1a3c547d170e3bcd50bcb5f199a8e699219 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 5 Feb 2016 18:04:36 -0500
Subject: [PATCH 36/39] grep: Update from 2.22 to 2.23

---
 packages/grep/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grep/build.sh b/packages/grep/build.sh
index 84a11852a..0cecf9d40 100644
--- a/packages/grep/build.sh
+++ b/packages/grep/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/grep/
 TERMUX_PKG_DESCRIPTION="Command which searches one or more input files for lines containing a match to a specified pattern"
 TERMUX_PKG_DEPENDS="pcre"
-TERMUX_PKG_VERSION=2.22
+TERMUX_PKG_VERSION=2.23
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/grep/grep-${TERMUX_PKG_VERSION}.tar.xz

From 08e7f324ff8f06b519c8b90a8697ed214df0e9f4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 5 Feb 2016 18:05:00 -0500
Subject: [PATCH 37/39] debianutils: Update from 4.5.1 to 4.7

---
 packages/debianutils/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/debianutils/build.sh b/packages/debianutils/build.sh
index c5bc0aeb8..0aa787a57 100644
--- a/packages/debianutils/build.sh
+++ b/packages/debianutils/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://packages.debian.org/debianutils
 TERMUX_PKG_DESCRIPTION="Small utilities which are used primarily by the installation scripts of Debian packages"
-TERMUX_PKG_VERSION=4.5.1
+TERMUX_PKG_VERSION=4.7
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/d/debianutils/debianutils_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/installkernel share/man/man8/installkernel.8"
-TERMUX_PKG_FOLDERNAME=debianutils
+TERMUX_PKG_FOLDERNAME=debianutils-$TERMUX_PKG_VERSION

From ac398bf4e0b73a74ab0124cf8eb1be49b647f6ff Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 5 Feb 2016 18:05:14 -0500
Subject: [PATCH 38/39] aapt: Fix 64-bit build

---
 packages/aapt/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 8ad708502..3b8e9c439 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -52,7 +52,7 @@ termux_step_make_install () {
 
         cd libcutils
         tar xf $LIBCUTILS_TARFILE
-        rm trace.c dlmalloc_stubs.c ashmem-host.c
+        rm trace.c dlmalloc_stubs.c ashmem-host.c dir_hash.c
 
         cd ../libutils
         tar xf $LIBUTILS_TARFILE

From 4348c5262394d454c6036db05f836fe095b026fd Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 5 Feb 2016 18:05:29 -0500
Subject: [PATCH 39/39] wol: Fix 64-bit build

---
 packages/wol/lib-getline.h.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 packages/wol/lib-getline.h.patch

diff --git a/packages/wol/lib-getline.h.patch b/packages/wol/lib-getline.h.patch
new file mode 100644
index 000000000..d4d61a5ac
--- /dev/null
+++ b/packages/wol/lib-getline.h.patch
@@ -0,0 +1,24 @@
+diff -u -r ../wol-0.7.1/lib/getline.h ./lib/getline.h
+--- ../wol-0.7.1/lib/getline.h	2002-03-11 12:55:36.000000000 -0500
++++ ./lib/getline.h	2016-02-05 16:14:45.530639085 -0500
+@@ -19,20 +19,4 @@
+ 
+ # include <stdio.h>
+ 
+-# ifndef PARAMS
+-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+-#   define PARAMS(Args) Args
+-#  else
+-#   define PARAMS(Args) ()
+-#  endif
+-# endif
+-
+-# if __GLIBC__ < 2
+-int
+-getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+-
+-int
+-getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+-# endif
+-
+ #endif /* not GETLINE_H_ */