Merge pull request #144 from drudge/patch-1

Enable SFTP subsystem in openssh package

diff --git a/packages/apt/apt-pkg-deb-debindexfile.cc.patch b/packages/apt/apt-pkg-deb-debindexfile.cc.patch
new file mode 100644 (file)
index 0000000..91a19e4
--- /dev/null
+++ b/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>
+                                                                       /*}}}*/

diff --git a/packages/apt/apt-pkg-edsp-edspsystem.cc.patch b/packages/apt/apt-pkg-edsp-edspsystem.cc.patch
deleted file mode 100644 (file)
index f04bda0..0000000
--- a/packages/apt/apt-pkg-edsp-edspsystem.cc.patch
+++ /dev/null
@@ -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>

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 399fabf..0424534 100644 (file)
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -1,8 +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.2.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=1.2.3
 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:

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 42cd02c..c53b726 100755 (executable)
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,8 +2,7 @@ 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_BUILD_REVISION=2
+TERMUX_PKG_VERSION=2.7.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"

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index 68c7f42..cf72150 100755 (executable)
--- a/packages/glib/build.sh
+++ b/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__

diff --git a/packages/libsqlite/build.sh b/packages/libsqlite/build.sh
index fb6ac81..a0166c1 100755 (executable)
--- a/packages/libsqlite/build.sh
+++ b/packages/libsqlite/build.sh
@@ -1,4 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://www.sqlite.org/
 TERMUX_PKG_DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine"
-TERMUX_PKG_VERSION=3.10.1
-TERMUX_PKG_SRCURL=http://www.sqlite.org/2015/sqlite-autoconf-3080803.tar.gz
+TERMUX_PKG_VERSION=3.11.0
+TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_SRCURL=https://www.sqlite.org/2016/sqlite-autoconf-3110000.tar.gz
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-readline"

diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh
index 71950f8..84be58b 100644 (file)
--- a/packages/ncdc/build.sh
+++ b/packages/ncdc/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://dev.yorhel.nl/ncdc
 TERMUX_PKG_DESCRIPTION="Modern and lightweight direct connect client with a friendly ncurses interface"
 TERMUX_PKG_VERSION=1.19.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurses"
 

diff --git a/packages/python/build.sh b/packages/python/build.sh
index edc72d6..8276d9f 100644 (file)
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://python.org/
-TERMUX_PKG_DESCRIPTION="Programming language intended to enable clear programs on both a small and large scale"
+TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear programs"
 # lib/python3.4/lib-dynload/_ctypes.cpython-34m.so links to ffi.
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
@@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.5
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index 4d28a14..9609ff7 100644 (file)
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -1,5 +1,5 @@
 TERMUX_PKG_HOMEPAGE=http://python.org/
-TERMUX_PKG_DESCRIPTION="Programming language intended to enable clear programs on both a small and large scale"
+TERMUX_PKG_DESCRIPTION="Python 2 programming language intended to enable clear programs"
 # lib/python3.4/lib-dynload/_ctypes.cpython-34m.so links to ffi.
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
@@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=2.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.11
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

diff --git a/packages/subversion/build.sh b/packages/subversion/build.sh
index 44a6230..e84f092 100644 (file)
--- a/packages/subversion/build.sh
+++ b/packages/subversion/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://subversion.apache.org/
 TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its simplicity"
 TERMUX_PKG_VERSION=1.9.3
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-sasl --without-libmagic"

diff --git a/packages/taskwarrior/build.sh b/packages/taskwarrior/build.sh
index f9a93f0..d932520 100644 (file)
--- a/packages/taskwarrior/build.sh
+++ b/packages/taskwarrior/build.sh
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=https://taskwarrior.org
 TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list"
-TERMUX_PKG_VERSION=2.5.0
+TERMUX_PKG_VERSION=2.5.1
 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/task-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libgnutls, libuuid, libandroid-glob"