Merge pull request #186 from vaites/tesseract
authorFredrik Fornwall <fredrik@fornwall.net>
Sun, 10 Apr 2016 23:37:34 +0000 (01:37 +0200)
committerFredrik Fornwall <fredrik@fornwall.net>
Sun, 10 Apr 2016 23:37:34 +0000 (01:37 +0200)
Added Leptonica and Tesseract packages

40 files changed:
Dockerfile
disabled-packages/mosh/BROKEN.txt [deleted file]
disabled-packages/mosh/build.sh [deleted file]
disabled-packages/racket/build.sh
disabled-packages/racket/port.c.patch [new file with mode: 0644]
packages/apt/build.sh
packages/busybox/build.sh
packages/byobu/build.sh [new file with mode: 0644]
packages/command-not-found/build.sh
packages/command-not-found/commands.h
packages/cvs/build.sh [new file with mode: 0644]
packages/cvs/lib-getline.c.patch [new file with mode: 0644]
packages/cvs/lib-getline.h.patch [new file with mode: 0644]
packages/emacs/build.sh
packages/emacs/lib-src-emacsclient.c.patch [new file with mode: 0644]
packages/emacs/lisp-cus-start.el.patch.beforehostbuild [new file with mode: 0644]
packages/emacs/lisp-loadup.el.patch.beforehostbuild
packages/emacs/lisp-server.el.patch.beforehostbuild [new file with mode: 0644]
packages/git/build.sh
packages/gzip/build.sh
packages/gzip/stdio_impl_use_sfileext.patch [deleted file]
packages/gzip/zip.c.patch [deleted file]
packages/inetutils/build.sh
packages/irssi/build.sh
packages/libsqlite/build.sh
packages/mosh/build.sh [new file with mode: 0644]
packages/mutt/build.sh
packages/mutt/getdomain.c.patch [new file with mode: 0644]
packages/nodejs/build.sh
packages/nodejs/lib-os.js.patch
packages/proot/build.sh
packages/proot/termux-chroot
packages/protobuf/build.sh
packages/termux-tools/build.sh
packages/termux-tools/su
packages/tig/build.sh
packages/unzip/build.sh
packages/vim-python/build.sh
packages/vim/build.sh
packages/zbar/build.sh [new file with mode: 0644]

index 9e42af8..4d550c9 100644 (file)
@@ -55,7 +55,7 @@ RUN cd /tmp && \
     unzip ndk.zip && \
     mkdir /root/lib && \
     mv /tmp/android-sdk-linux /root/lib/android-sdk && \
-    mv /tmp/android-ndk-r11-linux-x86_64.tar.bz2 /root/lib/android-ndk && \
+    mv /tmp/android-ndk-r11 /root/lib/android-ndk && \
     rm -fr /tmp/*
 
 RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \
diff --git a/disabled-packages/mosh/BROKEN.txt b/disabled-packages/mosh/BROKEN.txt
deleted file mode 100644 (file)
index eacd155..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#0  0xb6f72b24 in std::locale::operator=(std::locale const&) () from /data/data/com.termux/files/usr/lib/libgnustl_shared.so
-#1  0xb6f71e54 in std::ios_base::_M_init() () from /data/data/com.termux/files/usr/lib/libgnustl_shared.so
-#2  0xb6f7df64 in std::basic_ios<char, std::char_traits<char> >::init(std::basic_streambuf<char, std::char_traits<char> >*) ()
-   from /data/data/com.termux/files/usr/lib/libgnustl_shared.so
-#3  0x2a012ef8 in std::basic_istream<char, std::char_traits<char> >::basic_istream (__vtt_parm=<optimized out>, this=0xb6167348, 
-    __in_chrg=<optimized out>) at /home/fornwall/lib/android-standalone-toolchain-arm-api21-gcc4.9/include/c++/4.9/istream:608
-#4  std::basic_ifstream<char, std::char_traits<char> >::basic_ifstream (__mode=(std::_S_bin | std::_S_in), 
-    __s=0x2a04a560 <rdev> "/dev/urandom", this=0xb6167348, __in_chrg=<optimized out>, __vtt_parm=<optimized out>)
-    at /home/fornwall/lib/android-standalone-toolchain-arm-api21-gcc4.9/include/c++/4.9/fstream:471
-#5  PRNG::PRNG (this=0xb6167348) at /home/fornwall/termux/mosh/src/src/frontend/../crypto/prng.h:59
-#6  Network::TransportSender<Network::UserStream>::TransportSender (this=0xb6167288, s_connection=<optimized out>, initial_state=...)
-    at /home/fornwall/termux/mosh/src/src/frontend/../network/transportsender.cc:65
-#7  0x2a01322c in Network::Transport<Network::UserStream, Terminal::Complete>::Transport (this=0xb6167100, initial_state=..., 
-    initial_remote=..., key_str=<optimized out>, ip=0xb60408cc "23.229.0.146", port=0xb6037214 "60001")
-    at /home/fornwall/termux/mosh/src/src/frontend/../network/networktransport.cc:65
-#8  0x2a009cb0 in STMClient::main_init (this=this@entry=0xbefff790) at /home/fornwall/termux/mosh/src/src/frontend/stmclient.cc:251
-#9  0x2a009ff4 in STMClient::main (this=0xbefff790) at /home/fornwall/termux/mosh/src/src/frontend/stmclient.cc:414
-#10 0x2a005f00 in main (argc=<optimized out>, argv=<optimized out>) at /home/fornwall/termux/mosh/src/src/frontend/mosh-client.cc:171
-
diff --git a/disabled-packages/mosh/build.sh b/disabled-packages/mosh/build.sh
deleted file mode 100644 (file)
index 5fcf437..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://mosh.mit.edu/
-TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-TERMUX_PKG_VERSION=1.2.5
-TERMUX_PKG_SRCURL=http://mosh.mit.edu/mosh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, protobuf, ncurses, openssl, libutil, perl"
-
-export PROTOC=$TERMUX_TOPDIR/protobuf/host-build/src/protoc
-
-LDFLAGS+=" -lgnustl_shared"
index b59cd9a..8e840c1 100644 (file)
@@ -1,13 +1,31 @@
 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_VERSION=6.4
+TERMUX_PKG_SRCURL=https://mirror.racket-lang.org/installers/${TERMUX_PKG_VERSION}/racket-minimal-${TERMUX_PKG_VERSION}-src-builtpkgs.tgz
 TERMUX_PKG_FOLDERNAME=racket-${TERMUX_PKG_VERSION}
-TERMUX_MAKE_PROCESSES=1
+TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_DEPENDS="libffi, libandroid-support"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-racket=$TERMUX_PKG_HOSTBUILD_DIR/racket/racketcgc"
+# Building racket hits the 'the wrong gcc-problem' detailed at http://www.metastatic.org/text/libtool.html
+# due to --tag=CC being used. To avoid that a cross libtool built in termux_step_post_extract_package()
+# below and used due to this configure argument:
+_CROSS_LIBTOOL_DIR=$TERMUX_PKG_CACHEDIR/libtool-cross-2.4.6-${TERMUX_HOST_PLATFORM}
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-lt=$_CROSS_LIBTOOL_DIR/bin/${TERMUX_HOST_PLATFORM}-libtool"
+
+LDFLAGS+=" -llog"
 
 termux_step_post_extract_package () {
+       if [ ! -d $_CROSS_LIBTOOL_DIR ]; then
+               LIBTOOL_TARFILE=$TERMUX_PKG_CACHEDIR/libtool-2.4.6.tar.gz
+               if [ ! -f $LIBTOOL_TARFILE ]; then
+                       curl -L -o $LIBTOOL_TARFILE http://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz
+               fi
+               cd $TERMUX_PKG_CACHEDIR
+               tar xf $LIBTOOL_TARFILE
+               cd libtool-2.4.6
+               ./configure --prefix=$_CROSS_LIBTOOL_DIR --host=$TERMUX_HOST_PLATFORM --program-prefix=${TERMUX_HOST_PLATFORM}-
+               make install
+       fi
+
        export TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
 }
diff --git a/disabled-packages/racket/port.c.patch b/disabled-packages/racket/port.c.patch
new file mode 100644 (file)
index 0000000..a9e5b12
--- /dev/null
@@ -0,0 +1,36 @@
+"The getdtablesize functions has been deprecated by Posix and has been
+removed from Android's LB64 ABI. Replace calls to it with the modern
+equivalent sysconf(_SC_OPEN_MAX)."
+
+- https://groups.google.com/a/chromium.org/forum/#!topic/chromium-reviews/AXhZapYuHi8
+
+diff -u -r ../../racket-6.4/src/racket/src/port.c ./racket/src/port.c
+--- ../../racket-6.4/src/racket/src/port.c     2016-01-14 12:11:20.000000000 -0500
++++ ./racket/src/port.c        2016-04-10 17:43:40.039414493 -0400
+@@ -1090,7 +1090,7 @@
+ # ifdef USE_ULIMIT
+     dynamic_fd_size = ulimit(4, 0);
+ # else
+-    dynamic_fd_size = getdtablesize();
++    dynamic_fd_size = sysconf(_SC_OPEN_MAX);
+ # endif
+     /* divide by bits-per-byte: */
+     dynamic_fd_size = (dynamic_fd_size + 7) >> 3;
+@@ -1365,7 +1365,7 @@
+ #    ifdef FIXED_FD_LIMIT
+     limit = FIXED_FD_LIMIT;
+ #    else
+-    limit = getdtablesize();
++    limit = sysconf(_SC_OPEN_MAX);
+ #    endif
+ #   endif
+ #  endif
+@@ -10390,7 +10390,7 @@
+ # ifdef USE_ULIMIT
+   i = ulimit(4, 0);
+ # else
+-  i = getdtablesize();
++  i = sysconf(_SC_OPEN_MAX);
+ # endif
+   while (i--) {
+     int cr;
index a4243fe..2de6732 100644 (file)
@@ -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.2.6
+TERMUX_PKG_VERSION=1.2.9
 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:
index 2a8ac8d..2ceb027 100755 (executable)
@@ -1,8 +1,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=3
+TERMUX_PKG_VERSION=1.24.2
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 
diff --git a/packages/byobu/build.sh b/packages/byobu/build.sh
new file mode 100644 (file)
index 0000000..553ba58
--- /dev/null
@@ -0,0 +1,7 @@
+TERMUX_PKG_HOMEPAGE=http://byobu.co/
+TERMUX_PKG_DESCRIPTION="Byobu is a GPLv3 open source text-based window manager and terminal multiplexer"
+TERMUX_PKG_VERSION=5.105
+TERMUX_PKG_FOLDERNAME="byobu-${TERMUX_PKG_VERSION}"
+TERMUX_PKG_SRCURL=https://launchpad.net/byobu/trunk/${TERMUX_PKG_VERSION}/+download/byobu_${TERMUX_PKG_VERSION}.orig.tar.gz
+TERMUX_PKG_DEPENDS="gawk,tmux"
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
index 4facef1..5891637 100644 (file)
@@ -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.5
+TERMUX_PKG_VERSION=1.6
 
 termux_step_make_install () {
        TERMUX_LIBEXEC_DIR=$TERMUX_PREFIX/libexec/termux
index 51b4439..bc136cd 100644 (file)
@@ -238,6 +238,9 @@ char const* const commands[] = {
 " curl",
 "curseofwar",
 " curseofwar",
+"cvs",
+" cvs",
+" rcs2log",
 "dash",
 " dash",
 " sh",
@@ -288,9 +291,9 @@ char const* const commands[] = {
 "emacs",
 " ebrowse",
 " emacs",
+" emacs-25.0.92",
 " emacsclient",
 " etags",
-" temacs",
 "espeak",
 " espeak",
 "ffmpeg",
@@ -499,7 +502,6 @@ char const* const commands[] = {
 " dnsdomainname",
 " ftp",
 " logger",
-" ping6",
 " telnet",
 " tftp",
 " traceroute",
@@ -1309,6 +1311,7 @@ char const* const commands[] = {
 " getprop",
 " logcat",
 " ping",
+" ping6",
 " pm",
 " su",
 " termux-elf-cleaner",
@@ -1356,12 +1359,14 @@ char const* const commands[] = {
 "utfdecode",
 " utfdecode",
 "vim",
+" vi",
 " view",
 " vim",
 " vimdiff",
 " vimtutor",
 " xxd",
 "vim-python",
+" vi",
 " view",
 " vim",
 " vimdiff",
diff --git a/packages/cvs/build.sh b/packages/cvs/build.sh
new file mode 100644 (file)
index 0000000..e69c82c
--- /dev/null
@@ -0,0 +1,6 @@
+TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/cvs/
+TERMUX_PKG_DESCRIPTION="Concurrent Versions System"
+TERMUX_PKG_VERSION=1.11.23
+TERMUX_PKG_SRCURL=http://ftp.gnu.org/non-gnu/cvs/source/stable/${TERMUX_PKG_VERSION}/cvs-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-server"
+TERMUX_PKG_RM_AFTER_INSTALL="bin/cvsbug share/man/man8/cvsbug.8"
diff --git a/packages/cvs/lib-getline.c.patch b/packages/cvs/lib-getline.c.patch
new file mode 100644 (file)
index 0000000..dfb84f5
--- /dev/null
@@ -0,0 +1,19 @@
+diff -u -r ../cvs-1.11.23/lib/getline.c ./lib/getline.c
+--- ../cvs-1.11.23/lib/getline.c       2005-04-04 16:46:05.000000000 -0400
++++ ./lib/getline.c    2016-03-29 17:34:23.536876927 -0400
+@@ -155,15 +155,6 @@
+ }
+ int
+-getline (lineptr, n, stream)
+-     char **lineptr;
+-     size_t *n;
+-     FILE *stream;
+-{
+-  return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
+-}
+-
+-int
+ getline_safe (lineptr, n, stream, limit)
+      char **lineptr;
+      size_t *n;
diff --git a/packages/cvs/lib-getline.h.patch b/packages/cvs/lib-getline.h.patch
new file mode 100644 (file)
index 0000000..6358e7f
--- /dev/null
@@ -0,0 +1,12 @@
+diff -u -r ../cvs-1.11.23/lib/getline.h ./lib/getline.h
+--- ../cvs-1.11.23/lib/getline.h       2005-04-04 16:46:05.000000000 -0400
++++ ./lib/getline.h    2016-03-29 17:31:15.020232824 -0400
+@@ -12,8 +12,6 @@
+ #define GETLINE_NO_LIMIT -1
+ int
+-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+-int
+   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                          int limit));
+ int
index bee6252..c748365 100644 (file)
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_VERSION=25.0.92
+TERMUX_PKG_BUILD_REVISION=4
 TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/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"
+TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
+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 --with-gnutls --with-xml2"
 # Ensure use of system malloc:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
 # Prevent configure from adding -nopie:
diff --git a/packages/emacs/lib-src-emacsclient.c.patch b/packages/emacs/lib-src-emacsclient.c.patch
new file mode 100644 (file)
index 0000000..c5b1acd
--- /dev/null
@@ -0,0 +1,12 @@
+diff -u -r ../emacs-25.0.92/lib-src/emacsclient.c ./lib-src/emacsclient.c
+--- ../emacs-25.0.92/lib-src/emacsclient.c     2016-03-02 05:21:42.000000000 -0500
++++ ./lib-src/emacsclient.c    2016-04-09 01:28:10.881760020 -0400
+@@ -1210,7 +1210,7 @@
+               }
+             else
+ #endif
+-              tmpdir = "/tmp";
++              tmpdir = "@TERMUX_PREFIX@/tmp";
+           }
+       socket_name_storage =
+         xmalloc (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE);
diff --git a/packages/emacs/lisp-cus-start.el.patch.beforehostbuild b/packages/emacs/lisp-cus-start.el.patch.beforehostbuild
new file mode 100644 (file)
index 0000000..3e5f696
--- /dev/null
@@ -0,0 +1,12 @@
+diff -u -r ../emacs-25.0.92/lisp/cus-start.el ./lisp/cus-start.el
+--- ../emacs-25.0.92/lisp/cus-start.el 2016-03-02 05:21:42.000000000 -0500
++++ ./lisp/cus-start.el        2016-04-06 18:16:00.007272810 -0400
+@@ -277,7 +277,7 @@
+                         "/tmp"))
+                    (t
+                     (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
+-                        "/tmp"))))
++                        "@TERMUX_PREFIX@/tmp"))))
+             :initialize custom-initialize-delay)
+            ;; fns.c
+            (use-dialog-box menu boolean "21.1")
index d767362..8044737 100644 (file)
@@ -1,6 +1,6 @@
 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
++++ ./lisp/loadup.el   2016-03-31 18:41:25.609790054 -0400
 @@ -1,3 +1,7 @@
 +;; Termux patch: See
 +;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
@@ -9,7 +9,17 @@ diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
  ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
  
  ;; Copyright (C) 1985-1986, 1992, 1994, 2001-2016 Free Software
-@@ -110,6 +114,12 @@
+@@ -69,7 +73,8 @@
+ ;; Prevent build-time PATH getting stored in the binary.
+ ;; Mainly cosmetic, but helpful for Guix.  (Bug#20330)
+-(setq exec-path nil)
++;; Termux patch: Keep exec-path when running undumped:
++;; (setq exec-path nil)
+ (if (eq t purify-flag)
+     ;; Hash consing saved around 11% of pure space in my tests.
+@@ -110,6 +115,12 @@
  (load "format")
  (load "bindings")
  (load "window")  ; Needed here for `replace-buffer-in-windows'.
@@ -22,7 +32,7 @@ diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
  (setq load-source-file-function 'load-with-code-conversion)
  (load "files")
  
-@@ -465,3 +475,7 @@
+@@ -465,3 +476,7 @@
  ;; End:
  
  ;;; loadup.el ends here
diff --git a/packages/emacs/lisp-server.el.patch.beforehostbuild b/packages/emacs/lisp-server.el.patch.beforehostbuild
new file mode 100644 (file)
index 0000000..b57f6d6
--- /dev/null
@@ -0,0 +1,12 @@
+diff -u -r ../emacs-25.0.92/lisp/server.el ./lisp/server.el
+--- ../emacs-25.0.92/lisp/server.el    2016-03-02 05:21:42.000000000 -0500
++++ ./lisp/server.el   2016-04-06 17:34:48.134354070 -0400
+@@ -267,7 +267,7 @@
+ ;; does not read the init file.
+ (defvar server-socket-dir
+   (and (featurep 'make-network-process '(:family local))
+-       (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))
++       (format "%s/emacs%d" (or (getenv "TMPDIR") "@TERMUX_PREFIX@/tmp") (user-uid)))
+   "The directory in which to place the server socket.
+ If local sockets are not supported, this is nil.")
index 50e3c34..3c32899 100755 (executable)
@@ -2,7 +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.4
+TERMUX_PKG_VERSION=2.8.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"
index b82fd82..68ffd92 100644 (file)
@@ -1,4 +1,4 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gzip/
 TERMUX_PKG_DESCRIPTION="Standard GNU file compression utilities"
-TERMUX_PKG_VERSION=1.6
+TERMUX_PKG_VERSION=1.7
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/gzip/gzip-${TERMUX_PKG_VERSION}.tar.xz
diff --git a/packages/gzip/stdio_impl_use_sfileext.patch b/packages/gzip/stdio_impl_use_sfileext.patch
deleted file mode 100644 (file)
index afe10f3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-http://lists.gnu.org/archive/html/bug-gnulib/2013-09/msg00005.html
-
-diff -u -r ../gzip-1.6/lib/stdio-impl.h ./lib/stdio-impl.h
---- ../gzip-1.6/lib/stdio-impl.h       2013-06-09 22:37:56.000000000 +0200
-+++ ./lib/stdio-impl.h 2014-02-25 23:50:09.000000000 +0100
-@@ -57,7 +57,7 @@
- #  define fp_ fp
- # endif
--# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ /* NetBSD >= 1.5ZA, OpenBSD */
-+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD */
-   /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-      and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
-   struct __sfileext
diff --git a/packages/gzip/zip.c.patch b/packages/gzip/zip.c.patch
deleted file mode 100644 (file)
index 668c6d4..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Re-ordering the headers in the below patch fixes aarch64
-compilation, due to gzip.h defining
-
-#  define head (prev+WSIZE) 
-
-and <asm/sigcontext.h> using
-
-struct fpsimd_context {
-       struct _aarch64_ctx head;
-       /* ... */
-}
-
-diff -u -r ../gzip-1.6/zip.c ./zip.c
---- ../gzip-1.6/zip.c  2013-02-01 23:39:13.000000000 -0500
-+++ ./zip.c    2016-01-03 19:37:00.603075562 -0500
-@@ -20,12 +20,12 @@
- #include <config.h>
- #include <ctype.h>
--#include "tailor.h"
--#include "gzip.h"
--
- #include <unistd.h>
- #include <fcntl.h>
-+#include "tailor.h"
-+#include "gzip.h"
-+
- local ulg crc;       /* crc on uncompressed file data */
- off_t header_bytes;   /* number of bytes in gzip header */
index 3933c33..e69c8d6 100644 (file)
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/inetutils/
 TERMUX_PKG_DESCRIPTION="Collection of common network programs"
 TERMUX_PKG_VERSION=1.9.4
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="readline, libutil"
 # These are old cruft / not suited for android:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ifconfig --disable-rcp --disable-rlogin --disable-rsh --disable-rexecd --disable-uucpd --disable-rexec --disable-ping --disable-hostname"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-ifconfig --disable-rcp --disable-rlogin --disable-rsh --disable-rexecd --disable-uucpd --disable-rexec --disable-ping --disable-ping6 --disable-hostname"
 
 CPPFLAGS+=" -DLOGIN_PROCESS=6 -DDEAD_PROCESS=8 -DLOG_NFACILITIES=24"
 LDFLAGS+=" -llog" # for syslog
index 466114d..d9179ee 100755 (executable)
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.irssi.org/
 TERMUX_PKG_DESCRIPTION="Terminal based IRC client for UNIX systems"
 TERMUX_PKG_DEPENDS="ncurses, openssl, glib, libandroid-glob"
-TERMUX_PKG_VERSION=0.8.18
+TERMUX_PKG_VERSION=0.8.19
 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/${TERMUX_PKG_VERSION}/irssi-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_FOLDERNAME=irssi-${TERMUX_PKG_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
index 804323f..416fa29 100755 (executable)
@@ -1,5 +1,5 @@
 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.11.1
-TERMUX_PKG_SRCURL=https://www.sqlite.org/2016/sqlite-autoconf-3110100.tar.gz
+TERMUX_PKG_VERSION=3.12.0
+TERMUX_PKG_SRCURL=https://www.sqlite.org/2016/sqlite-autoconf-3120000.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-readline"
diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh
new file mode 100644 (file)
index 0000000..1df5930
--- /dev/null
@@ -0,0 +1,23 @@
+TERMUX_PKG_HOMEPAGE=http://mosh.mit.edu/
+TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+TERMUX_PKG_VERSION=1.2.5.20160402
+TERMUX_PKG_SRCURL=http://mosh.mit.edu/mosh-${TERMUX_PKG_VERSION}.tar.gz
+_COMMIT=f30738e3256e90850e945c08624fce90b1ba78a1
+TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/archive/${_COMMIT}.zip
+TERMUX_PKG_FOLDERNAME=mosh-${_COMMIT}
+
+TERMUX_PKG_DEPENDS="libandroid-support, protobuf, ncurses, openssl, libutil, perl, libgnustl"
+
+export PROTOC=$TERMUX_TOPDIR/protobuf/host-build/src/protoc
+
+LDFLAGS+=" -lgnustl_shared"
+
+termux_step_pre_configure () {
+       cd $TERMUX_PKG_SRCDIR
+       ./autogen.sh
+}
+
+termux_step_post_make_install () {
+       # Avoid env and specify perl directly:
+       sed -i'' '1 s|^.*$|#! /bin/perl|' $TERMUX_PREFIX/bin/mosh
+}
index 063f434..16e4d9b 100644 (file)
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client"
-TERMUX_PKG_VERSION=1.5.24
-TERMUX_PKG_BUILD_REVISION=3
-TERMUX_PKG_SRCURL=https://bitbucket.org/mutt/mutt/downloads/mutt-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_VERSION=1.6.0
+TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, gpgme"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache --with-sasl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
diff --git a/packages/mutt/getdomain.c.patch b/packages/mutt/getdomain.c.patch
new file mode 100644 (file)
index 0000000..8ddeb41
--- /dev/null
@@ -0,0 +1,13 @@
+diff -u -r ../mutt-1.6.0/getdomain.c ./getdomain.c
+--- ../mutt-1.6.0/getdomain.c  2016-04-02 14:12:22.000000000 -0400
++++ ./getdomain.c      2016-04-06 06:18:24.614628451 -0400
+@@ -44,7 +44,9 @@
+   hints.ai_flags = AI_CANONNAME;
+   hints.ai_family = AF_UNSPEC;
++#ifdef _SC_HOST_NAME_MAX
+   if ((node_len = sysconf(_SC_HOST_NAME_MAX)) == -1)
++#endif
+     node_len = STRING;
+   node = safe_malloc(node_len + 1);
+   if (gethostname(node, node_len))
index 449d97e..1dc35f7 100644 (file)
@@ -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.9.0
+TERMUX_PKG_VERSION=5.10.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"
index f724155..9f3e976 100644 (file)
@@ -1,12 +1,12 @@
-diff -u -r ../node-v0.12.3/lib/os.js ./lib/os.js
---- ../node-v0.12.3/lib/os.js  2015-05-13 20:30:45.000000000 -0400
-+++ ./lib/os.js        2015-05-22 13:23:14.286889554 -0400
-@@ -51,7 +51,7 @@
-     return process.env.TMPDIR ||
+diff -u -r ../node-v5.10.0/lib/os.js ./lib/os.js
+--- ../node-v5.10.0/lib/os.js  2016-03-31 21:52:17.000000000 -0400
++++ ./lib/os.js        2016-04-04 04:46:05.148105544 -0400
+@@ -36,7 +36,7 @@
+     path = process.env.TMPDIR ||
             process.env.TMP ||
             process.env.TEMP ||
 -           '/tmp';
 +           '@TERMUX_PREFIX@/tmp';
+     if (path.length > 1 && path.endsWith('/'))
+       path = path.slice(0, -1);
    }
- };
index 5004d72..567cf98 100644 (file)
@@ -1,6 +1,6 @@
 TERMUX_PKG_HOMEPAGE=http://proot.me/
 TERMUX_PKG_DESCRIPTION="Emulate chroot, bind mount and binfmt_misc for non-root users"
-TERMUX_PKG_VERSION=5.1.99
+TERMUX_PKG_VERSION=5.1.100
 TERMUX_PKG_SRCURL=https://github.com/proot-me/PRoot/archive/next.zip
 TERMUX_PKG_FOLDERNAME=PRoot-next
 TERMUX_PKG_DEPENDS="libtalloc"
index 5dde068..9a84101 100755 (executable)
@@ -15,6 +15,11 @@ ARGS="-b /system:/system"
 # to find e.g. configurations files there work.
 ARGS="$ARGS -b $PREFIX/..:$PREFIX/.."
 
+# Expose external and internal storage:
+if [ -d /storage ]; then
+       ARGS="$ARGS -b /storage:/storage"
+fi
+
 # Mimic traditional Linux file system hierarchy - /usr:
 ARGS="$ARGS -b $PREFIX:/usr"
 
index 6d77097..a73eed3 100755 (executable)
@@ -1,7 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://code.google.com/p/protobuf/
 TERMUX_PKG_DESCRIPTION="Library for encoding structured data in an efficient yet extensible format"
 TERMUX_PKG_VERSION=2.6.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/google/protobuf/releases/download/v${TERMUX_PKG_VERSION}/protobuf-${TERMUX_PKG_VERSION}.tar.bz2
 # Build a host build first and use the host build protoc:
 TERMUX_PKG_HOSTBUILD=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-protoc=$TERMUX_PKG_HOSTBUILD_DIR/src/protoc"
+# Link against libgnustl_shared.so so that other C++ programs that
+# uses protobuf (e.g. mosh) may use libgnustl_shared.so.
+TERMUX_PKG_DEPENDS="libgnustl"
+
+LDFLAGS+=" -lgnustl_shared"
index 5e9bc18..a171bf8 100644 (file)
@@ -1,13 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://termux.com/
 TERMUX_PKG_DESCRIPTION="Some tools for Termux"
-TERMUX_PKG_VERSION=0.21
+TERMUX_PKG_VERSION=0.24
 
 termux_step_make_install () {
        $CXX $CFLAGS $LDFLAGS -std=c++14 -Wall -Wextra -pedantic -Werror $TERMUX_PKG_BUILDER_DIR/*.cpp -o $TERMUX_PREFIX/bin/termux-elf-cleaner
 
        # Remove LD_LIBRARY_PATH from environment to avoid conflicting
        # with system libraries that am may link against.
-       for tool in am dalvikvm df getprop logcat ping pm; do
+       for tool in am dalvikvm df getprop logcat ping ping6 ip pm; do
                WRAPPER_FILE=$TERMUX_PREFIX/bin/$tool
                echo '#!/bin/sh' > $WRAPPER_FILE
                if [ $tool = am -o $tool = pm ]; then
index 5b47429..e4a9bd8 100755 (executable)
@@ -1,12 +1,16 @@
 #!/bin/sh
 
-if [ -x /system/xbin/su ]; then
-       # The su tool may require programs from /system/bin in path:
-       PATH=/system/bin:$PATH /system/xbin/su $@
-else
-       echo "There is no su program on this device. Termux"
-       echo "does not supply tools for rooting, see e.g."
-       echo "http://www.androidcentral.com/root for"
-       echo "information about rooting Android."
-       exit 1
-fi
+for p in /system/xbin/su /su/bin/su
+do
+       if [ -x $p ]; then
+               # The su tool may require programs
+               # from /system/bin in path:
+               PATH=/system/bin:$PATH exec $p $@
+       fi
+done
+
+echo "There is no su program on this device. Termux"
+echo "does not supply tools for rooting, see e.g."
+echo "http://www.androidcentral.com/root for"
+echo "information about rooting Android."
+exit 1
index a664b9c..44c71fe 100644 (file)
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://jonas.nitro.dk/tig/
 TERMUX_PKG_DESCRIPTION="Ncurses-based text-mode interface for git"
 TERMUX_PKG_VERSION=2.1.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=http://jonas.nitro.dk/tig/releases/tig-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="ncurses, git, libandroid-support"
index b9adb8e..3fd01f1 100644 (file)
@@ -1,4 +1,5 @@
 TERMUX_PKG_VERSION=6.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_HOMEPAGE=http://www.info-zip.org/
 TERMUX_PKG_DESCRIPTION="Tools for working with zip files"
 TERMUX_PKG_SRCURL="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
index 1637376..6f96377 100755 (executable)
@@ -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.1655
+TERMUX_PKG_VERSION=7.4.1707
 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"
index 0c01385..985784f 100755 (executable)
@@ -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.1655
+TERMUX_PKG_VERSION=7.4.1707
 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/zbar/build.sh b/packages/zbar/build.sh
new file mode 100644 (file)
index 0000000..fec6dad
--- /dev/null
@@ -0,0 +1,6 @@
+TERMUX_PKG_HOMEPAGE=http://zbar.sourceforge.net
+TERMUX_PKG_DESCRIPTION="Software suite for reading bar codes from various sources"
+TERMUX_PKG_VERSION=0.10
+TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_DEPENDS="imagemagick"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread --disable-video --without-xshm --without-xv --without-gtk --without-qt --without-python --mandir=$TERMUX_PREFIX/share/man"