diff --git a/packages/abduco/build.sh b/packages/abduco/build.sh index b3227f1872..ab7c01c96d 100644 --- a/packages/abduco/build.sh +++ b/packages/abduco/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.brain-dump.org/projects/abduco/ TERMUX_PKG_DESCRIPTION="Clean and simple terminal session manager" TERMUX_PKG_LICENSE="ISC" TERMUX_PKG_VERSION=0.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.brain-dump.org/projects/abduco/abduco-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c90909e13fa95770b5afc3b59f311b3d3d2fdfae23f9569fa4f96a3e192a35f4 TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_DEPENDS="libutil,dvtm" +TERMUX_PKG_DEPENDS="dvtm" termux_step_pre_configure() { CFLAGS+=" $CPPFLAGS" diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh index d12ec313b8..d94a31d2ff 100644 --- a/packages/cgdb/build.sh +++ b/packages/cgdb/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://cgdb.github.io/ TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the GNU Debugger (GDB)" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_DEPENDS="ncurses,readline,gdb,libutil" +TERMUX_PKG_DEPENDS="ncurses, readline, gdb" TERMUX_PKG_VERSION=0.7.0 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423 TERMUX_PKG_BUILD_IN_SRC="yes" diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index 0d7618a9c3..13ed6e214c 100644 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html TERMUX_PKG_DESCRIPTION="Small SSH server and client" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2018.76 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 -TERMUX_PKG_DEPENDS="libutil,termux-auth" +TERMUX_PKG_DEPENDS="termux-auth" TERMUX_PKG_CONFLICTS="openssh" TERMUX_PKG_BUILD_IN_SRC="yes" diff --git a/packages/dvtm/build.sh b/packages/dvtm/build.sh index bca018eff4..4364fc6a26 100644 --- a/packages/dvtm/build.sh +++ b/packages/dvtm/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/martanne/dvtm TERMUX_PKG_DESCRIPTION="Terminal tiling window manager" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=0.15 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/martanne/dvtm/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=496eada13d8abaa8d772279746f78b0c6fed11b560599490f3e70ebc21197bf0 TERMUX_PKG_BUILD_IN_SRC=yes -TERMUX_PKG_DEPENDS="libutil, ncurses" +TERMUX_PKG_DEPENDS="ncurses" termux_step_pre_configure() { CFLAGS+=" $CPPFLAGS" diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh index 7c8aac874c..22fe19fafb 100644 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.erlang.org/ TERMUX_PKG_DESCRIPTION="General-purpose concurrent functional programming language" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=21.2.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3ff578ab020a714be25d6787b81938df016db375692d4126a28f1303e6e9c165 TERMUX_PKG_SRCURL=https://github.com/erlang/otp/archive/OTP-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_DEPENDS="openssl, ncurses, libutil" +TERMUX_PKG_DEPENDS="openssl, ncurses" TERMUX_PKG_HOSTBUILD="yes" TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-javac --with-ssl=${TERMUX_PREFIX} --with-termcap" diff --git a/packages/expect/build.sh b/packages/expect/build.sh index de49d9aad4..561c1d4f13 100644 --- a/packages/expect/build.sh +++ b/packages/expect/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://core.tcl.tk/expect/index TERMUX_PKG_DESCRIPTION="Tool for automating interactive terminal applications" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_VERSION=5.45.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/expect/Expect/${TERMUX_PKG_VERSION}/expect${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libutil, tcl" +TERMUX_PKG_DEPENDS="tcl" termux_step_pre_configure() { autoconf diff --git a/packages/inetutils/build.sh b/packages/inetutils/build.sh index e0c1d43023..952c416c4c 100644 --- a/packages/inetutils/build.sh +++ b/packages/inetutils/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/inetutils/ TERMUX_PKG_DESCRIPTION="Collection of common network programs" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.9.4 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37 -TERMUX_PKG_DEPENDS="readline, libutil" +TERMUX_PKG_DEPENDS="readline" # These are old cruft / not suited for android # (we --disable-traceroute as it requires root # in favour of tracepath, which sets up traceroute diff --git a/packages/joe/build.sh b/packages/joe/build.sh index 794b0a2b13..da176cf0f9 100644 --- a/packages/joe/build.sh +++ b/packages/joe/build.sh @@ -1,9 +1,10 @@ TERMUX_PKG_HOMEPAGE=http://joe-editor.sourceforge.net TERMUX_PKG_DESCRIPTION="Wordstar like text editor" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_DEPENDS="ncurses, libutil" +TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_CONFLICTS="jupp" TERMUX_PKG_VERSION=4.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de TERMUX_PKG_SRCURL=https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-${TERMUX_PKG_VERSION}/joe-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-termcap" diff --git a/packages/jupp/build.sh b/packages/jupp/build.sh index a1c6656a7b..61a9d84b63 100644 --- a/packages/jupp/build.sh +++ b/packages/jupp/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.mirbsd.org/jupp.htm TERMUX_PKG_DESCRIPTION="User friendly full screen text editor" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Dominik George @Natureshadow" -TERMUX_PKG_DEPENDS="ncurses, libutil" +TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_CONFLICTS="joe" TERMUX_PKG_VERSION=3.1jupp38 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=c5cbe3f97683f6e513f611a60531feefb9b877f8cea4c6e9087b48631f69ed40 TERMUX_PKG_SRCURL=http://www.mirbsd.org/MirOS/dist/jupp/joe-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index fd0ad7150d..c99df8076f 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://web.mit.edu/kerberos TERMUX_PKG_DESCRIPTION="The Kerberos network authentication system" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.16.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/krb5-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libutil, libdb" +TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, readline, openssl, libdb" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_CONFFILES="etc/krb5.conf var/krb5kdc/kdc.conf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-readline diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index a3ef73778d..88162a1db0 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://lftp.tech/ TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=4.8.4 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android. @@ -13,7 +13,7 @@ ac_cv_func_dn_expand=no --with-expat=$TERMUX_PREFIX --with-readline=$TERMUX_PREFIX " -TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn2" +TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libidn2" TERMUX_PKG_BUILD_DEPENDS="ncurses-dev" termux_step_pre_configure() { diff --git a/packages/libutil/build.sh b/packages/libutil/build.sh deleted file mode 100644 index 79e0ffad6b..0000000000 --- a/packages/libutil/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -TERMUX_PKG_HOMEPAGE=https://refspecs.linuxbase.org/LSB_2.1.0/LSB-generic/LSB-generic/libutil.html -TERMUX_PKG_DESCRIPTION="Library with terminal functions" -TERMUX_PKG_LICENSE="NCSA" # same as ndk-sysroot -TERMUX_PKG_VERSION=0.4 -TERMUX_PKG_BUILD_IN_SRC=yes - -termux_step_make_install() { - CPPFLAGS+=" -std=c11 -Wall -Werror" - $CC $CPPFLAGS $CFLAGS -c -fPIC $TERMUX_PKG_BUILDER_DIR/pty.c -o pty.o - $CC -shared -fPIC $LDFLAGS -o $TERMUX_PREFIX/lib/libutil.so pty.o -} diff --git a/packages/libutil/pty.c b/packages/libutil/pty.c deleted file mode 100644 index 435e75e91a..0000000000 --- a/packages/libutil/pty.c +++ /dev/null @@ -1,68 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - - -int openpty(int* amaster, int* aslave, char* name, const struct termios* termp, const struct winsize* winp) -{ - char buf[512]; - - int master = open("/dev/ptmx", O_RDWR); - if (master == -1) return -1; - if (grantpt(master) || unlockpt(master) || ptsname_r(master, buf, sizeof buf)) goto fail; - - int slave = open(buf, O_RDWR | O_NOCTTY); - if (slave == -1) goto fail; - - /* XXX Should we ignore errors here? */ - if (termp) tcsetattr(slave, TCSAFLUSH, termp); - if (winp) ioctl(slave, TIOCSWINSZ, winp); - - *amaster = master; - *aslave = slave; - if (name != NULL) strcpy(name, buf); - return 0; - -fail: - close(master); - return -1; -} - - -int login_tty(int fd) -{ - setsid(); - if (ioctl(fd, TIOCSCTTY, NULL) == -1) return -1; - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); - if (fd > 2) close(fd); - return 0; -} - - -int forkpty(int* amaster, char* name, const struct termios* termp, const struct winsize* winp) -{ - int master, slave; - if (openpty(&master, &slave, name, termp, winp) == -1) { - return -1; - } - - int pid; - switch (pid = fork()) { - case -1: - return -1; - case 0: - close(master); - if (login_tty(slave)) _exit(1); - return 0; - default: - *amaster = master; - close (slave); - return pid; - } -} diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh index 3c7cc75c5e..67f65e5af8 100644 --- a/packages/mosh/build.sh +++ b/packages/mosh/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://mosh.org TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=10 +TERMUX_PKG_REVISION=12 TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libandroid-support, libprotobuf, ncurses, openssl, openssh, libutil" +TERMUX_PKG_DEPENDS="libandroid-support, libprotobuf, ncurses, openssl, openssh" termux_step_pre_configure() { export PROTOC=$TERMUX_TOPDIR/libprotobuf/host-build/src/protoc @@ -17,7 +17,6 @@ termux_step_post_make_install() { mv mosh mosh.pl $CXX $CXXFLAGS $LDFLAGS \ -isystem $TERMUX_PREFIX/include \ - -lutil \ -DPACKAGE_VERSION=\"$TERMUX_PKG_VERSION\" \ -std=c++11 -Wall -Wextra -Werror \ $TERMUX_PKG_BUILDER_DIR/mosh.cc -o mosh diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index 1b7c3d674f..3abbd0465b 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://neovim.io/ TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=0.3.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=a641108bdebfaf319844ed46b1bf35d6f7c30ef5aeadeb29ba06e19c3274bc0e TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua, libunibilium" +TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, liblua, libunibilium" TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DENABLE_JEMALLOC=OFF diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 6c113966cf..492871ed23 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.openssh.com/ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=7.9p1 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SHA256=6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil, termux-auth, krb5" +TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, termux-auth, krb5" TERMUX_PKG_CONFLICTS="dropbear" # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/python/build.sh b/packages/python/build.sh index 5fb7c5e679..c5b3c64b78 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -1,12 +1,12 @@ TERMUX_PKG_HOMEPAGE=https://python.org/ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear programs" TERMUX_PKG_LICENSE="PythonPL" -TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma" +TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma" # Python.h includes crypt.h: TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" _MAJOR_VERSION=3.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz diff --git a/packages/python2/build.sh b/packages/python2/build.sh index b08b929485..d671855510 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -5,13 +5,14 @@ TERMUX_PKG_LICENSE="PythonPL" # openssl for ensurepip. # libbz2 for the bz2 module. # ncurses-ui-libs for the curses.panel module. -TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt" +TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt" # Python.h includes crypt.h: TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev" TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=2.7 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.16 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7 TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 243f3493cc..459c38a8d4 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity TERMUX_PKG_LICENSE="BSD 2-Clause" _MAJOR_VERSION=2.6 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=47b629808e9fd44ce1f760cdf3ed14875fc9b19d4f334e82e2cf25cb2898f2f2 TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz # libbffi is used by the fiddle extension module: -TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil, libyaml" +TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libyaml" # Needed to fix compilation on android: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setgroups=no ac_cv_func_setresuid=no ac_cv_func_setreuid=no --enable-rubygems" # The gdbm module seems to be very little used: diff --git a/packages/screen/build.sh b/packages/screen/build.sh index e13ba2c0cd..848993dd50 100644 --- a/packages/screen/build.sh +++ b/packages/screen/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/screen/ TERMUX_PKG_DESCRIPTION="Terminal multiplexer with VT100/ANSI terminal emulation" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=4.6.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="ncurses, libcrypt, libutil" +TERMUX_PKG_DEPENDS="ncurses, libcrypt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-socket-dir --enable-colors256 diff --git a/packages/socat/build.sh b/packages/socat/build.sh index 4799ed7ce2..6379e939c2 100644 --- a/packages/socat/build.sh +++ b/packages/socat/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=http://www.dest-unreach.org/socat/ TERMUX_PKG_DESCRIPTION="Relay for bidirectional data transfer between two independent data channels" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_DEPENDS="openssl, readline, libutil" +TERMUX_PKG_DEPENDS="openssl, readline" TERMUX_PKG_VERSION=1.7.3.2 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=http://www.dest-unreach.org/socat/download/socat-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes ac_compiler_gnu=yes" # sc_cv_sys_crdly_shift=9 sc_cv_sys_csize_shift=4 sc_cv_sys_tabdly_shift=11" diff --git a/packages/stunnel/build.sh b/packages/stunnel/build.sh index cc90f2ff1c..810201b5f5 100644 --- a/packages/stunnel/build.sh +++ b/packages/stunnel/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/ TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=5.50 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=951d92502908b852a297bd9308568f7c36598670b84286d3e05d4a3a550c0149 TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="openssl, libutil" +TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips" TERMUX_PKG_RM_AFTER_INSTALL="bin/stunnel3 share/man/man8/stunnel.*.8" diff --git a/packages/tintin++/build.sh b/packages/tintin++/build.sh index 046c806556..75110c3634 100644 --- a/packages/tintin++/build.sh +++ b/packages/tintin++/build.sh @@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://tintin.sourceforge.net TERMUX_PKG_DESCRIPTION="Classic text-based MUD client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.01.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=fb7c8970855aa57f23bff7859ced0a63f0644f220037d2deb083d6ee2f41760c TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tintin/TinTin%2B%2B%20Source%20Code/${TERMUX_PKG_VERSION:0:4}/tintin-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_file__dev_ptmx=no" -TERMUX_PKG_DEPENDS="pcre, libgnutls, libutil" +TERMUX_PKG_DEPENDS="pcre, libgnutls" TERMUX_PKG_BUILD_IN_SRC=yes termux_step_post_extract_package() { diff --git a/packages/tmate/build.sh b/packages/tmate/build.sh index b1362bae20..ed446dbd13 100644 --- a/packages/tmate/build.sh +++ b/packages/tmate/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://tmate.io TERMUX_PKG_DESCRIPTION="Terminal multiplexer with instant terminal sharing" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=2.2.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/tmate-io/tmate/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d9c2ac59f42e65aac5f500f0548ea8056fd79c9c5285e5af324d833e2a84c305 -TERMUX_PKG_DEPENDS="libandroid-support, libevent, libmsgpack, libssh, libutil, ncurses" +TERMUX_PKG_DEPENDS="libandroid-support, libevent, libmsgpack, libssh, ncurses" termux_step_pre_configure() { CFLAGS+=" -DIOV_MAX=1024" diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh index 3e68fc01dd..4a60e76878 100644 --- a/packages/tmux/build.sh +++ b/packages/tmux/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tmux.github.io/ TERMUX_PKG_DESCRIPTION="Terminal multiplexer" TERMUX_PKG_LICENSE="BSD" # Link against libandroid-support for wcwidth(), see https://github.com/termux/termux-packages/issues/224 -TERMUX_PKG_DEPENDS="ncurses, libevent, libutil, libandroid-support, libandroid-glob" +TERMUX_PKG_DEPENDS="ncurses, libevent, libandroid-support, libandroid-glob" TERMUX_PKG_VERSION=2.8 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=7f6bf335634fafecff878d78de389562ea7f73a7367f268b66d37ea13617a2ba TERMUX_PKG_SRCURL=https://github.com/tmux/tmux/releases/download/${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/ttyd/build.sh b/packages/ttyd/build.sh index 5d83e38780..1afcb6e3a1 100644 --- a/packages/ttyd/build.sh +++ b/packages/ttyd/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://tsl0922.github.io/ttyd/ TERMUX_PKG_DESCRIPTION="Command-line tool for sharing terminal over the web" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.4.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=ff1a66b418df6cd741868a8ea84f69cd63f15e52e3fa117641ec57d3c37a1315 TERMUX_PKG_SRCURL=https://github.com/tsl0922/ttyd/archive/$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_DEPENDS="json-c, libwebsockets, libutil" +TERMUX_PKG_DEPENDS="json-c, libwebsockets" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_XXD=$TERMUX_PKG_TMPDIR/xxd" termux_step_pre_configure() { diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh index 524ebd6408..89065c3926 100644 --- a/packages/util-linux/build.sh +++ b/packages/util-linux/build.sh @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.33.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_DEPENDS="ncurses, libutil, libcrypt" +TERMUX_PKG_DEPENDS="ncurses, libcrypt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_setns=yes ac_cv_func_unshare=yes