diff --git a/build-package.sh b/build-package.sh index 7218c5a45..d59d860af 100755 --- a/build-package.sh +++ b/build-package.sh @@ -227,7 +227,7 @@ termux_setup_meson() { # Utility function to setup a current cmake build system termux_setup_cmake() { local TERMUX_CMAKE_MAJORVESION=3.13 - local TERMUX_CMAKE_MINORVERSION=3 + local TERMUX_CMAKE_MINORVERSION=4 local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME @@ -235,7 +235,7 @@ termux_setup_cmake() { if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ "$TERMUX_CMAKE_TARFILE" \ - 78227de38d574d4d19093399fd4b40a4fb0a76cbfc4249783a969652ce515270 + 563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ @@ -968,7 +968,7 @@ termux_step_patch_package() { } # Replace autotools build-aux/config.{sub,guess} with ours to add android targets. -termux_step_replace_guess_scripts () { +termux_step_replace_guess_scripts() { cd "$TERMUX_PKG_SRCDIR" find . -name config.sub -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.sub" '{}' \; find . -name config.guess -exec chmod u+w '{}' \; -exec cp "$TERMUX_SCRIPTDIR/scripts/config.guess" '{}' \; @@ -979,7 +979,7 @@ termux_step_pre_configure() { return } -termux_step_configure_autotools () { +termux_step_configure_autotools() { if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi local DISABLE_STATIC="--disable-static" @@ -1089,7 +1089,7 @@ termux_step_configure_autotools () { $QUIET_BUILD } -termux_step_configure_cmake () { +termux_step_configure_cmake() { termux_setup_cmake local TOOLCHAIN_ARGS="-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN" @@ -1132,7 +1132,7 @@ termux_step_configure_cmake () { $TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS } -termux_step_configure_meson () { +termux_step_configure_meson() { termux_setup_meson CC=gcc CXX=g++ $TERMUX_MESON \ $TERMUX_PKG_SRCDIR \ @@ -1145,7 +1145,7 @@ termux_step_configure_meson () { $TERMUX_PKG_EXTRA_CONFIGURE_ARGS } -termux_step_configure () { +termux_step_configure() { if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then termux_step_configure_autotools elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then @@ -1155,7 +1155,7 @@ termux_step_configure () { fi } -termux_step_post_configure () { +termux_step_post_configure() { return } diff --git a/disabled-packages/alsa-lib/build.sh b/disabled-packages/alsa-lib/build.sh index 2c5b1b13c..2795c8dee 100644 --- a/disabled-packages/alsa-lib/build.sh +++ b/disabled-packages/alsa-lib/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f51596 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-pythonlibs=\"-lpython2.7\" --with-pythonincludes=-I/$TERMUX_PREFIX/include/python2.7" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python" -termux_step_pre_configure () { +termux_step_pre_configure() { #LDFLAGS="$LDFLAGS -landroid-shmem" #_files='src/pcm/pcm_dsnoop.c src/pcm/pcm_mmap.c src/pcm/pcm_shm.c src/pcm/pcm_dmix.c src/pcm/pcm_dshare.c src/pcm/pcm_direct.c src/shmarea.c src/control/control_shm.c aserver/aserver.c' #for _file in $_files; do sed -i 's%#include %#include %' "$TERMUX_PKG_SRCDIR/$_file"; done diff --git a/disabled-packages/alsa-plugins/build.sh b/disabled-packages/alsa-plugins/build.sh index 36d417411..c53d0e58c 100644 --- a/disabled-packages/alsa-plugins/build.sh +++ b/disabled-packages/alsa-plugins/build.sh @@ -5,6 +5,6 @@ TERMUX_PKG_SHA256=8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901 TERMUX_PKG_DEPENDS="alsa-lib, pulseaudio" TERMUX_PKG_EXTRA_MAKE_ARGS='SUBDIRS=pulse' -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/asound.conf $TERMUX_PREFIX/etc } diff --git a/disabled-packages/alsa-utils/build.sh b/disabled-packages/alsa-utils/build.sh index bc163c708..d9afa91e1 100644 --- a/disabled-packages/alsa-utils/build.sh +++ b/disabled-packages/alsa-utils/build.sh @@ -5,6 +5,6 @@ TERMUX_PKG_SHA256=127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb616 TERMUX_PKG_DEPENDS="alsa-lib, ncurses" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-udev-rules-dir=$TERMUX_PREFIX/lib/udev/rules.d --with-asound-state-dir=$TERMUX_PREFIX/var/lib/alsa --disable-bat --disable-rst2man" -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS+=" -llog" } diff --git a/disabled-packages/ant/build.sh b/disabled-packages/ant/build.sh old mode 100755 new mode 100644 index a727324b5..46c467436 --- a/disabled-packages/ant/build.sh +++ b/disabled-packages/ant/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-$ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/ant/lib for jar in ant ant-launcher; do diff --git a/disabled-packages/apt-updated/build.sh b/disabled-packages/apt-updated/build.sh index 469d1a759..cf8519103 100644 --- a/disabled-packages/apt-updated/build.sh +++ b/disabled-packages/apt-updated/build.sh @@ -34,6 +34,6 @@ lib/libapt-inst.so termux_step_post_make_install() { printf "# The main termux repository:\ndeb [arch=all,${TERMUX_ARCH}] https://termux.net stable main\n" > $TERMUX_PREFIX/etc/apt/sources.list - cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/ + cp $TERMUX_PKG_BUILDER_DIR/trusted.gpg $TERMUX_PREFIX/etc/apt/ rm /data/data/com.termux/files/usr/include/apt-pkg -r } diff --git a/disabled-packages/checkinstall/build.sh b/disabled-packages/checkinstall/build.sh index 1976eaed9..1e161a210 100644 --- a/disabled-packages/checkinstall/build.sh +++ b/disabled-packages/checkinstall/build.sh @@ -14,7 +14,7 @@ termux_step_pre_configure() { CFLAGS+=" -DS_IREAD=S_IRUSR" } -termux_step_post_make_install () { +termux_step_post_make_install() { mv $TERMUX_PREFIX/lib/checkinstall/checkinstallrc-dist \ $TERMUX_PREFIX/lib/checkinstall/checkinstallrc } diff --git a/disabled-packages/clisp/build.sh b/disabled-packages/clisp/build.sh index 8947b78e0..7d2645db6 100644 --- a/disabled-packages/clisp/build.sh +++ b/disabled-packages/clisp/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/clisp/clisp/${TERMUX_ TERMUX_PKG_DEPENDS="readline, libandroid-support" TERMUX_MAKE_PROCESSES=1 -termux_step_configure () { +termux_step_configure() { cd $TERMUX_PKG_BUILDDIR export XCPPFLAGS="$CPPFLAGS" diff --git a/disabled-packages/crawl/build.sh b/disabled-packages/crawl/build.sh index 599693a2f..9665da073 100644 --- a/disabled-packages/crawl/build.sh +++ b/disabled-packages/crawl/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://crawl.develz.org/release/stone_soup-${TERMUX_PKG_VERSI TERMUX_PKG_EXTRA_MAKE_ARGS="V=1" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { export CROSSHOST=$TERMUX_HOST_PLATFORM TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/source } diff --git a/disabled-packages/cups/build.sh b/disabled-packages/cups/build.sh index c21ce54ba..4adf73994 100644 --- a/disabled-packages/cups/build.sh +++ b/disabled-packages/cups/build.sh @@ -13,10 +13,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-components=core " -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog -lcrypt" } -termux_step_post_make_install () { +termux_step_post_make_install() { mv "$TERMUX_PREFIX"/lib64/libcups.so* "$TERMUX_PREFIX"/lib/ } diff --git a/disabled-packages/d8/build.sh b/disabled-packages/d8/build.sh old mode 100755 new mode 100644 index 35980c142..c16bf4882 --- a/disabled-packages/d8/build.sh +++ b/disabled-packages/d8/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Dexer that converts java byte code to dex code" TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_make_install () { +termux_step_make_install() { # Rewrite packages to avoid using com.android.* classes which may clash with # classes in the Android runtime on devices (see #1801): local JARJAR=$TERMUX_PKG_CACHEDIR/jarjar.jar diff --git a/disabled-packages/dovecot/build.sh b/disabled-packages/dovecot/build.sh index 1d54fe010..01222b7a2 100644 --- a/disabled-packages/dovecot/build.sh +++ b/disabled-packages/dovecot/build.sh @@ -24,7 +24,7 @@ lib_cv_va_copy=yes lib_cv___va_copy=yes " -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" for i in `find $TERMUX_PKG_SRCDIR/src/director -type f`; do sed 's|\bstruct user\b|struct usertest|g' -i $i; done @@ -36,7 +36,7 @@ termux_step_pre_configure () { fi } -termux_step_post_make_install () { +termux_step_post_make_install() { for binary in doveadm doveconf; do mv $TERMUX_PREFIX/bin/$binary $TERMUX_PREFIX/libexec/dovecot/$binary cat > $TERMUX_PREFIX/bin/$binary < mk/build.mk #echo "GhcStage2HcOpts = $ORIG_CFLAGS $ORIG_CPPFLAGS $ORIG_LDFLAGS" >> mk/build.mk diff --git a/disabled-packages/help2man/build.sh b/disabled-packages/help2man/build.sh index 189788f59..0785af1db 100644 --- a/disabled-packages/help2man/build.sh +++ b/disabled-packages/help2man/build.sh @@ -1,7 +1,7 @@ # Build fails in docker image, install-info needed there: # build-aux/missing: 81: build-aux/missing: install-info: not found # WARNING: 'install-info' is missing on your system. -TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/help2man/ +TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/help2man/ TERMUX_PKG_DESCRIPTION="tool for automatically generating simple manual pages from program output." TERMUX_PKG_VERSION=1.47.5 TERMUX_PKG_SHA256=7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1 diff --git a/disabled-packages/javac/build.sh b/disabled-packages/javac/build.sh old mode 100755 new mode 100644 index 5bd5a6b2d..2c97a9896 --- a/disabled-packages/javac/build.sh +++ b/disabled-packages/javac/build.sh @@ -3,14 +3,14 @@ TERMUX_PKG_DESCRIPTION="Java programming language compiler from (openjdk)" TERMUX_PKG_VERSION=8u45 TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_extract_package () { +termux_step_extract_package() { mkdir $TERMUX_PKG_SRCDIR } -termux_step_make () { +termux_step_make() { RAW_JAR=/usr/lib/jvm/java-7-openjdk-amd64/lib/tools.jar - mkdir -p $TERMUX_PREFIX/share/dex + mkdir -p $TERMUX_PREFIX/share/dex $TERMUX_DX \ --dex \ --output=$TERMUX_PREFIX/share/dex/tools.jar \ diff --git a/disabled-packages/libffi-updated/build.sh b/disabled-packages/libffi-updated/build.sh old mode 100755 new mode 100644 index 970e9e636..1b58628c9 --- a/disabled-packages/libffi-updated/build.sh +++ b/disabled-packages/libffi-updated/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/archive/${_COMMIT}.zip TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory --enable-symvers=no" TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include" -termux_step_pre_configure () { +termux_step_pre_configure() { cd $TERMUX_PKG_SRCDIR ./autogen.sh } diff --git a/disabled-packages/libgeos/build.sh b/disabled-packages/libgeos/build.sh old mode 100755 new mode 100644 diff --git a/disabled-packages/mono/build.sh b/disabled-packages/mono/build.sh index e3e513ca0..eff184731 100644 --- a/disabled-packages/mono/build.sh +++ b/disabled-packages/mono/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_FOLDERNAME=mono-$_MONO_VERSION TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="--disable-btls --disable-dynamic-btls" #--with-btls-android-ndk=$ANDROID_NDK" TERMUX_PKG_BUILD_IN_SRC=true -termux_step_pre_configure () { +termux_step_pre_configure() { # export CFLAGS="$CFLAGS -mthumb" cd "$TERMUX_PKG_SRCDIR" # NOCONFIGURE=1 ./autogen.sh diff --git a/disabled-packages/nethack/build.sh b/disabled-packages/nethack/build.sh index 7d1578245..930936e84 100644 --- a/disabled-packages/nethack/build.sh +++ b/disabled-packages/nethack/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=https://s3.amazonaws.com/altorg/nethack/nethack-360-src.tgz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="ncurses" -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR/sys/unix sh setup.sh hints/linux diff --git a/disabled-packages/ocaml/build.sh b/disabled-packages/ocaml/build.sh index 5a62d7572..589f12e8e 100644 --- a/disabled-packages/ocaml/build.sh +++ b/disabled-packages/ocaml/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_SRCURL=http://caml.inria.fr/pub/distrib/ocaml-4.02/ocaml-4.02.3.tar.x TERMUX_PKG_DEPENDS="pcre, openssl, libuuid" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { ./configure -prefix $TERMUX_PREFIX -mandir $TERMUX_PREFIX/share/man/man1 -cc "$CC $CFLAGS $CPPFLAGS $LDFLAGS" \ -host $TERMUX_HOST_PLATFORM } diff --git a/disabled-packages/openjdk-9-jre-headless/build.sh b/disabled-packages/openjdk-9-jre-headless/build.sh index 5862cb69b..e943616d4 100644 --- a/disabled-packages/openjdk-9-jre-headless/build.sh +++ b/disabled-packages/openjdk-9-jre-headless/build.sh @@ -49,7 +49,7 @@ _url_src=http://hg.openjdk.java.net/mobile/dev TERMUX_PKG_SRCURL=$_url_src/archive/${changesets[0]}.tar.bz2 TERMUX_PKG_SHA256=${sha256sums[0]} -termux_step_post_extract_package () { +termux_step_post_extract_package() { cd "$TERMUX_PKG_TMPDIR" # download and extract repo archives for index in {1..7}; do @@ -72,11 +72,11 @@ termux_step_post_extract_package () { } # override this step to since openjdk provides its own customized guess scripts -termux_step_replace_guess_scripts () { +termux_step_replace_guess_scripts() { return } -termux_step_pre_configure () { +termux_step_pre_configure() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-cups-include=$TERMUX_PKG_SRCDIR/cups-$_cups_ver" ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libc.so $TERMUX_PKG_TMPDIR/libpthread.so @@ -100,7 +100,7 @@ HERE # remove sa_proc support rm $TERMUX_PKG_SRCDIR/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk } -termux_step_configure () { +termux_step_configure() { if [ $TERMUX_ARCH = "x86_64" ]; then ln -sf $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib64/libc.so $TERMUX_PKG_TMPDIR/libpthread.so else @@ -124,11 +124,11 @@ termux_step_configure () { $TERMUX_PKG_EXTRA_CONFIGURE_ARGS } -termux_step_make () { +termux_step_make() { make JOBS=$TERMUX_MAKE_PROCESSES images } -termux_step_post_make_install () { +termux_step_post_make_install() { # move jvm install dir mkdir -p $TERMUX_PREFIX/lib/jvm rm -rf "$TERMUX_PREFIX/lib/jvm/openjdk-9" diff --git a/disabled-packages/openvpn/build.sh b/disabled-packages/openvpn/build.sh index 39fdc390d..1e01a1b24 100644 --- a/disabled-packages/openvpn/build.sh +++ b/disabled-packages/openvpn/build.sh @@ -19,7 +19,7 @@ IPROUTE=$TERMUX_PREFIX/bin/ip NETSTAT=$TERMUX_PREFIX/bin/netstat" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" -termux_step_pre_configure () { +termux_step_pre_configure() { # need to provide getpass, else you "can't get console input" cp "$TERMUX_PKG_BUILDER_DIR/netbsd_getpass.c" "$TERMUX_PKG_SRCDIR/src/openvpn/" @@ -27,7 +27,7 @@ termux_step_pre_configure () { LDFLAGS="$LDFLAGS -llog " } -termux_step_post_make_install () { +termux_step_post_make_install() { # helper script install -m700 "$TERMUX_PKG_BUILDER_DIR/termux-openvpn" "$TERMUX_PREFIX/bin/" # Install examples diff --git a/disabled-packages/pacman/build.sh b/disabled-packages/pacman/build.sh index ae6cad2ce..16b25c400 100644 --- a/disabled-packages/pacman/build.sh +++ b/disabled-packages/pacman/build.sh @@ -17,13 +17,13 @@ termux_step_pre_configure() { LDFLAGS+="$LDFLAGS -llog -landroid-glob" } -termux_step_make () { +termux_step_make() { make make -C contrib # make -C "$pkgname-$pkgver" check } -termux_step_make_install () { +termux_step_make_install() { make install make -C contrib install diff --git a/disabled-packages/premake/build.sh b/disabled-packages/premake/build.sh index d0f9d184a..1a02133e6 100644 --- a/disabled-packages/premake/build.sh +++ b/disabled-packages/premake/build.sh @@ -6,6 +6,6 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/premake/Premake/4.4/p # TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl" -termux_step_pre_configure () { +termux_step_pre_configure() { TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/build/gmake.unix } diff --git a/disabled-packages/racket/build.sh b/disabled-packages/racket/build.sh index f679e0808..4053f49ad 100644 --- a/disabled-packages/racket/build.sh +++ b/disabled-packages/racket/build.sh @@ -9,12 +9,12 @@ TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_DEPENDS="libffi, libandroid-support" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-racket=$TERMUX_PKG_HOSTBUILD_DIR/racket/racketcgc --enable-libs --disable-shared --disable-gracket --enable-libffi" -termux_step_host_build () { +termux_step_host_build() { $TERMUX_PKG_SRCDIR/src/configure ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS} make -j $TERMUX_MAKE_PROCESSES } -termux_step_pre_configure () { +termux_step_pre_configure() { CPPFLAGS+=" -I$TERMUX_PKG_SRCDIR/src/racket/include -I$TERMUX_PKG_BUILDDIR/racket" # Due to use of syslog. LDFLAGS+=" -llog" diff --git a/disabled-packages/sbcl/build.sh b/disabled-packages/sbcl/build.sh index 505f0dc21..d69fd591c 100644 --- a/disabled-packages/sbcl/build.sh +++ b/disabled-packages/sbcl/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Steel Bank Common Lisp" TERMUX_PKG_VERSION=1.3.9 TERMUX_PKG_SRCURL=http://prdownloads.sourceforge.net/sbcl/sbcl-${TERMUX_PKG_VERSION}-source.tar.bz2 -termux_step_pre_configure () { +termux_step_pre_configure() { local SBCL_HOST_TARFILE=$TERMUX_PKG_CACHEDIR/sbcl-host-${TERMUX_PKG_VERSION}.tar.bz2 if [ ! -f $SBCL_HOST_TARFILE ]; then curl -o $SBCL_HOST_TARFILE -L http://downloads.sourceforge.net/project/sbcl/sbcl/${TERMUX_PKG_VERSION}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux-binary.tar.bz2 @@ -16,7 +16,7 @@ termux_step_pre_configure () { export SBCL_HOME=$TERMUX_PKG_CACHEDIR/sbcl-host/lib/sbcl } -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR sh make.sh --prefix=$TERMUX_PREFIX } diff --git a/disabled-packages/swi-prolog/build.sh b/disabled-packages/swi-prolog/build.sh index 343b51ee3..7a7783647 100644 --- a/disabled-packages/swi-prolog/build.sh +++ b/disabled-packages/swi-prolog/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_DEPENDS="readline, libgmp" -termux_step_host_build () { +termux_step_host_build() { cp -Rf $TERMUX_PKG_SRCDIR/* . # apt install libgmp-dev:i386 libncurses5-dev:i386 @@ -23,7 +23,7 @@ termux_step_host_build () { } -termux_step_post_configure () { +termux_step_post_configure() { cp $TERMUX_PKG_HOSTBUILD_DIR/src/defatom src/ touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/defatom #cp $TERMUX_PKG_HOSTBUILD_DIR/{defatom,swipl} $TERMUX_PKG_BUILDDIR/src/ @@ -35,6 +35,6 @@ termux_step_post_configure () { perl -p -i -e "s|${TERMUX_ARCH}-linux|i386-linux|" */swipl.sh } -termux_step_post_make_install () { +termux_step_post_make_install() { mv $TERMUX_PREFIX/lib/swipl-$TERMUX_PKG_VERSION/lib/${TERMUX_ARCH}-linux/libswipl.so* $TERMUX_PREFIX/lib/ } diff --git a/disabled-packages/toybox/build.sh b/disabled-packages/toybox/build.sh index cd4ccad28..1f3d72605 100644 --- a/disabled-packages/toybox/build.sh +++ b/disabled-packages/toybox/build.sh @@ -5,6 +5,6 @@ TERMUX_PKG_SRCURL=http://landley.net/toybox/downloads/toybox-${TERMUX_PKG_VERSIO TERMUX_PKG_SHA256=e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6 TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { make defconfig } diff --git a/disabled-packages/unnethack/build.sh b/disabled-packages/unnethack/build.sh index 92a72dc4f..8f10131d8 100644 --- a/disabled-packages/unnethack/build.sh +++ b/disabled-packages/unnethack/build.sh @@ -15,7 +15,7 @@ CFLAGS="$CFLAGS $CPPFLAGS $LDFLAGS" export LFLAGS="$LDFLAGS" LD="$CC" -termux_step_pre_configure () { +termux_step_pre_configure() { # Create a host build for the makedefs binary mkdir $TERMUX_PKG_TMPDIR/host-build cd $TERMUX_PKG_TMPDIR/host-build @@ -40,17 +40,17 @@ termux_step_pre_configure () { export LFLAGS=$ORIG_LFLAGS } -termux_step_post_configure () { +termux_step_post_configure() { # Use the host built makedefs cp $TERMUX_PKG_TMPDIR/host-build/util/makedefs $TERMUX_PKG_BUILDDIR/util/makedefs cp $TERMUX_PKG_TMPDIR/host-build/util/lev_comp $TERMUX_PKG_BUILDDIR/util/lev_comp cp $TERMUX_PKG_TMPDIR/host-build/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp cp $TERMUX_PKG_TMPDIR/host-build/util/dlb $TERMUX_PKG_BUILDDIR/util/dlb # Update timestamp so the binary does not get rebuilt - touch -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb + touch -d "next hour" $TERMUX_PKG_BUILDDIR/util/makedefs $TERMUX_PKG_BUILDDIR/util/lev_comp $TERMUX_PKG_BUILDDIR/util/dgn_comp $TERMUX_PKG_BUILDDIR/util/dlb } -termux_step_post_make_install () { +termux_step_post_make_install() { # Add directory which must exist: mkdir -p $TERMUX_PREFIX/var/unnethack/level echo "This directory stores locks" > $TERMUX_PREFIX/var/unnethack/level/README diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index 5312c56d5..4fb65a4a1 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli" -termux_step_make_install () { +termux_step_make_install() { # FIXME: We would like to enable checksums when downloading # tar files, but they change each time as the tar metadata # differs: https://github.com/google/gitiles/issues/84 @@ -96,10 +96,10 @@ termux_step_make_install () { # In file included from process_name.c:29: # /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:116:45: error: expected identifier # __errordecl(__property_get_too_small_error, "property_get() called with too small of a buffer"); - # ^ + # ^ # /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:119:5: error: static declaration of 'property_get' follows non-static declaration # int property_get(const char *key, char *value, const char *default_value) { - # ^ + # ^ # /data/data/com.termux/files/usr/include/aosp/cutils/properties.h:46:5: note: previous declaration is here # int property_get(const char *key, char *value, const char *default_value); $CC ${CFLAGS/-D_FORTIFY_SOURCE=2/} \ diff --git a/packages/abduco/build.sh b/packages/abduco/build.sh index 332161593..b3227f187 100644 --- a/packages/abduco/build.sh +++ b/packages/abduco/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=c90909e13fa95770b5afc3b59f311b3d3d2fdfae23f9569fa4f96a3e192a35 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libutil,dvtm" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" $CPPFLAGS" } diff --git a/packages/ack-grep/build.sh b/packages/ack-grep/build.sh index 7bc2d7910..d7203cb1e 100644 --- a/packages/ack-grep/build.sh +++ b/packages/ack-grep/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SKIP_SRC_EXTRACT=yes TERMUX_PKG_DEPENDS="perl, coreutils" TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { termux_download \ $TERMUX_PKG_SRCURL \ $TERMUX_PREFIX/bin/ack \ diff --git a/packages/alpine/build.sh b/packages/alpine/build.sh index 1937297f8..ca74a0644 100644 --- a/packages/alpine/build.sh +++ b/packages/alpine/build.sh @@ -17,7 +17,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { export TCC=$CC export TRANLIB=$RANLIB export SPELLPROG=${TERMUX_PREFIX}/bin/hunspell @@ -40,7 +40,7 @@ termux_step_post_configure() { $CC_FOR_BUILD help_h_gen.c -o help_h_gen touch -d "next hour" help_c_gen help_h_gen } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" >> postinst echo "if [ ! -e $TERMUX_ANDROID_HOME/.alpine-smime/.pwd/MasterPassword.crt ] && [ ! -e $HOME/.alpine-smime/.pwd/MasterPassword.key ]; then" >> postinst diff --git a/packages/angband/build.sh b/packages/angband/build.sh index 7696dd82d..9c7cd0334 100644 --- a/packages/angband/build.sh +++ b/packages/angband/build.sh @@ -9,11 +9,11 @@ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11 --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband" TERMUX_PKG_RM_AFTER_INSTALL="share/angband/xtra share/angband/icons" -termux_step_pre_configure () { +termux_step_pre_configure() { ./autogen.sh perl -p -i -e 's|ncursesw5-config|ncursesw6-config|g' configure } -termux_step_post_make_install () { +termux_step_post_make_install() { rm -Rf $TERMUX_PREFIX/share/angband/{fonts,sounds} } diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index d9a0bc36e..46becadb6 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -70,7 +70,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/apache2/build" TERMUX_PKG_EXTRA_MAKE_ARGS="-s" -termux_step_pre_configure () { +termux_step_pre_configure() { # remove old files rm -rf "$TERMUX_PREFIX"/{libexec,share,etc}/apache2 rm -rf "$TERMUX_PREFIX"/lib/cgi-bin @@ -87,13 +87,13 @@ termux_step_pre_configure () { cat $TERMUX_PKG_BUILDER_DIR/Termux.layout > $TERMUX_PKG_SRCDIR/config.layout } -termux_step_post_configure () { +termux_step_post_configure() { # thanks to @JetBalsa gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c -o $TERMUX_PKG_BUILDDIR/server/gen_test_char touch -d "1 hour" $TERMUX_PKG_BUILDDIR/server/gen_test_char } -termux_step_post_make_install () { +termux_step_post_make_install() { sed -e "s#/$TERMUX_PREFIX/libexec/apache2/#modules/#" \ -e 's|#\(LoadModule negotiation_module \)|\1|' \ -e 's|#\(LoadModule include_module \)|\1|' \ @@ -110,7 +110,7 @@ termux_step_post_make_install () { -i "$TERMUX_PREFIX/etc/apache2/httpd.conf" } -termux_step_post_massage () { +termux_step_post_massage() { # sometimes it creates a $TERMUX_PREFIX/bin/sh -> /bin/sh rm ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/bin/sh || true diff --git a/packages/apksigner/build.sh b/packages/apksigner/build.sh index e8a49fb59..2194231ea 100644 --- a/packages/apksigner/build.sh +++ b/packages/apksigner/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/fornwall/apksigner/archive/v${TERMUX_PKG_VE TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_make () { +termux_step_make() { mkdir -p $TERMUX_PREFIX/share/{dex,man/man1} cp apksigner.1 $TERMUX_PREFIX/share/man/man1/ diff --git a/packages/apr/build.sh b/packages/apr/build.sh index 4183f0747..ecf72b695 100644 --- a/packages/apr/build.sh +++ b/packages/apr/build.sh @@ -19,6 +19,6 @@ ac_cv_search_crypt=" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/apr-1-config share/apr-1/build" TERMUX_PKG_RM_AFTER_INSTALL="lib/apr.exp" -termux_step_post_make_install () { +termux_step_post_make_install() { sed -i "s%NM=\".*%NM=\"${TERMUX_HOST_PLATFORM}-nm -B\"%g" $TERMUX_PREFIX/share/apr-1/build/libtool } diff --git a/packages/apt/build.sh b/packages/apt/build.sh index 5f27e9752..464fc3e80 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec" -TERMUX_PKG_VERSION=1.4.8 -TERMUX_PKG_REVISION=9 -TERMUX_PKG_SHA256=767ad7d6efb64cde52faececb7d3c0bf49800b9fe06f3a5b0132ab4c01a5b8f8 +TERMUX_PKG_VERSION=1.4.9 +TERMUX_PKG_SHA256=d4d65e7c84da86f3e6dcc933bba46a08db429c9d933b667c864f5c0e880bac0d TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DPERL_EXECUTABLE=`which perl` diff --git a/packages/apt/fix-CVE-2019-3462.patch b/packages/apt/fix-CVE-2019-3462.patch deleted file mode 100644 index b40d98000..000000000 --- a/packages/apt/fix-CVE-2019-3462.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -uNr apt-1.4.8/apt-pkg/acquire-method.cc apt-1.4.8.mod/apt-pkg/acquire-method.cc ---- apt-1.4.8/apt-pkg/acquire-method.cc 2017-09-13 19:47:33.000000000 +0300 -+++ apt-1.4.8.mod/apt-pkg/acquire-method.cc 2019-01-22 23:03:29.751025868 +0200 -@@ -458,6 +458,13 @@ - * the worker will enqueue again later on to the right queue */ - void pkgAcqMethod::Redirect(const string &NewURI) - { -+ if (NewURI.find_first_not_of(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~") != std::string::npos) -+ { -+ _error->Error("SECURITY: URL redirect target contains control characters, rejecting."); -+ Fail(); -+ return; -+ } -+ - std::cout << "103 Redirect\nURI: " << Queue->Uri << "\n" - << "New-URI: " << NewURI << "\n" - << "\n" << std::flush; diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh index 77730a794..3c576c136 100644 --- a/packages/asciinema/build.sh +++ b/packages/asciinema/build.sh @@ -10,15 +10,15 @@ TERMUX_PKG_HAS_DEBUG=no # ncurses-utils for tput which asciinema uses: TERMUX_PKG_DEPENDS="python, ncurses-utils" -termux_step_make () { +termux_step_make() { return } -termux_step_make_install () { +termux_step_make_install() { export PYTHONPATH=$TERMUX_PREFIX/lib/python3.7/site-packages/ python3.7 setup.py install --prefix=$TERMUX_PREFIX --force } -termux_step_post_massage () { +termux_step_post_massage() { find . -path '*/__pycache__*' -delete } diff --git a/packages/autoconf/build.sh b/packages/autoconf/build.sh index 1c4c57071..959422d88 100644 --- a/packages/autoconf/build.sh +++ b/packages/autoconf/build.sh @@ -7,11 +7,11 @@ TERMUX_PKG_SHA256=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a576 TERMUX_PKG_DEPENDS="m4, make, perl" TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_post_extract_package () { +termux_step_post_extract_package() { perl -p -i -e "s|/bin/sh|$TERMUX_PREFIX/bin/sh|" lib/*/*.m4 } -termux_step_post_massage () { +termux_step_post_massage() { perl -p -i -e "s|/usr/bin/m4|$TERMUX_PREFIX/bin/m4|" bin/* perl -p -i -e "s|CONFIG_SHELL-/bin/sh|CONFIG_SHELL-$TERMUX_PREFIX/bin/sh|" bin/autoconf } diff --git a/packages/autossh/build.sh b/packages/autossh/build.sh index 8e80e7b4d..67332dcdc 100644 --- a/packages/autossh/build.sh +++ b/packages/autossh/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_DEPENDS="openssh | dropbear" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man ac_cv_path_ssh=$TERMUX_PREFIX/bin/ssh" -termux_step_pre_configure () { +termux_step_pre_configure() { # For syslog logging: LDFLAGS+=" -llog" } diff --git a/packages/axel/build.sh b/packages/axel/build.sh old mode 100755 new mode 100644 diff --git a/packages/babl/Makefile.am.patch b/packages/babl/Makefile.am.patch index 01cda84ab..51cbcc3dc 100644 --- a/packages/babl/Makefile.am.patch +++ b/packages/babl/Makefile.am.patch @@ -1,11 +1,13 @@ -diff -u -r ../babl-BABL_0_1_34/Makefile.am ./Makefile.am ---- ../babl-BABL_0_1_34/Makefile.am 2017-10-06 15:15:57.000000000 +0200 -+++ ./Makefile.am 2017-10-14 20:26:51.643517261 +0200 -@@ -3,7 +3,6 @@ +diff -u -r ../babl-BABL_0_1_62/Makefile.am ./Makefile.am +--- ../babl-BABL_0_1_62/Makefile.am 2019-02-01 16:22:50.000000000 +0000 ++++ ./Makefile.am 2019-02-03 21:11:44.103560598 +0000 +@@ -3,8 +3,7 @@ SUBDIRS = \ babl \ extensions \ -- tests \ - tools +- tools \ +- tests ++ tools if ENABLE_DOCS + SUBDIRS+= docs diff --git a/packages/babl/build.sh b/packages/babl/build.sh index 80a52d571..5ae49d32c 100644 --- a/packages/babl/build.sh +++ b/packages/babl/build.sh @@ -1,9 +1,10 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/babl/ TERMUX_PKG_DESCRIPTION="Dynamic pixel format translation library" TERMUX_PKG_LICENSE="LGPL-3.0" -TERMUX_PKG_VERSION=0.1.60 -TERMUX_PKG_SHA256=1850e024b8972404cae04809e00c7392501b6f14c1b00c65d8128592e021dd1a +TERMUX_PKG_VERSION=0.1.62 +TERMUX_PKG_SHA256=1364e8e0dae5b03f96b3496348388508e4a93ab4f9cc0c06cca6a719e0c2ec36 TERMUX_PKG_SRCURL=https://github.com/GNOME/babl/archive/BABL_${TERMUX_PKG_VERSION//./_}.tar.gz +TERMUX_PKG_DEPENDS="littlecms" termux_step_pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/packages/bash/build.sh b/packages/bash/build.sh old mode 100755 new mode 100644 index 8323addf9..224d3e595 --- a/packages/bash/build.sh +++ b/packages/bash/build.sh @@ -27,7 +27,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" bash_cv_getcwd_malloc=yes" TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug" -termux_step_pre_configure () { +termux_step_pre_configure() { declare -A PATCH_CHECKSUMS PATCH_CHECKSUMS[001]=3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f PATCH_CHECKSUMS[002]=7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53 @@ -63,7 +63,7 @@ termux_step_pre_configure () { done } -termux_step_post_make_install () { +termux_step_post_make_install() { sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-profile > $TERMUX_PREFIX/etc/profile sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \ $TERMUX_PKG_BUILDER_DIR/etc-profile | \ diff --git a/packages/bat/build.sh b/packages/bat/build.sh index 57d751309..3700ab4db 100644 --- a/packages/bat/build.sh +++ b/packages/bat/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sharkdp/bat TERMUX_PKG_DESCRIPTION="A cat(1) clone with wings" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=0.9.0 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=4ce9c118cf5da1159a882dea389f3c5737b5d98192e9a619b0fe8c1730341cc6 +TERMUX_PKG_VERSION=0.10.0 +TERMUX_PKG_SHA256=54dd396e8f20d44c6032a32339f45eab46a69b6134e74a704f8d4a27c18ddc3e TERMUX_PKG_SRCURL=https://github.com/sharkdp/bat/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes # bat calls less with '--RAW-CONTROL-CHARS' which busybox less does not support: diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh old mode 100755 new mode 100644 index 5e83f7eaa..be98c5e04 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://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_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=2.31.1 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SHA256=e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88 +TERMUX_PKG_VERSION=2.32 +TERMUX_PKG_SHA256=9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gold --enable-plugins --disable-werror --with-system-zlib --enable-new-dtags" TERMUX_PKG_EXTRA_MAKE_ARGS="tooldir=$TERMUX_PREFIX" @@ -13,7 +12,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES=true # Avoid linking against libfl.so from flex if available: export LEXLIB= -termux_step_pre_configure () { +termux_step_pre_configure() { export CPPFLAGS="$CPPFLAGS -Wno-c++11-narrowing" if [ $TERMUX_ARCH_BITS = 32 ]; then @@ -23,7 +22,7 @@ termux_step_pre_configure () { fi } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/ldd $TERMUX_PREFIX/bin/ldd cd $TERMUX_PREFIX/bin # Setup symlinks as these are used when building, so used by @@ -31,5 +30,5 @@ termux_step_post_make_install () { for b in ar ld nm objdump ranlib readelf strip; do ln -s -f $b $TERMUX_HOST_PLATFORM-$b done - ln -sf ld.gold gold + ln -sf ld.gold gold } diff --git a/packages/bison/build.sh b/packages/bison/build.sh index 1cacf4957..0a223f440 100644 --- a/packages/bison/build.sh +++ b/packages/bison/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/bison/ TERMUX_PKG_DESCRIPTION="General-purpose parser generator" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_DEPENDS="m4" -TERMUX_PKG_VERSION=3.3 -TERMUX_PKG_SHA256=162ea71d21e134c44942f4ebb74685e19c942dcf40a7120eba165ba5e2553bb9 +TERMUX_PKG_VERSION=3.3.2 +TERMUX_PKG_SHA256=039ee45b61d95e5003e7e8376f9080001b4066ff357bde271b7faace53b9d804 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_CONFIGURE_ARGS="M4=m4" diff --git a/packages/brogue/build.sh b/packages/brogue/build.sh index 204771c8c..a9d7d63b3 100644 --- a/packages/brogue/build.sh +++ b/packages/brogue/build.sh @@ -8,10 +8,10 @@ TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_EXTRA_MAKE_ARGS="curses" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" } -termux_step_make_install () { +termux_step_make_install() { cp bin/brogue $TERMUX_PREFIX/bin } diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh old mode 100755 new mode 100644 index ee39f026b..da06ac73e --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -11,11 +11,11 @@ TERMUX_PKG_BUILD_IN_SRC=yes # We replace env in the old coreutils package: TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -llog" # Android system liblog.so for syslog } -termux_step_configure () { +termux_step_configure() { cp $TERMUX_PKG_BUILDER_DIR/busybox.config .config echo "CONFIG_SYSROOT=\"$TERMUX_STANDALONE_TOOLCHAIN/sysroot\"" >> .config echo "CONFIG_PREFIX=\"$TERMUX_PREFIX\"" >> .config @@ -25,7 +25,7 @@ termux_step_configure () { make oldconfig } -termux_step_post_make_install () { +termux_step_post_make_install() { if [ "$TERMUX_DEBUG" == "true" ]; then install busybox_unstripped $PREFIX/bin/busybox fi diff --git a/packages/ca-certificates/build.sh b/packages/ca-certificates/build.sh index 046dbcc90..aa6e27b5f 100644 --- a/packages/ca-certificates/build.sh +++ b/packages/ca-certificates/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=c1fd9b235896b1094ee97bfb7e042f93530b5e300781f59b45edf84ee8c750 TERMUX_PKG_SKIP_SRC_EXTRACT=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { local CERTDIR=$TERMUX_PREFIX/etc/tls local CERTFILE=$CERTDIR/cert.pem diff --git a/packages/caddy/build.sh b/packages/caddy/build.sh index bfe684563..7d3bfbe0d 100644 --- a/packages/caddy/build.sh +++ b/packages/caddy/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://caddyserver.com/ TERMUX_PKG_DESCRIPTION="Fast, cross-platform HTTP/2 web server" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=0.11.2 +TERMUX_PKG_VERSION=0.11.3 +TERMUX_PKG_SHA256=b99973614b85f55da309cdf79e5d6c9aae8ad1bd83c425b1f1fd17b21386eab6 TERMUX_PKG_SRCURL=https://github.com/mholt/caddy/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=61779a09959bf6a0e7007e8ff5c2a94811dd12b7628166cb31e9648a97c0e75b termux_step_make() { termux_setup_golang diff --git a/packages/cboard/build.sh b/packages/cboard/build.sh index 27131cfd9..4831b10a9 100644 --- a/packages/cboard/build.sh +++ b/packages/cboard/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=dd748039f3531653e1573577cd814741524e1b16e16e3a841ef512e5150da6 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/c-board/${TERMUX_PKG_VERSION}/cboard-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="libandroid-support,libandroid-glob,gnuchess, ncurses, ncurses-ui-libs" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX" LDFLAGS+=" -landroid-glob" if [ "$TERMUX_DEBUG" == "true" ]; then diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index 1aa520d0c..1d691590c 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=3.13.3 -TERMUX_PKG_SHA256=665f905036b1f731a2a16f83fb298b1fb9d0f98c382625d023097151ad016b25 +TERMUX_PKG_VERSION=3.13.4 +TERMUX_PKG_SHA256=fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang" TERMUX_PKG_FORCE_CMAKE=yes diff --git a/packages/cmark/build.sh b/packages/cmark/build.sh old mode 100755 new mode 100644 diff --git a/packages/cmatrix/build.sh b/packages/cmatrix/build.sh index 3a5ec7bdc..8c3eadd99 100644 --- a/packages/cmatrix/build.sh +++ b/packages/cmatrix/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/abishekvashok/cmatrix/archive/${_REAL_VERSI TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man" TERMUX_PKG_DEPENDS="ncurses" -termux_step_pre_configure () { +termux_step_pre_configure() { export ac_cv_file__usr_lib_kbd_consolefonts=no export ac_cv_file__usr_share_consolefonts=no export ac_cv_file__usr_lib_X11_fonts_misc=no diff --git a/packages/cmus/build.sh b/packages/cmus/build.sh index a8e5be082..0f9854fb6 100644 --- a/packages/cmus/build.sh +++ b/packages/cmus/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cmus.github.io/ TERMUX_PKG_DESCRIPTION="Small, fast and powerful console music player" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.7.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SHA256=8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165 TERMUX_PKG_DEPENDS="libandroid-support, ncurses, libflac, libmad, libvorbis, opusfile, libcue, libpulseaudio" TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/v${TERMUX_PKG_VERSION}.tar.gz @@ -13,6 +13,6 @@ termux_step_pre_configure() { export CONFIG_OSS=n } -termux_step_configure () { +termux_step_configure() { ./configure prefix=$TERMUX_PREFIX } diff --git a/packages/command-not-found/build.sh b/packages/command-not-found/build.sh index 0aa2cc1b6..ce2031a32 100644 --- a/packages/command-not-found/build.sh +++ b/packages/command-not-found/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Suggest installation of packages in interactive shell se TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.36 -termux_step_make_install () { +termux_step_make_install() { TERMUX_LIBEXEC_DIR=$TERMUX_PREFIX/libexec/termux mkdir -p $TERMUX_LIBEXEC_DIR $CC -Wall -Wextra -Werror -pedantic $CFLAGS $LDFLAGS -std=c11 $TERMUX_PKG_BUILDER_DIR/command-not-found.c \ - -o $TERMUX_LIBEXEC_DIR/command-not-found + -o $TERMUX_LIBEXEC_DIR/command-not-found } diff --git a/packages/coreutils/build.sh b/packages/coreutils/build.sh old mode 100755 new mode 100644 diff --git a/packages/corkscrew/build.sh b/packages/corkscrew/build.sh index 6ccc219ee..2391cf6f8 100644 --- a/packages/corkscrew/build.sh +++ b/packages/corkscrew/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/corkscrew-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be -termux_step_post_make_install () { +termux_step_post_make_install() { # Corkscrew does not distribute a man page, use one from debian: mkdir -p $TERMUX_PREFIX/share/man/man1 cp $TERMUX_PKG_BUILDER_DIR/corkscrew.1 $TERMUX_PREFIX/share/man/man1 diff --git a/packages/cowsay/build.sh b/packages/cowsay/build.sh index bb5fa3262..a0c3c6dc1 100644 --- a/packages/cowsay/build.sh +++ b/packages/cowsay/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b8 TERMUX_PKG_DEPENDS="perl" TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR sh install.sh } diff --git a/packages/curseofwar/build.sh b/packages/curseofwar/build.sh index 3e6ac1218..6caeb37fc 100644 --- a/packages/curseofwar/build.sh +++ b/packages/curseofwar/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/a-nikolaev/curseofwar/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=91b7781e26341faa6b6999b6baf6e74ef532fa94303ab6a2bf9ff6d614a3f670 -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man6 cp curseofwar $TERMUX_PREFIX/bin cp $TERMUX_PKG_SRCDIR/curseofwar.6 $TERMUX_PREFIX/share/man/man6 diff --git a/packages/dash/build.sh b/packages/dash/build.sh index 55e721fc8..fbd0e807e 100644 --- a/packages/dash/build.sh +++ b/packages/dash/build.sh @@ -7,11 +7,10 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz -termux_step_post_make_install () { +termux_step_post_make_install() { # Symlink sh -> dash - rm -f $TERMUX_PREFIX/bin/sh $TERMUX_PREFIX/share/man/man1/sh.1 cd $TERMUX_PREFIX/bin - ln -s dash sh + ln -sf dash sh cd $TERMUX_PREFIX/share/man/man1 - ln -s dash.1 sh.1 + ln -sf dash.1 sh.1 } diff --git a/packages/dcraw/build.sh b/packages/dcraw/build.sh index c1ce39c33..c68c1784d 100644 --- a/packages/dcraw/build.sh +++ b/packages/dcraw/build.sh @@ -7,9 +7,9 @@ TERMUX_PKG_SRCURL=http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-${TERMUX_ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="littlecms, libjasper, libjpeg-turbo" -termux_step_make_install () { +termux_step_make_install() { # See the "install" script for flags: $CC $CFLAGS $CPPFLAGS $LDFLAGS dcraw.c $TERMUX_PKG_BUILDER_DIR/swab.c -lm -ljasper -ljpeg -llcms2 -o $TERMUX_PREFIX/bin/dcraw - chmod +w dcraw.1 # Add missing write permission + chmod +w dcraw.1 # Add missing write permission cp dcraw.1 $TERMUX_PREFIX/share/man/man1/ } diff --git a/packages/debianutils/build.sh b/packages/debianutils/build.sh index 06a73c133..234a279a7 100644 --- a/packages/debianutils/build.sh +++ b/packages/debianutils/build.sh @@ -1,7 +1,7 @@ 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_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=4.8.6 -TERMUX_PKG_SHA256=db09047144dadf6a35d0f28977fbef83b0dd60ca32e6c8512cce2444a6423f73 +TERMUX_PKG_VERSION=4.8.6.1 +TERMUX_PKG_SHA256=099f1e8a7278b26145a2ba2dda84c4118403bfab38c8d7070a6235a7ffcb55ed 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" diff --git a/packages/dialog/build.sh b/packages/dialog/build.sh old mode 100755 new mode 100644 index f647e79fd..d7c42d2af --- a/packages/dialog/build.sh +++ b/packages/dialog/build.sh @@ -8,12 +8,12 @@ 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_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-config" -termux_step_pre_configure () { +termux_step_pre_configure() { # Put a temporary link for libtinfo.so ln -s -f $TERMUX_PREFIX/lib/libncursesw.so $TERMUX_PREFIX/lib/libtinfo.so } -termux_step_post_make_install () { +termux_step_post_make_install() { rm $TERMUX_PREFIX/lib/libtinfo.so cd $TERMUX_PREFIX/bin ln -f -s dialog whiptail diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh index a507de127..67ca38ef1 100644 --- a/packages/dnsutils/build.sh +++ b/packages/dnsutils/build.sh @@ -20,7 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-eddsa=no " -termux_step_pre_configure () { +termux_step_pre_configure() { export BUILD_AR=ar export BUILD_CC=gcc export BUILD_CFLAGS= @@ -33,7 +33,7 @@ termux_step_pre_configure () { LDFLAGS+=" -llog" } -termux_step_make () { +termux_step_make() { make -C lib/isc make -C lib/dns make -C lib/ns @@ -46,7 +46,7 @@ termux_step_make () { make -C bin/nsupdate } -termux_step_make_install () { +termux_step_make_install() { make -C lib/isc install make -C lib/dns install make -C lib/ns install diff --git a/packages/doxygen/build.sh b/packages/doxygen/build.sh index 14fcbf295..116fdd91a 100644 --- a/packages/doxygen/build.sh +++ b/packages/doxygen/build.sh @@ -13,7 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dbuild_parse=yes -Dbuild_xmlparser=yes " -termux_step_post_make_install () { +termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man1 cp $TERMUX_PKG_SRCDIR/doc/doxygen.1 $TERMUX_PREFIX/share/man/man1 } diff --git a/packages/dpkg/build.sh b/packages/dpkg/build.sh old mode 100755 new mode 100644 index 4325ac60e..877dabadd --- a/packages/dpkg/build.sh +++ b/packages/dpkg/build.sh @@ -65,7 +65,7 @@ share/perl5 TERMUX_PKG_DEPENDS="busybox, liblzma" TERMUX_PKG_ESSENTIAL=yes -termux_step_pre_configure () { +termux_step_pre_configure() { export TAR=tar # To make sure dpkg tries to use "tar" instead of e.g. "gnutar" (which happens when building on OS X) perl -p -i -e "s/TERMUX_ARCH/$TERMUX_ARCH/" $TERMUX_PKG_SRCDIR/configure } diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index ee7ac9868..37d24148f 100644 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -23,7 +23,7 @@ termux_step_post_make_install() { ln -sf "dropbearmulti" "${TERMUX_PREFIX}/bin/ssh" } -termux_step_create_debscripts () { +termux_step_create_debscripts() { { echo "#!$TERMUX_PREFIX/bin/sh" echo "mkdir -p $TERMUX_PREFIX/etc/dropbear" diff --git a/packages/dx/build.sh b/packages/dx/build.sh old mode 100755 new mode 100644 index 38f950227..9756cfd3e --- a/packages/dx/build.sh +++ b/packages/dx/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=$TERMUX_ANDROID_BUILD_TOOLS_VERSION TERMUX_PKG_PLATFORM_INDEPENDENT=true -termux_step_make_install () { +termux_step_make_install() { # Rewrite packages to avoid using com.android.* classes which may clash with # classes in the Android runtime on devices (see #1801): local JARJAR=$TERMUX_PKG_CACHEDIR/jarjar.jar diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh old mode 100755 new mode 100644 index 10300328c..b9f5b64e5 --- a/packages/ecj/build.sh +++ b/packages/ecj/build.sh @@ -9,11 +9,11 @@ TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_CONFLICTS="ecj4.6" -termux_step_extract_package () { +termux_step_extract_package() { mkdir $TERMUX_PKG_SRCDIR } -termux_step_make () { +termux_step_make() { local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar termux_download $TERMUX_PKG_SRCURL \ $RAW_JAR \ @@ -32,16 +32,16 @@ termux_step_make () { jar cf ecj.jar classes.dex # Add needed properties file to jar file: jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/batch/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/batch/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/batch/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/problem/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/problem/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/problem/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props - jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props + jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props for i in `seq 1 24`; do jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc - jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc + jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc done # Move into place: mv ecj.jar $TERMUX_PREFIX/share/dex/ecj.jar @@ -50,7 +50,7 @@ termux_step_make () { mkdir android-jar cd android-jar - # We need the android classes for JDT to compile against. + # We need the android classes for JDT to compile against. cp $ANDROID_HOME/platforms/android-28/android.jar . unzip -q android.jar rm -Rf android.jar resources.arsc res assets diff --git a/packages/ecj4.6/build.sh b/packages/ecj4.6/build.sh old mode 100755 new mode 100644 index 211e74d16..4eefa9ff7 --- a/packages/ecj4.6/build.sh +++ b/packages/ecj4.6/build.sh @@ -9,11 +9,11 @@ TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_CONFLICTS="ecj" -termux_step_extract_package () { +termux_step_extract_package() { mkdir $TERMUX_PKG_SRCDIR } -termux_step_make () { +termux_step_make() { local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar termux_download $TERMUX_PKG_SRCURL \ $RAW_JAR \ @@ -32,16 +32,16 @@ termux_step_make () { jar cf ecj.jar classes.dex # Add needed properties file to jar file: jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/batch/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/batch/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/batch/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/problem/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/problem/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/problem/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/messages.properties - jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties + jar uf ecj.jar org/eclipse/jdt/internal/compiler/messages.properties jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props - jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props + jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/readableNames.props for i in `seq 1 24`; do jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc - jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc + jar uf ecj.jar org/eclipse/jdt/internal/compiler/parser/parser$i.rsc done # Move into place: mv ecj.jar $TERMUX_PREFIX/share/dex/ecj.jar @@ -50,7 +50,7 @@ termux_step_make () { mkdir android-jar cd android-jar - # We need the android classes for JDT to compile against. + # We need the android classes for JDT to compile against. cp $ANDROID_HOME/platforms/android-28/android.jar . unzip -q android.jar rm -Rf android.jar resources.arsc res assets diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index b7c13236e..ebb98482a 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -41,7 +41,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/i # program still remain in the emacs package): TERMUX_PKG_RM_AFTER_INSTALL+=" bin/ctags share/man/man1/ctags.1 share/man/man1/ctags.1.gz" -termux_step_post_extract_package () { +termux_step_post_extract_package() { # XXX: We have to start with new host build each time # to avoid build error when cross compiling. rm -Rf $TERMUX_PKG_HOSTBUILD_DIR @@ -56,7 +56,7 @@ termux_step_post_extract_package () { export CANNOT_DUMP=yes } -termux_step_host_build () { +termux_step_host_build() { # Build a bootstrap-emacs binary to be used in termux_step_post_configure. local NATIVE_PREFIX=$TERMUX_PKG_TMPDIR/emacs-native mkdir -p $NATIVE_PREFIX/share/emacs/$TERMUX_PKG_VERSION @@ -66,13 +66,13 @@ termux_step_host_build () { make -j $TERMUX_MAKE_PROCESSES } -termux_step_post_configure () { +termux_step_post_configure() { cp $TERMUX_PKG_HOSTBUILD_DIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs cp $TERMUX_PKG_HOSTBUILD_DIR/lib-src/make-docfile $TERMUX_PKG_BUILDDIR/lib-src/make-docfile # Update timestamps so that the binaries does not get rebuilt: touch -d "next hour" $TERMUX_PKG_BUILDDIR/src/bootstrap-emacs $TERMUX_PKG_BUILDDIR/lib-src/make-docfile } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/site-init.el $TERMUX_PREFIX/share/emacs/${TERMUX_PKG_VERSION}/lisp/emacs-lisp/ } diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh old mode 100755 new mode 100644 index f9622836e..7c8aac874 --- a/packages/erlang/build.sh +++ b/packages/erlang/build.sh @@ -1,8 +1,8 @@ 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.4 -TERMUX_PKG_SHA256=833d31ac102536b752e474dc6d69be7cc3e37d2d944191317312b30b1ea8ef0d +TERMUX_PKG_VERSION=21.2.5 +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_HOSTBUILD="yes" @@ -18,13 +18,13 @@ termux_step_post_extract_package() { ./otp_build autoconf } -termux_step_host_build () { +termux_step_host_build() { cd $TERMUX_PKG_SRCDIR ./configure --enable-bootstrap-only make -j "$TERMUX_MAKE_PROCESSES" } -termux_step_pre_configure () { +termux_step_pre_configure() { (cd erts && autoreconf) # liblog is needed for syslog usage: diff --git a/packages/expect/build.sh b/packages/expect/build.sh index eaae91882..de49d9aad 100644 --- a/packages/expect/build.sh +++ b/packages/expect/build.sh @@ -6,11 +6,11 @@ TERMUX_PKG_SHA256=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c 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_step_pre_configure () { +termux_step_pre_configure() { autoconf } -termux_step_post_make_install () { +termux_step_post_make_install() { cd $TERMUX_PREFIX/lib ln -f -s expect${TERMUX_PKG_VERSION}/libexpect${TERMUX_PKG_VERSION}.so . } diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index f224edf00..41c24f103 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim TERMUX_PKG_LICENSE="GPL-3.0" # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg. TERMUX_PKG_VERSION=4.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SHA256=a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz # libbz2 is used by matroska decoder: @@ -13,7 +13,7 @@ TERMUX_PKG_DEPENDS="libbz2, libsoxr, libx264, libx265, xvidcore, libvorbis, libm TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" TERMUX_PKG_CONFLICTS="libav" -termux_step_configure () { +termux_step_configure() { cd $TERMUX_PKG_BUILDDIR export ASFLAGS="-no-integrated-as" diff --git a/packages/figlet/build.sh b/packages/figlet/build.sh index 506e0569f..f2ca827b0 100644 --- a/packages/figlet/build.sh +++ b/packages/figlet/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SRCURL=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${TERMUX_P TERMUX_PKG_SHA256=bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { LD=$CC } diff --git a/packages/finch/build.sh b/packages/finch/build.sh index 5e1750fe3..aa881ba43 100644 --- a/packages/finch/build.sh +++ b/packages/finch/build.sh @@ -21,12 +21,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " TERMUX_PKG_RM_AFTER_INSTALL="share/sounds/purple lib/purple-2/libmsn.so" -termux_step_pre_configure () { +termux_step_pre_configure() { # For arpa: CFLAGS+=" -isystem $TERMUX_PKG_BUILDER_DIR" } -termux_step_post_configure () { +termux_step_post_configure() { # Hack to compile first version of libpurple-ciphers.la cp $TERMUX_PREFIX/lib/libxml2.so $TERMUX_PREFIX/lib/libpurple.so @@ -41,7 +41,7 @@ termux_step_post_configure () { make clean } -termux_step_post_make_install () { +termux_step_post_make_install() { cd $TERMUX_PREFIX/lib for lib in jabber oscar ymsg; do ln -f -s purple-2/lib${lib}.so . diff --git a/packages/fish/build.sh b/packages/fish/build.sh index a4fe78bf9..439b0b655 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -17,7 +17,7 @@ termux_step_pre_configure() { CXXFLAGS+=" $CPPFLAGS" } -termux_step_post_make_install () { +termux_step_post_make_install() { cat >> $TERMUX_PREFIX/etc/fish/config.fish < postinst echo "dot -c" >> postinst echo "exit 0" >> postinst diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh index d1a12589c..a8c1080a3 100644 --- a/packages/gst-plugins-base/build.sh +++ b/packages/gst-plugins-base/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-pango " -termux_step_post_make_install () { +termux_step_post_make_install() { for BINARY in gst-play-1.0 gst-discoverer-1.0 gst-device-monitor-1.0 do echo $BINARY diff --git a/packages/gst-plugins-good/build.sh b/packages/gst-plugins-good/build.sh index 85aac18a4..63ea8be70 100644 --- a/packages/gst-plugins-good/build.sh +++ b/packages/gst-plugins-good/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/ TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_VERSION=1.14.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/gst-plugins-good/src-ext-vpx-gstvpxdec.c.patch b/packages/gst-plugins-good/src-ext-vpx-gstvpxdec.c.patch new file mode 100644 index 000000000..e09514210 --- /dev/null +++ b/packages/gst-plugins-good/src-ext-vpx-gstvpxdec.c.patch @@ -0,0 +1,24 @@ +See https://chromium.googlesource.com/webm/libvpx/+/763f8318de2cee41d748539cee5810fc0efcad68%5E%21/#F0 + +diff -u -r ../gst-plugins-good-1.14.4/ext/vpx/gstvpxdec.c ./ext/vpx/gstvpxdec.c +--- ../gst-plugins-good-1.14.4/ext/vpx/gstvpxdec.c 2018-03-23 20:44:48.000000000 +0000 ++++ ./ext/vpx/gstvpxdec.c 2019-02-10 00:40:59.658041832 +0000 +@@ -62,18 +62,6 @@ + {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"}, + {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"}, + {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"}, +- {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO), +- "Print frame information", +- "visualize-frame-info"}, +- {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES), +- "Show macroblock mode selection overlaid on image", +- "visualize-macroblock-modes"}, +- {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF), +- "Show dc diff for each macro block overlaid on image", +- "visualize-dc-diff"}, +- {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO), +- "Print video rate info", +- "visualize-rate-info"}, + {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"}, + {0, NULL, NULL} + }; diff --git a/packages/gstreamer/build.sh b/packages/gstreamer/build.sh index d06e8fe56..fcb497e5e 100644 --- a/packages/gstreamer/build.sh +++ b/packages/gstreamer/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="glib" TERMUX_PKG_DEVPACKAGE_DEPENDS="glib-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-check --disable-tests --disable-examples --disable-benchmarks --with-unwind=no --with-dw=no" -termux_step_post_make_install () { +termux_step_post_make_install() { for BINARY in gst-inspect-1.0 gst-stats-1.0 gst-typefind-1.0 gst-launch-1.0 do echo $BINARY diff --git a/packages/hashdeep/build.sh b/packages/hashdeep/build.sh index 2e9e88504..2fed33625 100644 --- a/packages/hashdeep/build.sh +++ b/packages/hashdeep/build.sh @@ -10,7 +10,7 @@ if [ "$TERMUX_ARCH_BITS" = 32 ]; then TERMUX_PKG_API_LEVEL=24 fi -termux_step_pre_configure () { +termux_step_pre_configure() { sh bootstrap.sh CPPFLAGS+=" -DTERMUX_EXPOSE_FILE_OFFSET64=1" } diff --git a/packages/heyu/build.sh b/packages/heyu/build.sh index 8db777f81..473d9a08a 100644 --- a/packages/heyu/build.sh +++ b/packages/heyu/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=2.11-rc3 TERMUX_PKG_SHA256=6285f134e03688b5ec03986ef53cce463abc007281996156cac52b61cbeb58b2 TERMUX_PKG_SRCURL=https://github.com/HeyuX10Automation/heyu/archive/v$TERMUX_PKG_VERSION.tar.gz -termux_step_pre_configure () { +termux_step_pre_configure() { # rindex is an obsolete version of strrchr which is not available in Android: CFLAGS+=" -Drindex=strrchr" LDFLAGS+=" -llog" diff --git a/packages/htop/build.sh b/packages/htop/build.sh index cb0b1d4b3..02c575581 100644 --- a/packages/htop/build.sh +++ b/packages/htop/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://hisham.hm/htop/ TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.2.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57 TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz # htop checks setlocale() return value for UTF-8 support, so use libandroid-support. diff --git a/packages/hub/build.sh b/packages/hub/build.sh index 510c171d4..e5b6decb7 100644 --- a/packages/hub/build.sh +++ b/packages/hub/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://hub.github.com/ TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=2.8.3 -TERMUX_PKG_SHA256=26bc1bc6fd8b6af379445728450d9c1e26a6d1861fdff5c2b552562eb7487a96 +TERMUX_PKG_VERSION=2.8.4 +TERMUX_PKG_SHA256=0aa1342ac5701dc9b7e787ad69640ede06fc84cbe88fb63440b81aca4d4b6273 TERMUX_PKG_SRCURL=https://github.com/github/hub/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="git" diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index 99c21273c..ca4943220 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://gohugo.io/ TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=0.53 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=0.54.0 +TERMUX_PKG_SHA256=fe0f4d4542491706cc19cb8c0acd63f1d9989cfbeaaad39d93031e91bf73fd91 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=48e65a33d3b10527101d13c354538379d9df698e5c38f60f4660386f4232e65c termux_step_make() { termux_setup_golang diff --git a/packages/hunspell-en-us/build.sh b/packages/hunspell-en-us/build.sh index e0deb17d5..2d5f7fa6c 100644 --- a/packages/hunspell-en-us/build.sh +++ b/packages/hunspell-en-us/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=2018.10.25 TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/hunspell/ # On checksum mismatch the files may have been updated: # https://cgit.freedesktop.org/libreoffice/dictionaries/log/en/en_US.aff diff --git a/packages/hunspell-ru/build.sh b/packages/hunspell-ru/build.sh index 19335b669..d5a02e388 100644 --- a/packages/hunspell-ru/build.sh +++ b/packages/hunspell-ru/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_VERSION=2017.03.03 TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/hunspell/ # On checksum mismatch the files may have been updated: # https://cgit.freedesktop.org/libreoffice/dictionaries/log/ru_RU/ru_RU.aff diff --git a/packages/iconv/build.sh b/packages/iconv/build.sh old mode 100755 new mode 100644 index e51cd600a..bcc35f983 --- a/packages/iconv/build.sh +++ b/packages/iconv/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc89131 # Only install the binary, not the library since we use libandroid-support for iconv functions: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --disable-shared" -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man1 make -C lib install # this installs libiconv.{a,la} which the below install task needs: make -C src install diff --git a/packages/inotify-tools/build.sh b/packages/inotify-tools/build.sh index 7226d368c..a2691b9b5 100644 --- a/packages/inotify-tools/build.sh +++ b/packages/inotify-tools/build.sh @@ -12,11 +12,11 @@ termux_step_pre_configure() { LDFLAGS+=" -llog" } -termux_step_make () { +termux_step_make() { : } -termux_step_make_install () { +termux_step_make_install() { # the command-line tools needs the libinotifytools installed before building make -C libinotifytools install make install diff --git a/packages/ipcalc/build.sh b/packages/ipcalc/build.sh index 3b8be2947..162d940c8 100644 --- a/packages/ipcalc/build.sh +++ b/packages/ipcalc/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.41 TERMUX_PKG_SRCURL=http://jodies.de/ipcalc-archive/ipcalc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a -termux_step_make_install () { +termux_step_make_install() { cp $TERMUX_PKG_SRCDIR/ipcalc $TERMUX_PREFIX/bin/ } diff --git a/packages/ired/build.sh b/packages/ired/build.sh old mode 100755 new mode 100644 diff --git a/packages/irssi/build.sh b/packages/irssi/build.sh old mode 100755 new mode 100644 index 1273774cc..3f216be0c --- a/packages/irssi/build.sh +++ b/packages/irssi/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf97 TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/$TERMUX_PKG_VERSION/irssi-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" } diff --git a/packages/isync/build.sh b/packages/isync/build.sh old mode 100755 new mode 100644 diff --git a/packages/jhead/build.sh b/packages/jhead/build.sh old mode 100755 new mode 100644 index 0f648e21b..2000245fc --- a/packages/jhead/build.sh +++ b/packages/jhead/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=82194e0128d9141038f82fadcb5845391ca3021d61bc00815078601619f6c0 TERMUX_PKG_SRCURL=http://www.sentex.net/~mwandel/jhead/jhead-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make_install () { +termux_step_make_install() { cp jhead $TERMUX_PREFIX/bin/jhead cp -f jhead.1 $TERMUX_PREFIX/share/man/man1/jhead.1 } diff --git a/packages/json-c/build.sh b/packages/json-c/build.sh index 6c6f692f5..0a50302f8 100644 --- a/packages/json-c/build.sh +++ b/packages/json-c/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_VERSION=0.13.1 TERMUX_PKG_SHA256=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873 TERMUX_PKG_SRCURL=https://s3.amazonaws.com/json-c_releases/releases/json-c-${TERMUX_PKG_VERSION}.tar.gz -termux_step_make () { +termux_step_make() { make \ LDFLAGS="$LDFLAGS -llog" } diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh index d7c2ea73a..760cf8042 100644 --- a/packages/jsoncpp/build.sh +++ b/packages/jsoncpp/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCCACHE_FOUND=OFF " -termux_step_pre_configure () { +termux_step_pre_configure() { # The installation does not overwrite symlinks such as libjsoncpp.so.1, # so if rebuilding these are not detected as modified. Fix that: rm -f $TERMUX_PREFIX/lib/libjsoncpp.so* diff --git a/packages/krb5/build.sh b/packages/krb5/build.sh index a4d4d739a..b13044a61 100644 --- a/packages/krb5/build.sh +++ b/packages/krb5/build.sh @@ -23,7 +23,7 @@ termux_step_post_extract_package() { TERMUX_PKG_SRCDIR+="/src" } -termux_step_pre_configure () { +termux_step_pre_configure() { # cannot test these when cross compiling export krb5_cv_attr_constructor_destructor='yes,yes' export ac_cv_func_regcomp='yes' @@ -36,7 +36,7 @@ termux_step_pre_configure () { LDFLAGS="$LDFLAGS -landroid-glob -llog" } -termux_step_post_make_install () { +termux_step_post_make_install() { # Enable logging to STDERR by default echo -e "\tdefault = STDERR" >> $TERMUX_PKG_SRCDIR/config-files/krb5.conf diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 31097ea7f..ec1489417 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -32,7 +32,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_MAINTAINER="Joakim @joakim-noah" -termux_step_post_extract_package () { +termux_step_post_extract_package() { mv llvm-${TERMUX_PKG_VERSION[1]}.src llvm mv tools-${TERMUX_PKG_VERSION[2]} rdmd mv dub-${TERMUX_PKG_VERSION[3]} dub @@ -48,7 +48,7 @@ termux_step_post_extract_package () { chmod 755 $TERMUX_PKG_BUILDDIR/llvm-config } -termux_step_host_build () { +termux_step_host_build() { termux_setup_cmake termux_setup_ninja cmake -GNinja $TERMUX_PKG_SRCDIR/llvm \ @@ -58,7 +58,7 @@ termux_step_host_build () { ninja -j $TERMUX_MAKE_PROCESSES llvm-tblgen } -termux_step_pre_configure () { +termux_step_pre_configure() { local LLVM_TARGET_ARCH if [ $TERMUX_ARCH = "arm" ]; then LLVM_TARGET_ARCH=ARM @@ -86,7 +86,7 @@ termux_step_pre_configure () { mkdir "$TERMUX_PKG_BUILDDIR" } -termux_step_post_configure () { +termux_step_post_configure() { TERMUX_PKG_SRCDIR=$OLD_TERMUX_PKG_SRCDIR TERMUX_PKG_BUILDDIR=$OLD_TERMUX_PKG_BUILDDIR cd "$TERMUX_PKG_BUILDDIR" @@ -106,7 +106,7 @@ termux_step_post_configure () { termux_step_configure_cmake } -termux_step_make () { +termux_step_make() { $LDC_PATH/bin/ldc-build-runtime --ninja -j $TERMUX_MAKE_PROCESSES \ --dFlags="$LDC_FLAGS" --cFlags="$CFLAGS -I$TERMUX_PREFIX/include" \ --targetSystem="Android;Linux;UNIX" --ldcSrcDir="$TERMUX_PKG_SRCDIR" @@ -137,7 +137,7 @@ termux_step_make () { $CC $TERMUX_PKG_BUILDDIR/bin/dub.o $D_LDFLAGS -o $TERMUX_PKG_BUILDDIR/bin/dub } -termux_step_make_install () { +termux_step_make_install() { cp bin/{dub,ldc-build-runtime,ldc2,ldmd2,rdmd} $TERMUX_PREFIX/bin cp $TERMUX_PKG_BUILDDIR/ldc-build-runtime.tmp/lib/lib{druntime,phobos2}*.a $TERMUX_PREFIX/lib sed -i "/runtime\/druntime\/src/d" bin/ldc2.conf diff --git a/packages/ldns/build.sh b/packages/ldns/build.sh old mode 100755 new mode 100644 diff --git a/packages/ledger/0001-Fix-garbled-dates-when-using-date-format.patch b/packages/ledger/0001-Fix-garbled-dates-when-using-date-format.patch deleted file mode 100644 index 7e84e96c6..000000000 --- a/packages/ledger/0001-Fix-garbled-dates-when-using-date-format.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 850a2cec794ef0d98dbaaf83e5ddce4ecb819e27 Mon Sep 17 00:00:00 2001 -From: Tommi Komulainen -Date: Sat, 26 May 2018 09:36:45 +0200 -Subject: [PATCH] Fix garbled dates when using --date-format - -Capture the `std::string` value from options in a local variable that -lives as long as the `c_str()` taken from it to ensure it does not get -freed prematurely. - -Fixes: #546 ---- - src/print.cc | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/print.cc b/src/print.cc -index 9fa75eab..92323777 100644 ---- a/src/print.cc -+++ b/src/print.cc -@@ -103,11 +103,13 @@ namespace { - void print_xact(report_t& report, std::ostream& out, xact_t& xact) - { - format_type_t format_type = FMT_WRITTEN; -+ string format_str; - optional format; - - if (report.HANDLED(date_format_)) { - format_type = FMT_CUSTOM; -- format = report.HANDLER(date_format_).str().c_str(); -+ format_str = report.HANDLER(date_format_).str(); -+ format = format_str.c_str(); - } - - std::ostringstream buf; --- -2.20.1 - diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh index 56aae45c9..c7dad6b98 100644 --- a/packages/ledger/build.sh +++ b/packages/ledger/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.ledger-cli.org TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=3.1.1 -TERMUX_PKG_REVISION=7 -TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a +TERMUX_PKG_VERSION=3.1.2 +TERMUX_PKG_SHA256=3ecebe00e8135246e5437e4364bb7a38869fad7c3250b849cf8c18ca2628182e +TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp" diff --git a/packages/ledger/src-utils.h.patch b/packages/ledger/src-utils.h.patch deleted file mode 100644 index 8af116063..000000000 --- a/packages/ledger/src-utils.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c18a55f9ef9969b38e5cf7f0f319b8ec5df34809 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 9 Jul 2018 12:07:30 +0000 -Subject: [PATCH] Unbreak with boost 1.68 - -In file included from src/main.cc:34: -In file included from src/global.h:41: -In file included from src/option.h:45: -In file included from src/scope.h:45: -In file included from src/op.h:45: -In file included from src/expr.h:45: -In file included from src/exprbase.h:57: -src/utils.h:47:10: fatal error: 'boost/uuid/sha1.hpp' file not found - #include - ^ ---- - src/utils.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/utils.h b/src/utils.h -index b21dff7af..857b8289c 100644 ---- a/src/utils.h -+++ b/src/utils.h -@@ -44,7 +44,11 @@ - #ifndef _UTILS_H - #define _UTILS_H - -+#if (BOOST_VERSION >= 106600) -+#include -+#else - #include -+#endif - - /** - * @name Default values diff --git a/packages/less/build.sh b/packages/less/build.sh old mode 100755 new mode 100644 diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index bb15c1b5d..3e048802d 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -16,7 +16,7 @@ ac_cv_func_dn_expand=no TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn2" TERMUX_PKG_BUILD_DEPENDS="ncurses-dev" -termux_step_pre_configure () { +termux_step_pre_configure() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr" if [ "$TERMUX_DEBUG" == "true" ]; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: diff --git a/packages/libandroid-glob/build.sh b/packages/libandroid-glob/build.sh index 42da4c6be..5a8485fc6 100644 --- a/packages/libandroid-glob/build.sh +++ b/packages/libandroid-glob/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_VERSION=0.4 TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make_install () { +termux_step_make_install() { cp $TERMUX_PKG_BUILDER_DIR/glob.h $TERMUX_PREFIX/include/ $CC $CFLAGS $CPPFLAGS $LDFLAGS $TERMUX_PKG_BUILDER_DIR/glob.c -shared -o $TERMUX_PREFIX/lib/libandroid-glob.so } diff --git a/packages/libandroid-support/build.sh b/packages/libandroid-support/build.sh old mode 100755 new mode 100644 index 048142e74..aa9aa0ed7 --- a/packages/libandroid-support/build.sh +++ b/packages/libandroid-support/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v${TERMUX TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_ESSENTIAL=yes -termux_step_make_install () { +termux_step_make_install() { # Remove files previously in package to avoid them being left # in build environments. rm -f $TERMUX_PREFIX/include/langinfo.h $TERMUX_PREFIX/include/iconv.h diff --git a/packages/libbz2/build.sh b/packages/libbz2/build.sh index a79f6816a..d4e24f60a 100644 --- a/packages/libbz2/build.sh +++ b/packages/libbz2/build.sh @@ -8,17 +8,17 @@ TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/bzip2-${TERMUX_PKG_VERSION}.tar TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { # bzip2 does not use configure. But place man pages at correct path: sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" $TERMUX_PKG_SRCDIR/Makefile } -termux_step_make () { +termux_step_make() { # bzip2 uses a separate makefile for the shared library make -f Makefile-libbz2_so } -termux_step_make_install () { +termux_step_make_install() { # The shared library makefile contains no install makefile, so issue a normal install to get scripts make $TERMUX_PKG_EXTRA_MAKE_ARGS install diff --git a/packages/libc++/build.sh b/packages/libc++/build.sh index ee81fa049..c544c954b 100644 --- a/packages/libc++/build.sh +++ b/packages/libc++/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION # dependency on it. TERMUX_PKG_ESSENTIAL=yes -termux_step_post_massage () { +termux_step_post_massage() { mkdir lib cp $TERMUX_PREFIX/lib/libc++_shared.so lib/ } diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh index 3da1168bd..f2161395b 100644 --- a/packages/libcaca/build.sh +++ b/packages/libcaca/build.sh @@ -5,12 +5,12 @@ TERMUX_PKG_VERSION=0.99.beta19 TERMUX_PKG_REVISION=2 # Switched to mirror on 2014-12-22 since master was down: TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz -# http://caca.zoy.org/files/libcaca/libcaca-${TERMUX_PKG_VERSION}.tar.gz +# http://caca.zoy.org/files/libcaca/libcaca-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-python --disable-java --disable-ruby --disable-doc" -termux_step_post_configure () { +termux_step_post_configure() { if [ $TERMUX_ARCH = x86_64 ]; then # Remove troublesome asm usage: perl -p -i -e 's/#define HAVE_FLDLN2 1//' $TERMUX_PKG_BUILDDIR/config.h diff --git a/packages/libcoap/build.sh b/packages/libcoap/build.sh new file mode 100644 index 000000000..d99ed90d1 --- /dev/null +++ b/packages/libcoap/build.sh @@ -0,0 +1,12 @@ +TERMUX_PKG_HOMEPAGE=https://libcoap.net/ +TERMUX_PKG_DESCRIPTION="Implementation of CoAP, a lightweight protocol for resource constrained devices" +TERMUX_PKG_LICENSE="BSD 2-Clause" +TERMUX_PKG_VERSION=4.2.0-rc4 +TERMUX_PKG_SHA256=8aa70c11fb1f1f443a9565c855f98027a50e8e0040310da86933770193e73b24 +TERMUX_PKG_SRCURL=https://github.com/obgm/libcoap/archive/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_DEPENDS="openssl" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-openssl --disable-doxygen" + +termux_step_pre_configure() { + NOCONFIGURE=1 ./autogen.sh +} diff --git a/packages/libcrypt/build.sh b/packages/libcrypt/build.sh index 6c92180bd..04a9b19df 100644 --- a/packages/libcrypt/build.sh +++ b/packages/libcrypt/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=0.2 TERMUX_PKG_REVISION=1 TERMUX_PKG_DEPENDS="openssl" -termux_step_make_install () { +termux_step_make_install() { $CC $CFLAGS $CPPFLAGS $LDFLAGS -Wall -Wextra -fPIC -shared $TERMUX_PKG_BUILDER_DIR/crypt3.c -lcrypto -o $TERMUX_PREFIX/lib/libcrypt.so mkdir -p $TERMUX_PREFIX/include/ cp $TERMUX_PKG_BUILDER_DIR/crypt.h $TERMUX_PREFIX/include/ diff --git a/packages/libcurl/build.sh b/packages/libcurl/build.sh old mode 100755 new mode 100644 index 5d0ccfb15..eab649007 --- a/packages/libcurl/build.sh +++ b/packages/libcurl/build.sh @@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/ TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_DEPENDS="openssl (>= 1.1.1), libnghttp2" -TERMUX_PKG_VERSION=7.63.0 -TERMUX_PKG_SHA256=9bab7ed4ecff77020a312d84cc5fb7eb02d58419d218f267477a724a17fd8dd8 +TERMUX_PKG_VERSION=7.64.0 +TERMUX_PKG_SHA256=d573ba1c2d1cf9d8533fadcce480d778417964e8d04ccddcc76e591d544cf2eb TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth diff --git a/packages/libevent/build.sh b/packages/libevent/build.sh old mode 100755 new mode 100644 diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh old mode 100755 new mode 100644 index f8f4ff518..765e5e2e0 --- a/packages/libffi/build.sh +++ b/packages/libffi/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory" TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include" -termux_step_pre_configure () { +termux_step_pre_configure() { if [ $TERMUX_ARCH = arm ]; then CFLAGS+=" -fno-integrated-as" fi diff --git a/packages/libgc/build.sh b/packages/libgc/build.sh index 2e76a6b0f..00b08128d 100644 --- a/packages/libgc/build.sh +++ b/packages/libgc/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=(https://github.com/ivmai/bdwgc/releases/download/v$TERMUX_PKG https://github.com/ivmai/libatomic_ops/releases/download/v${TERMUX_PKG_VERSION[1]}/libatomic_ops-${TERMUX_PKG_VERSION[1]}.tar.gz) TERMUX_PKG_RM_AFTER_INSTALL="share/gc" -termux_step_post_extract_package () { +termux_step_post_extract_package() { mv libatomic_ops-${TERMUX_PKG_VERSION[1]} libatomic_ops ./autogen.sh } diff --git a/packages/libgcrypt/build.sh b/packages/libgcrypt/build.sh old mode 100755 new mode 100644 index c281f6a73..269e377f4 --- a/packages/libgcrypt/build.sh +++ b/packages/libgcrypt/build.sh @@ -12,7 +12,7 @@ ac_cv_lib_pthread_pthread_create=yes --disable-jent-support " -termux_step_pre_configure () { +termux_step_pre_configure() { # libgcrypt uses syslog, which we redirect to android logging: LDFLAGS="$LDFLAGS -llog" diff --git a/packages/libgit2/build.sh b/packages/libgit2/build.sh index 87b964ea6..eaab7c376 100644 --- a/packages/libgit2/build.sh +++ b/packages/libgit2/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://libgit2.github.com/ TERMUX_PKG_DESCRIPTION="C library implementing Git core methods" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=0.27.7 -TERMUX_PKG_SHA256=1a5435a483759b1cd96feb12b11abb5231b0688016db506ce5947178f6ba2531 +TERMUX_PKG_VERSION=0.27.8 +TERMUX_PKG_SHA256=8313873d49dc01e8b880ec334d7430ae67496a89aaa8c6e7bbd3affb47a00c76 TERMUX_PKG_SRCURL=https://github.com/libgit2/libgit2/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libcurl, openssl, libssh2" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_CLAR=OFF" diff --git a/packages/libgmp/build.sh b/packages/libgmp/build.sh old mode 100755 new mode 100644 diff --git a/packages/libgpg-error/build.sh b/packages/libgpg-error/build.sh old mode 100755 new mode 100644 index 45596da04..e2f3a2077 --- a/packages/libgpg-error/build.sh +++ b/packages/libgpg-error/build.sh @@ -1,12 +1,12 @@ TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error/ TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all GnuPG components" TERMUX_PKG_LICENSE="LGPL-2.0" -TERMUX_PKG_VERSION=1.34 -TERMUX_PKG_SHA256=0680799dee71b86b2f435efb825391eb040ce2704b057f6bd3dcc47fbc398c81 +TERMUX_PKG_VERSION=1.35 +TERMUX_PKG_SHA256=cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e067 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp" -termux_step_post_extract_package () { +termux_step_post_extract_package() { # Upstream only has Android definitions for platform-specific lock objects. # See https://lists.gnupg.org/pipermail/gnupg-devel/2014-January/028203.html # for how to generate a lock-obj header file on devices. diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index 279697b33..37d1a32ea 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -46,7 +46,7 @@ termux_step_extract_package() { cp -Rf $CHECKED_OUT_FOLDER/* . } -termux_step_host_build () { +termux_step_host_build() { termux_setup_cmake termux_download https://github.com/protocolbuffers/protobuf/releases/download/v${_protoc_version}/protoc-${_protoc_version}-linux-x86_64.zip \ protoc-${_protoc_version}-linux-x86_64.zip \ @@ -61,8 +61,8 @@ termux_step_host_build () { # -Wno-error=class-memaccess is used to avoid # src/core/lib/security/credentials/oauth2/oauth2_credentials.cc:336:61: error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial type ‘struct grpc_oauth2_token_fetcher_credentials’; use assignment or value-initialization instead [-Werror=class-memaccess] # memset(c, 0, sizeof(grpc_oauth2_token_fetcher_credentials)); - # when building version 1.17.2: - CPPFLAGS="-Wno-error=class-memaccess" \ + # when building version 1.17.2: + CXXFLAGS="-Wno-error=class-memaccess" \ CFLAGS="-Wno-implicit-fallthrough" \ make -j $TERMUX_MAKE_PROCESSES \ HAS_SYSTEM_PROTOBUF=false \ diff --git a/packages/libhdf5/build.sh b/packages/libhdf5/build.sh old mode 100755 new mode 100644 index faaba1edb..84917a86a --- a/packages/libhdf5/build.sh +++ b/packages/libhdf5/build.sh @@ -12,13 +12,13 @@ TERMUX_PKG_DEPENDS="libzopfli" TERMUX_PKG_FORCE_CMAKE=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-C$TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/TryRunResults_out.cmake " -termux_step_pre_configure () { +termux_step_pre_configure() { cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/ mkdir -p $TERMUX_PKG_BUILDDIR/shared/ cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/shared/ } -termux_step_post_configure () { +termux_step_post_configure() { cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/shared/ } diff --git a/packages/libidn2/build.sh b/packages/libidn2/build.sh old mode 100755 new mode 100644 index f9fe766c0..a8715a5cc --- a/packages/libidn2/build.sh +++ b/packages/libidn2/build.sh @@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="Free software implementation of IDNA2008, Punycode and T TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="lokesh @hax4us" TERMUX_PKG_DEPENDS="libunistring, libandroid-support" -TERMUX_PKG_VERSION=2.1.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=032398dbaa9537af43f51a8d94e967e3718848547b1b2a4eb3138b20cad11d32 +TERMUX_PKG_VERSION=2.1.1a +TERMUX_PKG_SHA256=57666bcf6ecf54230d7bac95c392379561954b57a673903aed4d3336b3048b72 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/libidn/libidn2-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/libjansson/build.sh b/packages/libjansson/build.sh index 0fcf513c8..9afa6f8e6 100644 --- a/packages/libjansson/build.sh +++ b/packages/libjansson/build.sh @@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=76260d30e9bbd0ef392798525e8cd7fe59a6450c54ca6135672e3cd6a16429 TERMUX_PKG_SRCURL=https://github.com/akheron/jansson/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { autoreconf -fi } diff --git a/packages/libksba/build.sh b/packages/libksba/build.sh old mode 100755 new mode 100644 diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index a61540978..3fd5aa903 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -52,13 +52,13 @@ TERMUX_PKG_FORCE_CMAKE=yes TERMUX_PKG_KEEP_STATIC_LIBRARIES=true TERMUX_PKG_HAS_DEBUG=no -termux_step_post_extract_package () { +termux_step_post_extract_package() { mv cfe-${TERMUX_PKG_VERSION}.src tools/clang mv lld-${TERMUX_PKG_VERSION}.src tools/lld mv openmp-${TERMUX_PKG_VERSION}.src projects/openmp } -termux_step_host_build () { +termux_step_host_build() { termux_setup_cmake cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \ -DLLVM_BUILD_TESTS=OFF \ @@ -66,7 +66,7 @@ termux_step_host_build () { make -j $TERMUX_MAKE_PROCESSES clang-tblgen llvm-tblgen } -termux_step_pre_configure () { +termux_step_pre_configure() { mkdir projects/openmp/runtime/src/android cp $TERMUX_PKG_BUILDER_DIR/nl_types.h projects/openmp/runtime/src/android cp $TERMUX_PKG_BUILDER_DIR/nltypes_stubs.cpp projects/openmp/runtime/src/android @@ -85,12 +85,12 @@ termux_step_pre_configure () { else termux_error_exit "Invalid arch: $TERMUX_ARCH" fi - # see CMakeLists.txt and tools/clang/CMakeLists.txt + # see CMakeLists.txt and tools/clang/CMakeLists.txt TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH -DLLVM_TARGETS_TO_BUILD=all" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_HOST_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE" } -termux_step_post_make_install () { +termux_step_post_make_install() { if [ $TERMUX_ARCH = "arm" ]; then cp ../src/projects/openmp/runtime/exports/common.min.50/include/omp.h $TERMUX_PREFIX/include else @@ -111,7 +111,7 @@ termux_step_post_make_install () { done } -termux_step_post_massage () { +termux_step_post_massage() { sed $TERMUX_PKG_BUILDER_DIR/llvm-config.in \ -e "s|@TERMUX_PKG_VERSION@|$TERMUX_PKG_VERSION|g" \ -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \ diff --git a/packages/liblua/build.sh b/packages/liblua/build.sh index b059a10fe..5fede34c0 100644 --- a/packages/liblua/build.sh +++ b/packages/liblua/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_CONFLICTS=libluajit TERMUX_PKG_REPLACES=libluajit TERMUX_PKG_BUILD_DEPENDS="readline" -termux_step_pre_configure () { +termux_step_pre_configure() { AR+=" rcu" CFLAGS+=" -fPIC -DLUA_COMPAT_5_2 -DLUA_COMPAT_UNPACK" } diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index 60049a530..377331aee 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -1,11 +1,12 @@ TERMUX_PKG_HOMEPAGE=https://mosquitto.org/ TERMUX_PKG_DESCRIPTION="MQTT library" TERMUX_PKG_LICENSE="EPL-1.0" -TERMUX_PKG_VERSION=1.5.5 -TERMUX_PKG_SHA256=fcdb47e340864c545146681af7253399cc292e41775afd76400fda5b0d23d668 +TERMUX_PKG_VERSION=1.5.6 +TERMUX_PKG_SHA256=d5bdc13cc668350026376d57fc14de10aaee029f6840707677637d15e0751a40 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="c-ares, openssl" +TERMUX_PKG_DEPENDS="c-ares, libwebsockets, openssl" TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DWITH_THREADING=OFF --DWITH_TLS_PSK=OFF" +-DWITH_TLS_PSK=OFF +-DWITH_WEBSOCKETS=ON" diff --git a/packages/libmpc/build.sh b/packages/libmpc/build.sh old mode 100755 new mode 100644 diff --git a/packages/libmpfr/build.sh b/packages/libmpfr/build.sh old mode 100755 new mode 100644 index f87384d49..ca2fe59d2 --- a/packages/libmpfr/build.sh +++ b/packages/libmpfr/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.mpfr.org/ TERMUX_PKG_DESCRIPTION="C library for multiple-precision floating-point computations with correct rounding" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_DEPENDS="libgmp" -TERMUX_PKG_VERSION=4.0.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION=4.0.2 +TERMUX_PKG_SHA256=1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/mpfr/mpfr-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_header_locale_h=no" diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh index 82907ac05..58bd6efff 100644 --- a/packages/libnl/build.sh +++ b/packages/libnl/build.sh @@ -6,6 +6,6 @@ TERMUX_PKG_SHA256=b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5 TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthreads --disable-cli" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -Dsockaddr_storage=__kernel_sockaddr_storage" } diff --git a/packages/libpipeline/build.sh b/packages/libpipeline/build.sh old mode 100755 new mode 100644 index 7cff20140..1c2c5035f --- a/packages/libpipeline/build.sh +++ b/packages/libpipeline/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://libpipeline.nongnu.org/ TERMUX_PKG_DESCRIPTION="C library for manipulating pipelines of subprocesses in a flexible and convenient way" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=1.5.0 -TERMUX_PKG_SHA256=0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b +TERMUX_PKG_VERSION=1.5.1 +TERMUX_PKG_SHA256=d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/libpipeline/libpipeline-${TERMUX_PKG_VERSION}.tar.gz diff --git a/packages/libpixman/build.sh b/packages/libpixman/build.sh index eb8d2ede3..197a8f1e8 100644 --- a/packages/libpixman/build.sh +++ b/packages/libpixman/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=1ca19c8d4d37682adfbc42741d24977903fec1169b4153ec05bb690d4acf9f TERMUX_PKG_SRCURL=https://cairographics.org/releases/pixman-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-libpng" -termux_step_pre_configure () { +termux_step_pre_configure() { if [ $TERMUX_ARCH = arm ]; then CFLAGS+=" -fno-integrated-as" fi diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh old mode 100755 new mode 100644 index c26e966dc..57ac89f71 --- a/packages/libprotobuf/build.sh +++ b/packages/libprotobuf/build.sh @@ -16,6 +16,6 @@ termux_step_host_build() { make -j $TERMUX_MAKE_PROCESSES install } -termux_step_post_extract_package () { +termux_step_post_extract_package() { ./autogen.sh } diff --git a/packages/libpulseaudio/build.sh b/packages/libpulseaudio/build.sh index 99b512402..7c4613e13 100644 --- a/packages/libpulseaudio/build.sh +++ b/packages/libpulseaudio/build.sh @@ -23,7 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt ax_cv_PTHREAD_PRIO_INHERIT=no ac_cv_func_posix_madvise=no" -termux_step_pre_configure () { +termux_step_pre_configure() { # Avoid aclocal-1.15 dependency: NOCONFIGURE=1 ./bootstrap.sh @@ -49,7 +49,7 @@ termux_step_pre_configure () { LDFLAGS+=" -llog -landroid-glob" } -termux_step_post_make_install () { +termux_step_post_make_install() { # Some binaries link against these: cd $TERMUX_PREFIX/lib for lib in pulseaudio/lib*.so* pulse-${TERMUX_PKG_VERSION}/modules/lib*.so*; do diff --git a/packages/librsync/build.sh b/packages/librsync/build.sh index 2661adfe2..26bb9c00b 100644 --- a/packages/librsync/build.sh +++ b/packages/librsync/build.sh @@ -8,12 +8,12 @@ TERMUX_PKG_DEPENDS="libbz2" TERMUX_PKG_BUILD_DEPENDS="libpopt" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPERL_EXECUTABLE=`which perl`" -termux_step_pre_configure () { +termux_step_pre_configure() { # Remove old files to ensure new timestamps on symlinks: rm -Rf $TERMUX_PREFIX/lib/librsync.* } -termux_step_post_configure () { +termux_step_post_configure() { mkdir -p $TERMUX_PREFIX/share/man/man{1,3} cp $TERMUX_PKG_SRCDIR/doc/rdiff.1 $TERMUX_PREFIX/share/man/man1 cp $TERMUX_PKG_SRCDIR/doc/librsync.3 $TERMUX_PREFIX/share/man/man3 diff --git a/packages/libsasl/build.sh b/packages/libsasl/build.sh index 2525af7f0..f10c5f450 100644 --- a/packages/libsasl/build.sh +++ b/packages/libsasl/build.sh @@ -21,13 +21,13 @@ ac_cv_header_syslog_h=no " TERMUX_PKG_RM_AFTER_INSTALL="bin/pluginviewer" -termux_step_post_configure () { +termux_step_post_configure() { # Build wants to run makemd5 at build time: gcc $TERMUX_PKG_SRCDIR/include/makemd5.c -o $TERMUX_PKG_BUILDDIR/include/makemd5 touch -d "next hour" $TERMUX_PKG_BUILDDIR/include/makemd5 } -termux_step_post_massage () { +termux_step_post_massage() { for sub in anonymous crammd5 digestmd5 plain; do local base=lib/sasl2/lib${sub} if [ ! -f ${base}.so ]; then diff --git a/packages/libsndfile/build.sh b/packages/libsndfile/build.sh index 115d9383a..f1600a0db 100644 --- a/packages/libsndfile/build.sh +++ b/packages/libsndfile/build.sh @@ -10,6 +10,6 @@ TERMUX_PKG_DEPENDS="libflac, libvorbis" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sqlite --disable-alsa" TERMUX_PKG_RM_AFTER_INSTALL="bin/ share/man/man1/" -termux_step_pre_configure () { +termux_step_pre_configure() { sh autogen.sh } diff --git a/packages/libsqlite/build.sh b/packages/libsqlite/build.sh old mode 100755 new mode 100644 index c96fc5c69..07649b8fc --- a/packages/libsqlite/build.sh +++ b/packages/libsqlite/build.sh @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Library implementing a self-contained and transactional TERMUX_PKG_LICENSE="Public Domain" # Note: Updating this version requires bumping the tcl package as well. _SQLITE_MAJOR=3 -_SQLITE_MINOR=26 -_SQLITE_PATCH=0 -TERMUX_PKG_SHA256=5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d +_SQLITE_MINOR=27 +_SQLITE_PATCH=1 +TERMUX_PKG_SHA256=54a92b8ff73ff6181f89b9b0c08949119b99e8cccef93dbef90e852a8b10f4f8 TERMUX_PKG_VERSION=${_SQLITE_MAJOR}.${_SQLITE_MINOR}.${_SQLITE_PATCH} -TERMUX_PKG_SRCURL=https://www.sqlite.org/2018/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz +TERMUX_PKG_SRCURL=https://www.sqlite.org/2019/sqlite-autoconf-${_SQLITE_MAJOR}${_SQLITE_MINOR}0${_SQLITE_PATCH}00.tar.gz # ac_cv_func_strerror_r=no as strerror_r() with the # GNU signature is only # available in android-23: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -21,7 +21,7 @@ termux_step_pre_configure() { LDFLAGS+=" -lm" } -termux_step_post_make_install () { +termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/src/libsqlite cp $TERMUX_PKG_SRCDIR/tea/generic/tclsqlite3.c $TERMUX_PREFIX/src/libsqlite/tclsqlite3.c } diff --git a/packages/libtalloc/build.sh b/packages/libtalloc/build.sh index b66bf8e64..0c2f8d2b1 100644 --- a/packages/libtalloc/build.sh +++ b/packages/libtalloc/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367 TERMUX_PKG_SRCURL=https://www.samba.org/ftp/talloc/talloc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC="yes" -termux_step_configure () { +termux_step_configure() { # Force fresh install: rm -f $TERMUX_PREFIX/include/talloc.h diff --git a/packages/libtermkey/build.sh b/packages/libtermkey/build.sh index 6f264ec3a..d453fd4dd 100644 --- a/packages/libtermkey/build.sh +++ b/packages/libtermkey/build.sh @@ -8,11 +8,11 @@ TERMUX_PKG_SHA256=6c0d87c94ab9915e76ecd313baec08dedf3bd56de83743d9aa923a081935d2 TERMUX_PKG_DEPENDS="libunibilium" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make () { +termux_step_make() { return } -termux_step_make_install () { +termux_step_make_install() { CFLAGS+=" -std=c99 -DHAVE_UNIBILIUM=1" $CC $CFLAGS $CPPFLAGS -c -fPIC termkey.c -o termkey.o $CC $CFLAGS $CPPFLAGS -c -fPIC driver-csi.c -o driver-csi.o @@ -23,6 +23,6 @@ termux_step_make_install () { chmod u+w termkey.h cp termkey.h $TERMUX_PREFIX/include/ cat termkey.pc.in | sed "s|@INCDIR@|$TERMUX_PREFIX/include|" | \ - sed "s|@LIBDIR@|$TERMUX_PREFIX/lib|" > \ + sed "s|@LIBDIR@|$TERMUX_PREFIX/lib|" > \ $PKG_CONFIG_LIBDIR/termkey.pc } diff --git a/packages/libtool/build.sh b/packages/libtool/build.sh index 1f7266d4e..e017340c2 100644 --- a/packages/libtool/build.sh +++ b/packages/libtool/build.sh @@ -10,6 +10,6 @@ TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_CONFLICTS="libtool-dev" TERMUX_PKG_REPLACES="libtool-dev" -termux_step_post_make_install () { +termux_step_post_make_install() { perl -p -i -e "s|\"/bin/|\"$TERMUX_PREFIX/bin/|" $TERMUX_PREFIX/bin/{libtool,libtoolize} } diff --git a/packages/libunibilium/build.sh b/packages/libunibilium/build.sh index cd4b9e86e..af6837c55 100644 --- a/packages/libunibilium/build.sh +++ b/packages/libunibilium/build.sh @@ -6,11 +6,11 @@ TERMUX_PKG_SHA256=78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1 TERMUX_PKG_SRCURL=https://github.com/mauke/unibilium/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make () { +termux_step_make() { return } -termux_step_make_install () { +termux_step_make_install() { CFLAGS+=" -DTERMINFO_DIRS=\"$TERMUX_PREFIX/share/terminfo/\"" $CC $CFLAGS -c -fPIC unibilium.c -o unibilium.o $CC $CFLAGS -c -fPIC uninames.c -o uninames.o diff --git a/packages/libutil/build.sh b/packages/libutil/build.sh index da6e7286e..79e0ffad6 100644 --- a/packages/libutil/build.sh +++ b/packages/libutil/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="NCSA" # same as ndk-sysroot TERMUX_PKG_VERSION=0.4 TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make_install () { +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/libuv/build.sh b/packages/libuv/build.sh index 42b862b0f..3518aa3d7 100644 --- a/packages/libuv/build.sh +++ b/packages/libuv/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=1.25.0 TERMUX_PKG_SHA256=0e927ddc0f1c83899000a63e9286cac5958222f8fb5870a49b0c81804944a912 TERMUX_PKG_SRCURL=https://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz -termux_step_pre_configure () { +termux_step_pre_configure() { export PLATFORM=android sh autogen.sh } diff --git a/packages/libvpx/build-make-configure.sh.patch b/packages/libvpx/build-make-configure.sh.patch new file mode 100644 index 000000000..834235309 --- /dev/null +++ b/packages/libvpx/build-make-configure.sh.patch @@ -0,0 +1,19 @@ +diff -u -r ../libvpx-1.8.0/build/make/configure.sh ./build/make/configure.sh +--- ../libvpx-1.8.0/build/make/configure.sh 2019-02-04 17:02:33.000000000 +0000 ++++ ./build/make/configure.sh 2019-02-09 21:10:52.112075640 +0000 +@@ -1017,7 +1017,6 @@ + enable_feature thumb + ;; + *) +- check_add_asflags --defsym ARCHITECTURE=${arch_int} + ;; + esac + +@@ -1147,7 +1146,6 @@ + else + echo "Assuming standalone build with NDK toolchain." + echo "See build/make/Android.mk for details." +- check_add_ldflags -static + soft_enable unit_tests + fi + ;; diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh index 74ec3bfb7..309b58d6c 100644 --- a/packages/libvpx/build.sh +++ b/packages/libvpx/build.sh @@ -1,12 +1,11 @@ TERMUX_PKG_HOMEPAGE=https://www.webmproject.org TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=1.7.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238 +TERMUX_PKG_VERSION=1.8.0 +TERMUX_PKG_SHA256=86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz -termux_step_configure () { +termux_step_configure() { # Force fresh install of header files: rm -Rf $TERMUX_PREFIX/include/vpx diff --git a/packages/libvpx/configure.patch b/packages/libvpx/configure.patch index f81d9d092..fdf41fa1c 100644 --- a/packages/libvpx/configure.patch +++ b/packages/libvpx/configure.patch @@ -1,22 +1,3 @@ -diff -u -r ../libvpx-1.6.1/build/make/configure.sh ./build/make/configure.sh ---- ../libvpx-1.6.1/build/make/configure.sh 2017-01-12 20:27:27.000000000 +0000 -+++ ./build/make/configure.sh 2017-07-27 01:11:03.641678047 +0000 -@@ -891,7 +891,6 @@ - setup_gnu_toolchain - arch_int=${tgt_isa##armv} - arch_int=${arch_int%%te} -- check_add_asflags --defsym ARCHITECTURE=${arch_int} - tune_cflags="-mtune=" - if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then - if [ -z "${float_abi}" ]; then -@@ -1021,7 +1020,6 @@ - else - echo "Assuming standalone build with NDK toolchain." - echo "See build/make/Android.mk for details." -- check_add_ldflags -static - soft_enable unit_tests - fi - ;; diff -u -r ../libvpx-1.6.1/configure ./configure --- ../libvpx-1.6.1/configure 2017-01-12 20:27:27.000000000 +0000 +++ ./configure 2017-07-27 01:09:43.590546540 +0000 diff --git a/packages/libvterm/build.sh b/packages/libvterm/build.sh index 79ad64f99..efb4ef213 100644 --- a/packages/libvterm/build.sh +++ b/packages/libvterm/build.sh @@ -8,11 +8,11 @@ TERMUX_PKG_SHA256=1da101b5b5885acc83e9f84e2ac2d93d97ac85e09122af3d5dd2606d8fe93b TERMUX_PKG_SRCURL=https://github.com/neovim/libvterm/archive/$_COMMIT.zip TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make () { +termux_step_make() { make src/encoding/DECdrawing.inc src/encoding/uk.inc } -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR/src $CC -std=c99 -shared -fPIC $LDFLAGS -o $TERMUX_PREFIX/lib/libvterm.so *.c -I../include -I. cp ../include/*.h $TERMUX_PREFIX/include/ diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh index 61e447d54..ae2d5e92b 100644 --- a/packages/libx264/build.sh +++ b/packages/libx264/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-swscale --disable-lavf" -termux_step_pre_configure () { +termux_step_pre_configure() { #if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then if [ $TERMUX_ARCH = "i686" ]; then # Avoid text relocations on i686, see: diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh index 4a9862a59..d395e11d7 100644 --- a/packages/libx265/build.sh +++ b/packages/libx265/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=3.0 TERMUX_PKG_SHA256=c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz -termux_step_pre_configure () { +termux_step_pre_configure() { if [ $TERMUX_ARCH = "i686" ]; then # Avoid text relocations. TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DENABLE_ASSEMBLY=OFF" diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh index 077330f13..f4b586376 100644 --- a/packages/libzopfli/build.sh +++ b/packages/libzopfli/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=4a570307c37172d894ec4ef93b6e8e3aacc401e78cbcc51cf85b212dbc379a TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_post_make_install () { +termux_step_post_make_install() { make zopflipng cp zopfli zopflipng $TERMUX_PREFIX/bin/ diff --git a/packages/lighttpd/build.sh b/packages/lighttpd/build.sh index 66ec77816..39bcbc624 100644 --- a/packages/lighttpd/build.sh +++ b/packages/lighttpd/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-bzip2 --with-openssl --with-pcre --with- TERMUX_PKG_DEPENDS="libbz2, openssl, pcre, libcrypt, libandroid-glob" TERMUX_PKG_RM_AFTER_INSTALL="bin/lighttpd-angel" -termux_step_pre_configure () { +termux_step_pre_configure() { # liblog for syslog: LDFLAGS="$LDFLAGS -llog -landroid-glob" } diff --git a/packages/ltrace/build.sh b/packages/ltrace/build.sh index 197a20df6..729c183fe 100644 --- a/packages/ltrace/build.sh +++ b/packages/ltrace/build.sh @@ -13,7 +13,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_host=$TERMUX_ARCH-generic-linux-gnu " -termux_step_pre_configure () { +termux_step_pre_configure() { # rindex is an obsolete version of strrchr which is not available in Android: CFLAGS+=" -Drindex=strrchr" if [ "$TERMUX_ARCH" == "arm" ]; then diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh index 87a9f4b91..655bf8cef 100644 --- a/packages/luarocks/build.sh +++ b/packages/luarocks/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_BUILD_DEPENDS="liblua-dev" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_configure () { +termux_step_configure() { ./configure --prefix=$TERMUX_PREFIX \ --with-lua=$TERMUX_PREFIX \ --lua-version=5.3 diff --git a/packages/lynx/build.sh b/packages/lynx/build.sh index 7685f2121..5bd7f46f5 100644 --- a/packages/lynx/build.sh +++ b/packages/lynx/build.sh @@ -29,7 +29,7 @@ termux_step_pre_configure() { unset LDFLAGS } -termux_step_make_install () { +termux_step_make_install() { make uninstall make install } diff --git a/packages/make/build.sh b/packages/make/build.sh old mode 100755 new mode 100644 diff --git a/packages/man/build.sh b/packages/man/build.sh index be229ca49..6f2fbed31 100644 --- a/packages/man/build.sh +++ b/packages/man/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="less,libandroid-glob" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_RM_AFTER_INSTALL="share/examples" -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" echo "PREFIX=\"$TERMUX_PREFIX\"" > configure.local echo "CC=\"$CC\"" >> configure.local @@ -22,7 +22,7 @@ termux_step_pre_configure () { echo "HAVE_SQLITE3=1" >> configure.local } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "interest-noawait $TERMUX_PREFIX/share/man" > triggers echo "#!$TERMUX_PREFIX/bin/sh" >> postinst diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 2d57629df..e9eefd9e8 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=10.3.12 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6 TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -52,7 +53,7 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_CONFLICTS="mysql" TERMUX_PKG_RM_AFTER_INSTALL="bin/mysqltest*" -termux_step_host_build () { +termux_step_host_build() { termux_setup_cmake cmake -G "Unix Makefiles" \ $TERMUX_PKG_SRCDIR \ @@ -61,7 +62,7 @@ termux_step_host_build () { make -j $TERMUX_MAKE_PROCESSES import_executables } -termux_step_pre_configure () { +termux_step_pre_configure() { CPPFLAGS+=" -Dushort=u_short" if [ $TERMUX_ARCH_BITS = 32 ]; then @@ -74,13 +75,13 @@ termux_step_pre_configure () { fi } -termux_step_post_make_install () { +termux_step_post_make_install() { # files not needed rm -r $TERMUX_PREFIX/{mysql-test,sql-bench} rm $TERMUX_PREFIX/share/man/man1/mysql-test-run.pl.1 } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "if [ ! -e "$TERMUX_PREFIX/var/lib/mysql" ]; then" > postinst echo " echo 'Initializing mysql data directory...'" >> postinst echo " mkdir -p $TERMUX_PREFIX/var/lib/mysql" >> postinst diff --git a/packages/mc/build.sh b/packages/mc/build.sh old mode 100755 new mode 100644 index 31f538a80..6c6ea07ca --- a/packages/mc/build.sh +++ b/packages/mc/build.sh @@ -23,7 +23,7 @@ termux_step_pre_configure() { # Debug build fails with: # /home/builder/.termux-build/mc/src/src/filemanager/file.c:2019:37: error: 'umask' called with invalid mode # src_mode = umask (-1); - # ^ + # ^ export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} fi } diff --git a/packages/mlocate/build.sh b/packages/mlocate/build.sh index 72bed42cf..a8996c942 100644 --- a/packages/mlocate/build.sh +++ b/packages/mlocate/build.sh @@ -14,7 +14,7 @@ termux_step_pre_configure() { CPPFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX" } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "mkdir -p $TERMUX_PREFIX/var/mlocate/" >> postinst echo "exit 0" >> postinst diff --git a/packages/moon-buggy/build.sh b/packages/moon-buggy/build.sh index b4683d7c0..f0a24f5f0 100644 --- a/packages/moon-buggy/build.sh +++ b/packages/moon-buggy/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_SRCURL=ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/moon-buggy-${TERMUX_ TERMUX_PKG_SHA256=352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--sharedstatedir=$TERMUX_PREFIX/var" -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/share/man/man6 cp moon-buggy $TERMUX_PREFIX/bin cp moon-buggy.6 $TERMUX_PREFIX/share/man/man6 diff --git a/packages/moria/build.sh b/packages/moria/build.sh index f100a8ab1..96e33c2ef 100644 --- a/packages/moria/build.sh +++ b/packages/moria/build.sh @@ -15,7 +15,7 @@ termux_step_pre_configure() { mkdir -p $TERMUX_PREFIX/share/man/man6/ cp $TERMUX_PKG_SRCDIR/doc/moria.man $TERMUX_PREFIX/share/man/man6/moria.6 } -termux_step_create_debscripts () { +termux_step_create_debscripts() { # Create scores file in a debscript, so an update to the package wouldn't erease any scores echo "mkdir -p $TERMUX_PREFIX/var/games/moria/" > postinst echo "touch $TERMUX_PREFIX/var/games/moria/scores" >> postinst diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh index a9b9ddae4..fbd3a3b93 100644 --- a/packages/mosh/build.sh +++ b/packages/mosh/build.sh @@ -2,17 +2,17 @@ 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=7 +TERMUX_PKG_REVISION=8 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_step_pre_configure () { +termux_step_pre_configure() { export PROTOC=$TERMUX_TOPDIR/libprotobuf/host-build/src/protoc CXXFLAGS+=" -std=c++11" # Required by protobuf. } -termux_step_post_make_install () { +termux_step_post_make_install() { cd $TERMUX_PREFIX/bin mv mosh mosh.pl $CXX $CXXFLAGS $LDFLAGS \ diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 10a84e6be..286ed7716 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -25,7 +25,7 @@ termux_step_pre_configure() { rm -f $TERMUX_PREFIX/etc/mpd.conf } -termux_step_post_make_install () { +termux_step_post_make_install() { cp -f $TERMUX_PKG_SRCDIR/doc/mpdconf.example $TERMUX_PREFIX/etc/mpd.conf # Try to work around OpenSL ES library clashes: diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh index 7b7ddf9fe..a4cb55d72 100644 --- a/packages/mpv/build.sh +++ b/packages/mpv/build.sh @@ -12,7 +12,7 @@ termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" } -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR ./bootstrap.py diff --git a/packages/msmtp/build.sh b/packages/msmtp/build.sh index cfb7ef9de..c5ccef70c 100644 --- a/packages/msmtp/build.sh +++ b/packages/msmtp/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=d1185c1969ed00d0e2c57dbcd5eb09a9f82156042b21309d558f761978a587 TERMUX_PKG_SRCURL=https://marlam.de/msmtp/releases/msmtp-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_DEPENDS="libgnutls, libidn" -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS=" -llog" autoreconf -if } diff --git a/packages/multitail/build.sh b/packages/multitail/build.sh index fc59931ac..9ae6f5492 100644 --- a/packages/multitail/build.sh +++ b/packages/multitail/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1 TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, libandroid-glob" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -DNCURSES_WIDECHAR" LDFLAGS+=" -landroid-glob" } diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh index c3e6ab55e..fb223bf57 100644 --- a/packages/mutt/build.sh +++ b/packages/mutt/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=http://www.mutt.org/ TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=1.11.2 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723 +TERMUX_PKG_VERSION=1.11.3 +TERMUX_PKG_SHA256=a542f4c02faecd171b4215ddbd368910faee4a634cca7aea5337586118ab1941 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -31,14 +30,14 @@ etc/mime.types " TERMUX_PKG_CONFFILES="etc/Muttrc" -termux_step_post_configure () { +termux_step_post_configure() { # Build wants to run mutt_md5 and makedoc: gcc -DHAVE_STDINT_H -DMD5UTIL $TERMUX_PKG_SRCDIR/md5.c -o $TERMUX_PKG_BUILDDIR/mutt_md5 gcc -DHAVE_STRERROR $TERMUX_PKG_SRCDIR/doc/makedoc.c -o $TERMUX_PKG_BUILDDIR/doc/makedoc touch -d "next hour" $TERMUX_PKG_BUILDDIR/mutt_md5 $TERMUX_PKG_BUILDDIR/doc/makedoc } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_SRCDIR/doc/mutt.man $TERMUX_PREFIX/share/man/man1/mutt.1.man mkdir -p $TERMUX_PREFIX/share/examples/mutt/ cp $TERMUX_PKG_SRCDIR/contrib/gpg.rc $TERMUX_PREFIX/share/examples/mutt/gpg.rc diff --git a/packages/nano/build.sh b/packages/nano/build.sh index ebb23fc59..bd5c3a7ef 100644 --- a/packages/nano/build.sh +++ b/packages/nano/build.sh @@ -23,7 +23,7 @@ termux_step_pre_configure() { fi } -termux_step_post_make_install () { +termux_step_post_make_install() { # Configure nano to use syntax highlighting: NANORC=$TERMUX_PREFIX/etc/nanorc echo include \"$TERMUX_PREFIX/share/nano/\*nanorc\" > $NANORC diff --git a/packages/ncdc/build.sh b/packages/ncdc/build.sh index 667ddb17d..e751ea92b 100644 --- a/packages/ncdc/build.sh +++ b/packages/ncdc/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurs TERMUX_PKG_BUILD_DEPENDS="libbz2-dev, libnettle-dev, libidn-dev" TERMUX_PKG_BUILD_IN_SRC="yes" -termux_step_post_configure () { +termux_step_post_configure() { # Cross compiling steps documented in ncdc README gcc $TERMUX_PKG_SRCDIR/deps/makeheaders.c -o makeheaders gcc -I. $TERMUX_PKG_SRCDIR/doc/gendoc.c -o gendoc diff --git a/packages/ncdu/build.sh b/packages/ncdu/build.sh index 2d1bde39e..abb8df476 100644 --- a/packages/ncdu/build.sh +++ b/packages/ncdu/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://dev.yorhel.nl/ncdu TERMUX_PKG_DESCRIPTION="Disk usage analyzer" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.13 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=f4d9285c38292c2de05e444d0ba271cbfe1a705eee37c2b23ea7c448ab37255a +TERMUX_PKG_VERSION=1.14 +TERMUX_PKG_SHA256=c694783aab21e27e64baad314b7c1ff34541bfa219fe9645ef6780f1c5558c44 TERMUX_PKG_SRCURL=https://dev.yorhel.nl/download/ncdu-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="ncurses, libandroid-support" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-shell=$TERMUX_PREFIX/bin/bash" diff --git a/packages/ncurses/build.sh b/packages/ncurses/build.sh old mode 100755 new mode 100644 index 0143ddffd..e1428e0a2 --- a/packages/ncurses/build.sh +++ b/packages/ncurses/build.sh @@ -44,7 +44,7 @@ termux_step_pre_configure() { TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-pkg-config-libdir=$PKG_CONFIG_LIBDIR" } -termux_step_post_make_install () { +termux_step_post_make_install() { cd $TERMUX_PREFIX/lib # we need the rm as we create(d) symlinks for the versioned so as well for lib in form menu ncurses panel; do @@ -68,7 +68,7 @@ termux_step_post_make_install () { ln -s ../{ncurses.h,termcap.h,panel.h,unctrl.h,menu.h,form.h,tic.h,nc_tparm.h,term.h,eti.h,term_entry.h,ncurses_dll.h,curses.h} ncursesw } -termux_step_post_massage () { +termux_step_post_massage() { # Strip away 30 years of cruft to decrease size. local TI=$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/terminfo mv $TI $TERMUX_PKG_TMPDIR/full-terminfo diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index 2e6ad4e75..a0ac9dbca 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_NO_DEVELSPLIT=yes TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" TERMUX_PKG_PLATFORM_INDEPENDENT=true -prepare_libs () { +prepare_libs() { local ARCH="$1" local SUFFIX="$2" local NDK_SUFFIX=$SUFFIX @@ -31,7 +31,7 @@ prepare_libs () { cp $LIBGCC/libgcc.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/ } -termux_step_extract_into_massagedir () { +termux_step_extract_into_massagedir() { prepare_libs "arm" "arm-linux-androideabi" prepare_libs "arm64" "aarch64-linux-android" prepare_libs "x86" "i686-linux-android" diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh index 901b362fb..daa1b0f08 100644 --- a/packages/ndk-stl/build.sh +++ b/packages/ndk-stl/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION TERMUX_PKG_REVISION=4 TERMUX_PKG_NO_DEVELSPLIT=yes -termux_step_extract_into_massagedir () { +termux_step_extract_into_massagedir() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/ cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/ @@ -17,6 +17,6 @@ termux_step_extract_into_massagedir () { sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/cstddef.cpppatch | patch -p1 -R } -termux_step_massage () { +termux_step_massage() { echo "overriding termux_step_massage to avoid removing header files" } diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index a916584ef..ea588d8c7 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_KEEP_STATIC_LIBRARIES="true" TERMUX_PKG_CONFLICTS="libutil-dev, libgcc, libandroid-support-dev" TERMUX_PKG_REPLACES="libutil-dev, libgcc, libandroid-support-dev" -termux_step_extract_into_massagedir () { +termux_step_extract_into_massagedir() { mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/pkgconfig \ $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index e53a2fd66..1d0e4a8a8 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -20,7 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " TERMUX_PKG_CONFFILES="share/nvim/sysinit.vim" -termux_step_host_build () { +termux_step_host_build() { termux_setup_cmake mkdir -p $TERMUX_PKG_HOSTBUILD_DIR/deps @@ -34,7 +34,7 @@ termux_step_host_build () { rm -Rf build/ } -termux_step_post_make_install () { +termux_step_post_make_install() { local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim mkdir -p $_CONFIG_DIR cp $TERMUX_PKG_BUILDER_DIR/sysinit.vim $_CONFIG_DIR/ diff --git a/packages/net-tools/build.sh b/packages/net-tools/build.sh index b8852fbe4..c575aaf3c 100644 --- a/packages/net-tools/build.sh +++ b/packages/net-tools/build.sh @@ -12,13 +12,13 @@ TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/net-tools-code-${commit TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="BINDIR=$TERMUX_PREFIX/bin SBINDIR=$TERMUX_PREFIX/bin HAVE_HOSTNAME_TOOLS=0" -termux_step_configure () { +termux_step_configure() { CFLAGS="$CFLAGS -D_LINUX_IN6_H -Dindex=strchr -Drindex=strrchr" LDFLAGS="$LDFLAGS -llog" sed -i "s#/usr#$TERMUX_PREFIX#" $TERMUX_PKG_SRCDIR/man/Makefile yes "" | make config || true } -termux_step_make_install () { +termux_step_make_install() { make $TERMUX_PKG_EXTRA_MAKE_ARGS update } diff --git a/packages/netpbm/build.sh b/packages/netpbm/build.sh index 5c93f929e..c8f643609 100644 --- a/packages/netpbm/build.sh +++ b/packages/netpbm/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/netpbm-advanced-r${TERM TERMUX_PKG_DEPENDS="libpng, libxml2, libjpeg-turbo, libtiff" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { # Put the android libpng-config script in the path (before the host one): TERMUX_PKG_LIBPNG_CONFIG_DIR=$TERMUX_PKG_TMPDIR/libpng-config mkdir -p $TERMUX_PKG_LIBPNG_CONFIG_DIR @@ -42,7 +42,7 @@ termux_step_configure () { cp $TERMUX_PKG_BUILDER_DIR/standardppmdfont.c lib/ } -termux_step_make_install () { +termux_step_make_install() { rm -Rf /tmp/netpbm make -j 1 package pkgdir=/tmp/netpbm ./installnetpbm diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh index aff375c72..98028a3b3 100644 --- a/packages/newsboat/build.sh +++ b/packages/newsboat/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_API_LEVEL=24 TERMUX_PKG_VERSION=2.14 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=67bcbaac3ebed5cea07aee502803364a01e7b45a022c886932cc18d5b9e56d8d TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl" diff --git a/packages/nginx/build.sh b/packages/nginx/build.sh index 846a9bdde..011752483 100644 --- a/packages/nginx/build.sh +++ b/packages/nginx/build.sh @@ -10,7 +10,7 @@ TERMUX_PKG_CONFFILES="etc/nginx/fastcgi.conf etc/nginx/fastcgi_params etc/nginx/ etc/nginx/mime.types etc/nginx/nginx.conf etc/nginx/scgi_params etc/nginx/uwsgi_params etc/nginx/win-utf" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" -termux_step_pre_configure () { +termux_step_pre_configure() { CPPFLAGS="$CPPFLAGS -DIOV_MAX=1024" LDFLAGS="$LDFLAGS -landroid-glob" @@ -18,7 +18,7 @@ termux_step_pre_configure () { rm -rf "$TERMUX_PREFIX/etc/nginx" } -termux_step_configure () { +termux_step_configure() { DEBUG_FLAG="" test -n "$TERMUX_DEBUG" && DEBUG_FLAG="--with-debug" @@ -52,7 +52,7 @@ termux_step_configure () { $DEBUG_FLAG } -termux_step_post_make_install () { +termux_step_post_make_install() { # many parts are taken directly from Arch PKGBUILD # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/nginx @@ -80,7 +80,7 @@ termux_step_post_make_install () { cp "$TERMUX_PKG_SRCDIR/man/nginx.8" "$TERMUX_PREFIX/share/man/man8/" } -termux_step_post_massage () { +termux_step_post_massage() { # keep empty dirs which were deleted in massage mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/log/nginx" for dir in client-body proxy fastcgi scgi uwsgi; do diff --git a/packages/nim/build.sh b/packages/nim/build.sh new file mode 100644 index 000000000..c22ad9dd1 --- /dev/null +++ b/packages/nim/build.sh @@ -0,0 +1,56 @@ +TERMUX_PKG_HOMEPAGE=https://nim-lang.org/ +TERMUX_PKG_DESCRIPTION="Nim programming language compiler" +TERMUX_PKG_LICENSE="MIT" +TERMUX_PKG_VERSION=0.19.4 +TERMUX_PKG_SHA256=f441135ee311099be81a46dba5bab3323579cd18aabc6e079b9697a71d6ca94c +TERMUX_PKG_SRCURL=https://nim-lang.org/download/nim-$TERMUX_PKG_VERSION.tar.xz +TERMUX_PKG_DEPENDS="clang, git, libandroid-glob" +TERMUX_PKG_HOSTBUILD=yes +TERMUX_PKG_BUILD_IN_SRC=yes + +termux_step_host_build() { + cp -r ../src/* ./ + make -j $TERMUX_MAKE_PROCESSES CC=gcc LD=gcc +} + +termux_step_make() { + if [ $TERMUX_ARCH = "x86_64" ]; then + export NIM_ARCH=amd64 + elif [ $TERMUX_ARCH = "i686" ]; then + export NIM_ARCH=i386 + elif [ $TERMUX_ARCH = "aarch64" ]; then + # -Oz breaks aarch64 build + CFLAGS+=" -Os" + export NIM_ARCH=arm64 + else + export NIM_ARCH=arm + fi + LDFLAGS+=" -landroid-glob" + sed -i "s%\@CC\@%${CC}%g" config/nim.cfg + sed -i "s%\@CFLAGS\@%${CFLAGS}%g" config/nim.cfg + sed -i "s%\@LDFLAGS\@%${LDFLAGS}%g" config/nim.cfg + sed -i "s%\@CPPFLAGS\@%${CPPFLAGS}%g" config/nim.cfg + + find -name "stdlib_osproc.c" | xargs -n 1 sed -i 's',"/system/bin/sh\"\,\ 14","/data/data/com.termux/files/usr/bin/sh\"\,\ 38",'g' + PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin:$PATH + + if [ $NIM_ARCH = "amd64" ]; then + sed -i 's/arm64/amd64/g' makefile + fi + export CFLAGS=" $CPPFLAGS $CFLAGS -w -fno-strict-aliasing" + make LD=$CC uos=linux mycpu=$NIM_ARCH myos=android -j $TERMUX_MAKE_PROCESSES useShPath=$TERMUX_PREFIX/bin/sh + cp config/nim.cfg ../host-build/config + + nim --opt:size --define:termux -d:release --os:android --cpu:$NIM_ARCH -t:-I/data/data/com.termux/files/usr/include -l:"-L/data/data/com.termux/files/usr/lib -landroid-glob" c koch.nim + cd dist/nimble/src + nim --define:termux -d:release --os:android --cpu:$NIM_ARCH -t:-I/data/data/com.termux/files/usr/include -l:"-L/data/data/com.termux/files/usr/lib -landroid-glob" c nimble.nim +} + +termux_step_make_install() { + ./install.sh $TERMUX_PREFIX/lib + cp koch $TERMUX_PREFIX/lib/nim/bin/ + cp dist/nimble/src/nimble $TERMUX_PREFIX/lib/nim/bin/ + ln -sfr $TERMUX_PREFIX/lib/nim/bin/nim $TERMUX_PREFIX/bin/ + ln -sfr $TERMUX_PREFIX/lib/nim/bin/koch $TERMUX_PREFIX/bin/ + ln -sfr $TERMUX_PREFIX/lib/nim/bin/nimble $TERMUX_PREFIX/bin/ +} diff --git a/packages/nim/installer.ini.patch b/packages/nim/installer.ini.patch new file mode 100644 index 000000000..212917442 --- /dev/null +++ b/packages/nim/installer.ini.patch @@ -0,0 +1,22 @@ +--- ./compiler/installer.a.ini 2018-11-20 22:15:41.349488361 +0000 ++++ ./compiler/installer.ini 2018-11-20 22:14:38.431003964 +0000 +@@ -5,17 +5,8 @@ + Name: "Nim" + Version: "$version" + Platforms: """ +- windows: i386;amd64 +- linux: i386;amd64;powerpc64;arm;sparc;mips;mipsel;mips64;mips64el;powerpc;powerpc64el;arm64;riscv64 +- macosx: i386;amd64;powerpc64 +- solaris: i386;amd64;sparc;sparc64 +- freebsd: i386;amd64 +- netbsd: i386;amd64 +- openbsd: i386;amd64 +- dragonfly: i386;amd64 +- haiku: i386;amd64 +- android: i386;arm;arm64 +- nintendoswitch: arm64 ++ linux: i386;amd64;arm;arm64 ++ android: i386;amd64;arm;arm64 + """ + + Authors: "Andreas Rumpf" diff --git a/packages/nim/osproc.nim.patch b/packages/nim/osproc.nim.patch new file mode 100644 index 000000000..4cae6dada --- /dev/null +++ b/packages/nim/osproc.nim.patch @@ -0,0 +1,11 @@ +--- ./lib/pure/osproc.a.nim 2018-11-20 22:10:39.892888610 +0000 ++++ ./lib/pure/osproc.nim 2018-11-20 22:11:48.031167863 +0000 +@@ -792,7 +792,7 @@ + if poEvalCommand in options: + const useShPath {.strdefine.} = + when not defined(android): "/bin/sh" +- else: "/system/bin/sh" ++ else: "@TERMUX_PREFIX@/bin/sh" + sysCommand = useShPath + sysArgsRaw = @[sysCommand, "-c", command] + assert args.len == 0, "`args` has to be empty when using poEvalCommand." diff --git a/packages/nim/posix.nim.patch.beforehostbuild b/packages/nim/posix.nim.patch.beforehostbuild new file mode 100644 index 000000000..f49c61202 --- /dev/null +++ b/packages/nim/posix.nim.patch.beforehostbuild @@ -0,0 +1,11 @@ +--- ./lib/posix/posix.a.nim 2018-11-20 22:08:36.965187234 +0000 ++++ ./lib/posix/posix.nim 2018-11-20 22:07:25.911639450 +0000 +@@ -92,7 +92,7 @@ + + # Platform specific stuff + +-when defined(linux) and defined(amd64): ++when defined(linux) and defined(amd64) and not defined(android): + include posix_linux_amd64 + elif defined(nintendoswitch): + include posix_nintendoswitch diff --git a/packages/ninja/build.sh b/packages/ninja/build.sh index 7a4e67e44..e19dc7a83 100644 --- a/packages/ninja/build.sh +++ b/packages/ninja/build.sh @@ -6,15 +6,15 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 TERMUX_PKG_SRCURL=https://github.com/ninja-build/ninja/archive/v${TERMUX_PKG_VERSION}.tar.gz -termux_step_configure () { +termux_step_configure() { $TERMUX_PKG_SRCDIR/configure.py } -termux_step_make () { +termux_step_make() { termux_setup_ninja ninja -j $TERMUX_MAKE_PROCESSES } -termux_step_make_install () { +termux_step_make_install() { cp ninja $TERMUX_PREFIX/bin } diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh index 514bd4163..0d04fb86f 100644 --- a/packages/nmap/build.sh +++ b/packages/nmap/build.sh @@ -14,7 +14,7 @@ TERMUX_PKG_DEPENDS="libpcap, pcre, openssl, resolv-conf, netcat, liblua, libssh2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-static --with-liblua=$TERMUX_PREFIX --without-nmap-update --without-zenmap --without-ndiff" TERMUX_PKG_BUILD_IN_SRC="yes" -termux_step_post_make_install () { +termux_step_post_make_install() { # Setup 'netcat' and 'nc' as symlink to 'ncat', since the other netcat implementations # are outdated (gnu-netcat) or non-portable (openbsd-netcat). for prog in netcat nc; do diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index 82b7e2672..1d303d21f 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=10.15.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=797ab34c74b83b21b7d6ea261b5ca235d34c61a7da5aebb32459a963097ede3e +TERMUX_PKG_VERSION=10.15.1 +TERMUX_PKG_SHA256=1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # Note that we do not use a shared libuv to avoid an issue with the Android # linker, which does not use symbols of linked shared libraries when resolving @@ -13,7 +12,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="nodejs" -termux_step_configure () { +termux_step_configure() { local DEST_CPU if [ $TERMUX_ARCH = "arm" ]; then DEST_CPU="arm" diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 2bcb2871c..23f345540 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://nodejs.org/ TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=11.8.0 -TERMUX_PKG_SHA256=7041550b94211d65ef0bee76c02bd5ddfdd9122c6d4b289323194edbfbe447a0 +TERMUX_PKG_VERSION=11.9.0 +TERMUX_PKG_SHA256=2b224d7acaa559bc65c963d4508f66f283159d8e95fdafaaaaa425074368a71a TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz # Note that we do not use a shared libuv to avoid an issue with the Android # linker, which does not use symbols of linked shared libraries when resolving @@ -13,7 +13,7 @@ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current" TERMUX_PKG_REPLACES="nodejs-current" -termux_step_configure () { +termux_step_configure() { local DEST_CPU if [ $TERMUX_ARCH = "arm" ]; then DEST_CPU="arm" diff --git a/packages/nodejs/node.gyp.patch b/packages/nodejs/node.gyp.patch index ede21cee3..80bacc7ad 100644 --- a/packages/nodejs/node.gyp.patch +++ b/packages/nodejs/node.gyp.patch @@ -1,7 +1,7 @@ -diff -u -r ../node-v11.8.0/node.gyp ./node.gyp ---- ../node-v11.8.0/node.gyp 2019-01-24 23:19:08.000000000 +0000 -+++ ./node.gyp 2019-01-27 08:15:48.080455307 +0000 -@@ -945,101 +945,7 @@ +diff -u -r ../node-v11.9.0/node.gyp ./node.gyp +--- ../node-v11.9.0/node.gyp 2019-01-30 20:43:35.000000000 +0000 ++++ ./node.gyp 2019-02-03 22:20:56.110868418 +0000 +@@ -946,102 +946,7 @@ ], } ], ] @@ -41,6 +41,7 @@ diff -u -r ../node-v11.8.0/node.gyp ./node.gyp - 'test/cctest/test_node_postmortem_metadata.cc', - 'test/cctest/test_environment.cc', - 'test/cctest/test_platform.cc', +- 'test/cctest/test_report_util.cc', - 'test/cctest/test_traced_value.cc', - 'test/cctest/test_util.cc', - 'test/cctest/test_url.cc' diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh index a78cc4e1a..9d095a657 100644 --- a/packages/notmuch/build.sh +++ b/packages/notmuch/build.sh @@ -1,13 +1,13 @@ TERMUX_PKG_HOMEPAGE=https://notmuchmail.org TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=0.28 -TERMUX_PKG_SHA256=acca75cec91651ccd2a7e31f7004e2ae14eff4ae38e375b8a88414c464cd0a37 +TERMUX_PKG_VERSION=0.28.1 +TERMUX_PKG_SHA256=d111e938137d5a465afc2b133d14df1fa356537d9ce752c919fe5673f3749a55 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian" -termux_step_configure () { +termux_step_configure() { # Use python3 so that the python3-sphinx package is # found for man page generation. export PYTHON=python3 diff --git a/packages/nzbget/build.sh b/packages/nzbget/build.sh index 92f57cbec..f8600570a 100644 --- a/packages/nzbget/build.sh +++ b/packages/nzbget/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=04dc36d432549c33d55145ecd95cc4309b3ab4a7731a1a03d954de389eacd0 TERMUX_PKG_DEPENDS="libxml2, ncurses, openssl, unrar, p7zip" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "if [ -z \"\$2\" ]; then" >> postinst # Run only on fresh install, not on upgrade echo "sed -e 's|^\(CertStore=\).*|\1$TERMUX_PREFIX/etc/tls/cert.pem|g" >> postinst diff --git a/packages/oathtool/build.sh b/packages/oathtool/build.sh index 1b3a8f0bd..fd1cd49a5 100644 --- a/packages/oathtool/build.sh +++ b/packages/oathtool/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824a TERMUX_PKG_DEPENDS="xmlsec" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pam" -termux_step_pre_configure () { +termux_step_pre_configure() { if [ "$TERMUX_DEBUG" == "true" ]; then # When doing debug build, -D_FORTIFY_SOURCE=2 gives this error: # /home/builder/.termux-build/oathtool/src/liboath/usersfile.c:482:46: error: 'umask' called with invalid mode diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh index 1e592412e..4fbb325f2 100644 --- a/packages/openjpeg/build.sh +++ b/packages/openjpeg/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz -termux_step_pre_configure () { +termux_step_pre_configure() { # Force symlinks to be overwritten: rm -Rf $TERMUX_PREFIX/lib/libopenjp2.so* } diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index 37747daf6..bc2dd0958 100644 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -2,7 +2,7 @@ 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=3 +TERMUX_PKG_REVISION=4 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" @@ -61,13 +61,14 @@ termux_step_post_configure() { rm -Rf $TERMUX_PREFIX/etc/moduli } -termux_step_post_make_install () { +termux_step_post_make_install() { # "PrintMotd no" is due to our login program already showing it. # OpenSSH 7.0 disabled ssh-dss by default, keep it for a while in Termux: echo -e "PrintMotd no\nPasswordAuthentication yes\nPubkeyAcceptedKeyTypes +ssh-dss\nSubsystem sftp $TERMUX_PREFIX/libexec/sftp-server" > $TERMUX_PREFIX/etc/ssh/sshd_config printf "PubkeyAcceptedKeyTypes +ssh-dss\nSendEnv LANG\n" > $TERMUX_PREFIX/etc/ssh/ssh_config - cp $TERMUX_PKG_BUILDER_DIR/source-ssh-agent.sh $TERMUX_PREFIX/bin/source-ssh-agent - cp $TERMUX_PKG_BUILDER_DIR/ssh-with-agent.sh $TERMUX_PREFIX/bin/ssha + install -Dm700 $TERMUX_PKG_BUILDER_DIR/source-ssh-agent.sh $TERMUX_PREFIX/bin/source-ssh-agent + install -Dm700 $TERMUX_PKG_BUILDER_DIR/ssh-with-agent.sh $TERMUX_PREFIX/bin/ssha + install -Dm700 $TERMUX_PKG_BUILDER_DIR/sftp-with-agent.sh $TERMUX_PREFIX/bin/sftpa # Install ssh-copy-id: cp $TERMUX_PKG_SRCDIR/contrib/ssh-copy-id.1 $TERMUX_PREFIX/share/man/man1/ @@ -81,17 +82,17 @@ termux_step_post_make_install () { cp $TERMUX_PKG_SRCDIR/moduli $TERMUX_PREFIX/etc/ssh/moduli } -termux_step_post_massage () { +termux_step_post_massage() { # Verify that we have man pages packaged (#1538). local manpage for manpage in ssh-keyscan.1 ssh-add.1 scp.1 ssh-agent.1 ssh.1; do - if [ ! -f share/man/man1/$manpage ]; then + if [ ! -f share/man/man1/$manpage.gz ]; then termux_error_exit "Missing man page $manpage" fi done } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "mkdir -p \$HOME/.ssh" >> postinst echo "touch \$HOME/.ssh/authorized_keys" >> postinst diff --git a/packages/openssh/sftp-with-agent.sh b/packages/openssh/sftp-with-agent.sh new file mode 100644 index 000000000..e7cc0a480 --- /dev/null +++ b/packages/openssh/sftp-with-agent.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +. source-ssh-agent +sftp "$@" diff --git a/packages/openssh/source-ssh-agent.sh b/packages/openssh/source-ssh-agent.sh old mode 100755 new mode 100644 index 3051c869f..07d0965ef --- a/packages/openssh/source-ssh-agent.sh +++ b/packages/openssh/source-ssh-agent.sh @@ -9,7 +9,7 @@ fi export SSH_AUTH_SOCK=$PREFIX/tmp/ssh-agent -start_agent () { +start_agent() { rm -f $SSH_AUTH_SOCK ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add diff --git a/packages/openssh/ssh-with-agent.sh b/packages/openssh/ssh-with-agent.sh old mode 100755 new mode 100644 diff --git a/packages/openssl/build.sh b/packages/openssl/build.sh old mode 100755 new mode 100644 index 5995f7655..d3bce04d2 --- a/packages/openssl/build.sh +++ b/packages/openssl/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="libcurl (<< 7.61.0-1)" -termux_step_configure () { +termux_step_configure() { CFLAGS+=" -DNO_SYSLOG" if [ $TERMUX_ARCH = arm ]; then CFLAGS+=" -fno-integrated-as" @@ -34,12 +34,12 @@ termux_step_configure () { no-tests } -termux_step_make () { +termux_step_make() { make depend make -j $TERMUX_MAKE_PROCESSES all } -termux_step_make_install () { +termux_step_make_install() { # "install_sw" instead of "install" to not install man pages: make -j 1 install_sw MANDIR=$TERMUX_PREFIX/share/man MANSUFFIX=.ssl diff --git a/packages/optipng/build.sh b/packages/optipng/build.sh index fcc2771e8..d37028a5b 100644 --- a/packages/optipng/build.sh +++ b/packages/optipng/build.sh @@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="libpng" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-zlib --with-system-libpng --mandir=$TERMUX_PREFIX/share/man" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { LD=$CC } diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh index 0db6d9852..5aef266f0 100644 --- a/packages/p7zip/build.sh +++ b/packages/p7zip/build.sh @@ -8,16 +8,16 @@ TERMUX_PKG_SHA256=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e234 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/p7zip/p7zip/${TERMUX_PKG_VERSION}/p7zip_${TERMUX_PKG_VERSION}_src_all.tar.bz2 TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { export CXXFLAGS="$CXXFLAGS -Wno-c++11-narrowing" cp makefile.android_arm makefile.machine } -termux_step_make () { +termux_step_make() { LD="$CC $LDFLAGS" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" \ make -j $TERMUX_MAKE_PROCESSES all3 OPTFLAGS="${CXXFLAGS}" DEST_HOME=$TERMUX_PREFIX } -termux_step_make_install () { +termux_step_make_install() { make install DEST_HOME=$TERMUX_PREFIX DEST_MAN=$TERMUX_PREFIX/share/man } diff --git a/packages/parted/build.sh b/packages/parted/build.sh index ceab0a763..f744646ed 100644 --- a/packages/parted/build.sh +++ b/packages/parted/build.sh @@ -9,6 +9,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-device-mapper " -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -Wno-gnu-designator" } diff --git a/packages/pastebinit/build.sh b/packages/pastebinit/build.sh index 0d8b00d54..2718124af 100644 --- a/packages/pastebinit/build.sh +++ b/packages/pastebinit/build.sh @@ -8,8 +8,8 @@ TERMUX_PKG_DEPENDS="python" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { - cp pastebinit $TERMUX_PREFIX/bin/ +termux_step_make_install() { + cp pastebinit $TERMUX_PREFIX/bin/ xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl pastebinit.xml cp pastebinit.1 $TERMUX_PREFIX/share/man/man1/ diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh index 2c5c17d03..5d0b785a4 100644 --- a/packages/patchelf/build.sh +++ b/packages/patchelf/build.sh @@ -8,6 +8,6 @@ TERMUX_PKG_SHA256=fbf494896e3bb8cef9c47b8c3f4d6d387ab19ff4161b61a8fafbcf7395f960 TERMUX_PKG_SRCURL=https://github.com/NixOS/patchelf/archive/29c085fd9d3fc972f75b3961905d6b4ecce7eb2b.zip TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { ./bootstrap.sh } diff --git a/packages/pathpicker/build.sh b/packages/pathpicker/build.sh index cb962b6ab..cf72a4479 100644 --- a/packages/pathpicker/build.sh +++ b/packages/pathpicker/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="bash,python" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { _PKG_DIR=$TERMUX_PREFIX/share/pathpicker rm -Rf $_PKG_DIR mkdir -p $_PKG_DIR diff --git a/packages/perl/build.sh b/packages/perl/build.sh index 76227f06a..9b468d151 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -12,7 +12,7 @@ TERMUX_MAKE_PROCESSES=1 TERMUX_PKG_RM_AFTER_INSTALL="bin/perl${TERMUX_PKG_VERSION}" TERMUX_PKG_NO_DEVELSPLIT=yes -termux_step_post_extract_package () { +termux_step_post_extract_package() { # This port uses perl-cross: http://arsv.github.io/perl-cross/ cp -rf perl-cross-${TERMUX_PKG_VERSION[1]}/* . @@ -22,7 +22,7 @@ termux_step_post_extract_package () { rm -f $TERMUX_PREFIX/include/perl } -termux_step_configure () { +termux_step_configure() { export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin ORIG_AR=$AR; unset AR @@ -54,7 +54,7 @@ termux_step_configure () { -Duseshrplib } -termux_step_post_make_install () { +termux_step_post_make_install() { # Replace hardlinks with symlinks: cd $TERMUX_PREFIX/share/man/man1 rm perlbug.1 diff --git a/packages/pforth/build.sh b/packages/pforth/build.sh index b221d7812..74a1058a7 100644 --- a/packages/pforth/build.sh +++ b/packages/pforth/build.sh @@ -7,13 +7,13 @@ TERMUX_PKG_SHA256=3cf472bb944aa53b0eb0b93d021c8c2c0eff18dd2e3e54daddaf4af342e441 TERMUX_PKG_SRCURL=https://github.com/philburk/pforth/archive/${_COMMIT}.zip TERMUX_PKG_HOSTBUILD=yes -termux_step_post_configure () { +termux_step_post_configure() { # Avoid caching the host build as it differs between arches # and is quite fast here anyway: rm -Rf $TERMUX_PKG_HOSTBUILD_DIR } -termux_step_host_build () { +termux_step_host_build() { local M32="" if [ $TERMUX_ARCH_BITS = "32" ]; then M32="-m32" @@ -24,7 +24,7 @@ termux_step_host_build () { CC="gcc $M32" make all } -termux_step_pre_configure () { +termux_step_pre_configure() { for file in pfdicdat.h pforth; do cp $TERMUX_PKG_HOSTBUILD_DIR/build/unix/$file $TERMUX_PKG_SRCDIR/build/unix/$file touch -d "next hour" $TERMUX_PKG_SRCDIR/build/unix/$file @@ -33,6 +33,6 @@ termux_step_pre_configure () { export TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR/build/unix export CC="$CC $CFLAGS" } -termux_step_make_install () { +termux_step_make_install() { cp $TERMUX_PKG_BUILDDIR/pforth_standalone $TERMUX_PREFIX/bin/pforth } diff --git a/packages/php/build.sh b/packages/php/build.sh index 9dde61e2e..e1d333714 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -47,7 +47,7 @@ ac_cv_func_res_nsearch=no --sbindir=$TERMUX_PREFIX/bin " -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS+=" -landroid-glob -llog" export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/ @@ -59,14 +59,14 @@ termux_step_pre_configure () { export EXTENSION_DIR=$TERMUX_PREFIX/lib/php } -termux_step_post_configure () { +termux_step_post_configure() { # Avoid src/ext/gd/gd.c trying to include : sed -i 's/#define HAVE_GD_XPM 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h # Avoid src/ext/standard/dns.c trying to use struct __res_state: sed -i 's/#define HAVE_RES_NSEARCH 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h } -termux_step_post_make_install () { +termux_step_post_make_install() { mkdir -p $TERMUX_PREFIX/etc/php-fpm.d cp sapi/fpm/php-fpm.conf $TERMUX_PREFIX/etc/ cp sapi/fpm/www.conf $TERMUX_PREFIX/etc/php-fpm.d/ diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh index 6d614af01..309a81731 100644 --- a/packages/picolisp/build.sh +++ b/packages/picolisp/build.sh @@ -33,7 +33,7 @@ termux_step_pre_configure() { CFLAGS+=" -c $LDFLAGS $CPPFLAGS" } -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR/ if [ $TERMUX_ARCH_BITS = "64" ]; then diff --git a/packages/pkg-config/build.sh b/packages/pkg-config/build.sh index 7a480f7de..b94e9970b 100644 --- a/packages/pkg-config/build.sh +++ b/packages/pkg-config/build.sh @@ -7,6 +7,6 @@ TERMUX_PKG_SHA256=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d5 TERMUX_PKG_DEPENDS="glib" TERMUX_PKG_RM_AFTER_INSTALL="bin/*-pkg-config" -termux_step_pre_configure () { +termux_step_pre_configure() { rm -Rf $TERMUX_PREFIX/bin/*pkg-config } diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh index d75f06abd..6276a11ab 100644 --- a/packages/play-audio/build.sh +++ b/packages/play-audio/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_post_make_install () { +termux_step_post_make_install() { local LIBEXEC_BINARY=$TERMUX_PREFIX/libexec/play-audio local BIN_BINARY=$TERMUX_PREFIX/bin/play-audio mv $BIN_BINARY $LIBEXEC_BINARY diff --git a/packages/pngquant/build.sh b/packages/pngquant/build.sh index 32e436404..e69c85e4f 100644 --- a/packages/pngquant/build.sh +++ b/packages/pngquant/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="PNG image optimising utility" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_VERSION=2.12.2 TERMUX_PKG_SHA256=(5edf7c5bffd07e5d28fcc6d4d94a187c30b532c52ac986b3e45aff3dce0567dc - 34036379d3b68de79b5f180b3fe3989b9d2e81c1909ee3f85acaedb74f46003b) + 34036379d3b68de79b5f180b3fe3989b9d2e81c1909ee3f85acaedb74f46003b) # If both archives are .tar.gz then they overwrite eachother since they are the same version and hence the same name. # Work around this by using .zip for one of them... TERMUX_PKG_SRCURL=(https://github.com/pornel/pngquant/archive/$TERMUX_PKG_VERSION.tar.gz @@ -13,6 +13,6 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-sse" -termux_step_post_extract_package () { +termux_step_post_extract_package() { mv $TERMUX_PKG_SRCDIR/libimagequant-$TERMUX_PKG_VERSION/* $TERMUX_PKG_SRCDIR/lib/ } diff --git a/packages/privoxy/build.sh b/packages/privoxy/build.sh index 96cc77285..dfa2ceafe 100644 --- a/packages/privoxy/build.sh +++ b/packages/privoxy/build.sh @@ -29,6 +29,6 @@ termux_step_post_make_install() { termux_step_post_massage() { # copy default config files for f in $TERMUX_PKG_CONFFILES; do - cp "$TERMUX_PKG_SRCDIR/$(basename $f)" "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$f" + cp "$TERMUX_PKG_SRCDIR/$(basename $f)" "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$f" done } diff --git a/packages/proot/build.sh b/packages/proot/build.sh index 1e3bbdc91..10cd3a217 100644 --- a/packages/proot/build.sh +++ b/packages/proot/build.sh @@ -17,7 +17,7 @@ termux_step_pre_configure() { CPPFLAGS+=" -DARG_MAX=131072" } -termux_step_make_install () { +termux_step_make_install() { export CROSS_COMPILE=${TERMUX_HOST_PLATFORM}- cd $TERMUX_PKG_SRCDIR/src diff --git a/packages/pwgen/build.sh b/packages/pwgen/build.sh old mode 100755 new mode 100644 diff --git a/packages/python/build.sh b/packages/python/build.sh index 7f4049617..792ee9c98 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -52,7 +52,7 @@ termux_step_pre_configure() { if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi } -termux_step_post_make_install () { +termux_step_post_make_install() { (cd $TERMUX_PREFIX/bin ln -sf python${_MAJOR_VERSION}m python${_MAJOR_VERSION} ln -sf python3 python @@ -67,7 +67,7 @@ termux_step_post_make_install () { mv $TERMUX_PREFIX/include/python${_MAJOR_VERSION}m/pyconfig.h $TERMUX_PKG_TMPDIR/pyconfig.h } -termux_step_post_massage () { +termux_step_post_massage() { # Verify that desired modules have been included: for module in _ssl _bz2 zlib _curses _sqlite3 _lzma; do if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.*.so ]; then @@ -84,7 +84,7 @@ termux_step_post_massage () { find $TERMUX_PKG_MASSAGEDIR -depth -name __pycache__ -exec rm -rf {} + } -termux_step_create_debscripts () { +termux_step_create_debscripts() { ## POST INSTALL: echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo 'echo "Setting up pip..."' >> postinst diff --git a/packages/python2/build.sh b/packages/python2/build.sh index d1d1b957f..0795308d4 100644 --- a/packages/python2/build.sh +++ b/packages/python2/build.sh @@ -45,7 +45,7 @@ lib/python${_MAJOR_VERSION}/*/test lib/python${_MAJOR_VERSION}/*/tests " -termux_step_host_build () { +termux_step_host_build() { # We need a host-built Parser/pgen binary, copied into cross-compile build in termux_step_post_configure() below $TERMUX_PKG_SRCDIR/configure make Parser/pgen @@ -55,7 +55,7 @@ termux_step_host_build () { ln -s python python$_MAJOR_VERSION } -termux_step_post_configure () { +termux_step_post_configure() { cp $TERMUX_PKG_HOSTBUILD_DIR/Parser/pgen $TERMUX_PKG_BUILDDIR/Parser/pgen touch -d "next hour" $TERMUX_PKG_BUILDDIR/Parser/pgen } @@ -74,7 +74,7 @@ termux_step_pre_configure() { if [ $TERMUX_ARCH = x86_64 ]; then LDFLAGS+=64; fi } -termux_step_post_make_install () { +termux_step_post_make_install() { # Avoid file clashes with the python (3) package: (cd $TERMUX_PREFIX/bin mv 2to3 2to3-${_MAJOR_VERSION} @@ -84,7 +84,7 @@ termux_step_post_make_install () { export PATH=$TERMUX_ORIG_PATH } -termux_step_post_massage () { +termux_step_post_massage() { # Verify that desired modules have been included: for module in _ssl bz2 zlib _curses _sqlite3; do if [ ! -f lib/python${_MAJOR_VERSION}/lib-dynload/${module}.so ]; then @@ -93,7 +93,7 @@ termux_step_post_massage () { done } -termux_step_create_debscripts () { +termux_step_create_debscripts() { ## POST INSTALL: echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "echo 'Setting up pip2...'" >> postinst diff --git a/packages/qpdf/build.sh b/packages/qpdf/build.sh index 12d6f59ee..93bc92cc4 100644 --- a/packages/qpdf/build.sh +++ b/packages/qpdf/build.sh @@ -1,14 +1,14 @@ TERMUX_PKG_HOMEPAGE=http://qpdf.sourceforge.net TERMUX_PKG_DESCRIPTION="Content-Preserving PDF Transformation System" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=8.3.0 -TERMUX_PKG_SHA256=8cc02ebf69231fde3d2e19dda383ee3f2b2cb5f4afdff7386c3d9c1a8cb863d2 +TERMUX_PKG_VERSION=8.4.0 +TERMUX_PKG_SHA256=71d9b6c77ac56521d86a481cb9e52c0774de106c1dcf7a0644a05bd1230be87e TERMUX_PKG_SRCURL=https://github.com/qpdf/qpdf/archive/release-qpdf-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="libjpeg-turbo" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-random=/dev/urandom" TERMUX_PKG_BUILD_IN_SRC=true -termux_step_pre_configure () { +termux_step_pre_configure() { ./autogen.sh } diff --git a/packages/ranger/build.sh b/packages/ranger/build.sh index 72366f420..2380518ee 100644 --- a/packages/ranger/build.sh +++ b/packages/ranger/build.sh @@ -14,7 +14,7 @@ termux_step_make() { } termux_step_make_install() { - python3.7 setup.py install --prefix=$TERMUX_PREFIX --force + python3.7 setup.py install --prefix=$TERMUX_PREFIX --force } termux_step_post_massage() { diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index 69a75dee9..b1d543cdf 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://rclone.org/ TERMUX_PKG_DESCRIPTION="rsync for cloud storage" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.45 -TERMUX_PKG_SHA256=a3041a54d4f1eb795faceca153741e4d5a3b44521ff99873c2070fa4d8c9769b +TERMUX_PKG_VERSION=1.46 +TERMUX_PKG_SHA256=3277e9aca1178707b12d7b7e63247ef3dd0c922d46d63b231f2d60d71e41ade2 TERMUX_PKG_SRCURL=https://github.com/ncw/rclone/releases/download/v${TERMUX_PKG_VERSION}/rclone-v${TERMUX_PKG_VERSION}.tar.gz termux_step_make_install() { diff --git a/packages/readline/build.sh b/packages/readline/build.sh old mode 100755 new mode 100644 index 48566b32e..de63facdf --- a/packages/readline/build.sh +++ b/packages/readline/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-curses --enable-multibyte bash_cv_wcwidt TERMUX_PKG_EXTRA_MAKE_ARGS="SHLIB_LIBS=-lncursesw" TERMUX_PKG_CONFFILES="etc/inputrc" -termux_step_pre_configure () { +termux_step_pre_configure() { local PATCH_CHECKSUMS PATCH_CHECKSUMS[1]=9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376 PATCH_CHECKSUMS[2]=8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58 diff --git a/packages/remind/build.sh b/packages/remind/build.sh index a534edda3..3097baac1 100644 --- a/packages/remind/build.sh +++ b/packages/remind/build.sh @@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="libandroid-glob" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_RM_AFTER_INSTALL="bin/tkremind share/man/man1/tkremind.1 bin/cm2rem.tcl share/man/man1/cm2rem.1" -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" } diff --git a/packages/resolv-conf/build.sh b/packages/resolv-conf/build.sh index d3faffeb7..c31da1025 100644 --- a/packages/resolv-conf/build.sh +++ b/packages/resolv-conf/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Resolver configuration file" TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_VERSION=1.1 -termux_step_make_install () { +termux_step_make_install() { _RESOLV_CONF=$TERMUX_PREFIX/etc/resolv.conf printf "nameserver 8.8.8.8\nnameserver 8.8.4.4" > $_RESOLV_CONF } diff --git a/packages/rhash/build.sh b/packages/rhash/build.sh index 74a18898d..ff853060d 100644 --- a/packages/rhash/build.sh +++ b/packages/rhash/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rhash/RHash TERMUX_PKG_DESCRIPTION="Console utility for calculation and verification of magnet links and a wide range of hash sums" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=1.3.7 -TERMUX_PKG_SHA256=a2441b7a04ae554ddd3eafcf50365c787b012e35ee6402eb6705d9cd4b8dfa65 +TERMUX_PKG_VERSION=1.3.8 +TERMUX_PKG_SHA256=be536a56acfefc87dbc8b1db30fc639020e41edf05518185ea98630e3df7c04c TERMUX_PKG_SRCURL=https://github.com/rhash/RHash/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_BUILD_IN_SRC=true @@ -10,14 +10,14 @@ TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" TERMUX_PKG_CONFLICTS=librhash TERMUX_PKG_REPLACES=librhash -termux_step_make () { +termux_step_make() { CFLAGS="-DOPENSSL_RUNTIME $CPPFLAGS $CFLAGS" make -j $TERMUX_MAKE_PROCESSES \ ADDCFLAGS="$CFLAGS" \ ADDLDFLAGS="$LDFLAGS" } -termux_step_make_install () { +termux_step_make_install() { make install install-pkg-config make -C librhash install-lib-headers diff --git a/packages/root-repo/build.sh b/packages/root-repo/build.sh index 07fb21720..9cff81e29 100644 --- a/packages/root-repo/build.sh +++ b/packages/root-repo/build.sh @@ -2,16 +2,16 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-root-packages TERMUX_PKG_DESCRIPTION="Package repository containing programs for rooted devices" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" -TERMUX_PKG_VERSION=1.2 +TERMUX_PKG_VERSION=1.3 +TERMUX_PKG_DEPENDS="termux-keyring" TERMUX_PKG_PLATFORM_INDEPENDENT=yes termux_step_make_install() { - mkdir -p $TERMUX_PREFIX/etc/apt/{sources.list.d,trusted.gpg.d} + mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d echo "deb https://grimler.se root stable" > $TERMUX_PREFIX/etc/apt/sources.list.d/root.list - cp $TERMUX_PKG_BUILDER_DIR/grimler.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/ } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "echo Downloading updated package list ..." >> postinst echo "apt update" >> postinst diff --git a/packages/rsync/build.sh b/packages/rsync/build.sh old mode 100755 new mode 100644 index 645582e7c..bfb359538 --- a/packages/rsync/build.sh +++ b/packages/rsync/build.sh @@ -8,6 +8,6 @@ TERMUX_PKG_SRCURL=https://rsync.samba.org/ftp/rsync/src/rsync-${TERMUX_PKG_VERSI TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-rsyncd-conf=$TERMUX_PREFIX/etc/rsyncd.conf --with-included-zlib=no --disable-debug" TERMUX_PKG_DEPENDS="libpopt, openssh | dropbear" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS="$CFLAGS -llog" # for syslog } diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index f347a0bd0..c95729314 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -26,7 +26,7 @@ termux_step_pre_configure() { fi } -termux_step_make_install () { +termux_step_make_install() { make install make uninstall # remove possible remains to get fresh timestamps make install @@ -42,7 +42,7 @@ termux_step_make_install () { perl -p -i -e 's/^.*CONFIG\["GREP"\].*$/ CONFIG["GREP"] = "grep"/' $RBCONFIG } -termux_step_post_massage () { +termux_step_post_massage() { if [ ! -f $TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then echo "Error: The readline extension was not built" fi diff --git a/packages/rust/build.sh b/packages/rust/build.sh index c85d71c95..e40e0d966 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SHA256=d617a7dc39daaafa8256320991005fc376c8ef2080593918301b24466d0067 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz TERMUX_PKG_DEPENDS="clang, openssl, lld" -termux_step_configure () { +termux_step_configure() { termux_setup_cmake termux_setup_rust @@ -38,14 +38,14 @@ termux_step_configure () { unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG } -termux_step_make () { +termux_step_make() { $TERMUX_PKG_SRCDIR/x.py dist \ --host $CARGO_TARGET_NAME \ --target $CARGO_TARGET_NAME \ --target wasm32-unknown-unknown } -termux_step_make_install () { +termux_step_make_install() { local host_files_to_remove="$TERMUX_PREFIX/lib/rustlib/x86_64-unknown-linux-gnu \ $TERMUX_PREFIX/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu \ $TERMUX_PREFIX/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu" diff --git a/packages/screen/build.sh b/packages/screen/build.sh index 5f0227b9c..e13ba2c0c 100644 --- a/packages/screen/build.sh +++ b/packages/screen/build.sh @@ -12,7 +12,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-ssl=openssl " -termux_step_pre_configure () { +termux_step_pre_configure() { # Run autoreconf since we have patched configure.ac autoconf CFLAGS+=" -DGETUTENT" diff --git a/packages/screenfetch/build.sh b/packages/screenfetch/build.sh index f24b7f6f1..ef0724b92 100644 --- a/packages/screenfetch/build.sh +++ b/packages/screenfetch/build.sh @@ -9,7 +9,7 @@ TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { install screenfetch-dev ${TERMUX_PREFIX}/bin/screenfetch install screenfetch.1 ${TERMUX_PREFIX}/share/man/man1/ } diff --git a/packages/sed/build.sh b/packages/sed/build.sh index ba580836a..99bb7a81d 100644 --- a/packages/sed/build.sh +++ b/packages/sed/build.sh @@ -10,6 +10,6 @@ termux_step_pre_configure() { CFLAGS+=" -D__USE_FORTIFY_LEVEL=2" } -termux_step_post_configure () { +termux_step_post_configure() { touch -d "next hour" $TERMUX_PKG_SRCDIR/doc/sed.1 } diff --git a/packages/serf/build.sh b/packages/serf/build.sh index b49be093e..f4f43ae30 100644 --- a/packages/serf/build.sh +++ b/packages/serf/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87 TERMUX_PKG_DEPENDS="apr, apr-util, openssl, libuuid, libexpat" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make_install () { +termux_step_make_install() { scons APR=$TERMUX_PREFIX \ APU=$TERMUX_PREFIX \ CC=`which $CC` \ diff --git a/packages/sl/build.sh b/packages/sl/build.sh index 176c12817..5360b06b8 100644 --- a/packages/sl/build.sh +++ b/packages/sl/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb556 TERMUX_PKG_DEPENDS="ncurses" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make_install () { +termux_step_make_install() { install sl $TERMUX_PREFIX/bin/ cp sl.1 $TERMUX_PREFIX/share/man/man1 } diff --git a/packages/socat/build.sh b/packages/socat/build.sh index 7213f841a..ea0047a63 100644 --- a/packages/socat/build.sh +++ b/packages/socat/build.sh @@ -10,11 +10,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_header_resolv_h=no ac_cv_c_compiler_gnu=yes TERMUX_PKG_BUILD_IN_SRC=yes #TERMUX_PKG_HOSTBUILD=yes -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" # uses syslog } -#termux_step_configure () { +#termux_step_configure() { # From socat_buildscript_for_android.sh in socat source: #./configure --host --disable-unix --disable-openssl --prefix=$TERMUX_PREFIX # Replace misconfigured values in config.h and enable PTY functions diff --git a/packages/squid/build.sh b/packages/squid/build.sh index c95c1c64c..389041132 100644 --- a/packages/squid/build.sh +++ b/packages/squid/build.sh @@ -33,7 +33,7 @@ squid_cv_gnu_atomics=yes --mandir=$TERMUX_PREFIX/share/man " -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" # needed for building cf_gen diff --git a/packages/strace/build.sh b/packages/strace/build.sh old mode 100755 new mode 100644 diff --git a/packages/syncthing/build.sh b/packages/syncthing/build.sh index d3fcb0605..01bad9e08 100644 --- a/packages/syncthing/build.sh +++ b/packages/syncthing/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://syncthing.net/ TERMUX_PKG_DESCRIPTION="Decentralized file synchronization" TERMUX_PKG_LICENSE="MPL-2.0" -TERMUX_PKG_VERSION=1.0.0 -TERMUX_PKG_SHA256=27435f9ef7c276736ec16781ad6b27fecb28053b8ffb16e0bae40c1e9bb62225 +TERMUX_PKG_VERSION=1.0.1 +TERMUX_PKG_SHA256=c36291efcea790df9db3b67a39a64e32a77332489abdae8260a295dae9015a3d TERMUX_PKG_SRCURL=https://github.com/syncthing/syncthing/releases/download/v${TERMUX_PKG_VERSION}/syncthing-source-v${TERMUX_PKG_VERSION}.tar.gz termux_step_make(){ diff --git a/packages/tcl/build.sh b/packages/tcl/build.sh index 924e82947..3bbaeb810 100644 --- a/packages/tcl/build.sh +++ b/packages/tcl/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful but easy to learn dynamic programming language" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_DEPENDS="libsqlite" TERMUX_PKG_VERSION=8.6.9 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SHA256=ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/tcl/Tcl/${TERMUX_PKG_VERSION}/tcl${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -22,12 +22,12 @@ tcl_cv_strtoul_unbroken=ok TERMUX_PKG_KEEP_STATIC_LIBRARIES=yes TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/*.a lib/itcl*/*.a lib/tdbc*/libtdbcstub*.a" -termux_step_pre_configure () { +termux_step_pre_configure() { TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/unix CFLAGS+=" -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD" } -termux_step_post_make_install () { +termux_step_post_make_install() { # expect needs private headers make install-private-headers local _MAJOR_VERSION=${TERMUX_PKG_VERSION:0:3} diff --git a/packages/termux-am/build.sh b/packages/termux-am/build.sh index 98473b1cb..260fbeb87 100644 --- a/packages/termux-am/build.sh +++ b/packages/termux-am/build.sh @@ -9,12 +9,12 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_CONFLICTS="termux-tools (<< 0.51)" -termux_step_make () { +termux_step_make() { export ANDROID_HOME GRADLE_OPTS=" -Dorg.gradle.daemon=false" ./gradlew :app:assembleRelease } -termux_step_make_install () { +termux_step_make_install() { cp $TERMUX_PKG_SRCDIR/am-libexec-packaged $TERMUX_PREFIX/bin/am mkdir -p $TERMUX_PREFIX/libexec/termux-am cp $TERMUX_PKG_SRCDIR/app/build/outputs/apk/release/app-release-unsigned.apk $TERMUX_PREFIX/libexec/termux-am/am.apk diff --git a/packages/termux-create-package/build.sh b/packages/termux-create-package/build.sh index cc4ccbd63..8b7775c1e 100644 --- a/packages/termux-create-package/build.sh +++ b/packages/termux-create-package/build.sh @@ -8,6 +8,6 @@ TERMUX_PKG_DEPENDS="python" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { cp termux-create-package $TERMUX_PREFIX/bin/termux-create-package } diff --git a/packages/termux-keyring/build.sh b/packages/termux-keyring/build.sh new file mode 100644 index 000000000..fc93c36c8 --- /dev/null +++ b/packages/termux-keyring/build.sh @@ -0,0 +1,11 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/termux +TERMUX_PKG_DESCRIPTION="GPG public keys for the official Termux repositories" +TERMUX_PKG_LICENSE="Apache-2.0" +TERMUX_PKG_VERSION=1.0 +TERMUX_PKG_PLATFORM_INDEPENDENT=yes + +termux_step_make_install() { + mkdir -p $TERMUX_PREFIX/etc/apt/trusted.gpg.d + install -Dm600 $TERMUX_PKG_BUILDER_DIR/grimler.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/ + install -Dm600 $TERMUX_PKG_BUILDER_DIR/xeffyr.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/ +} diff --git a/packages/root-repo/grimler.gpg b/packages/termux-keyring/grimler.gpg similarity index 100% rename from packages/root-repo/grimler.gpg rename to packages/termux-keyring/grimler.gpg diff --git a/packages/x11-repo/xeffyr.gpg b/packages/termux-keyring/xeffyr.gpg similarity index 100% rename from packages/x11-repo/xeffyr.gpg rename to packages/termux-keyring/xeffyr.gpg diff --git a/packages/termux-tools/build.sh b/packages/termux-tools/build.sh index 02e2d804a..69dda4515 100644 --- a/packages/termux-tools/build.sh +++ b/packages/termux-tools/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="termux-am" TERMUX_PKG_CONFFILES="etc/motd" TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)" -termux_step_make_install () { +termux_step_make_install() { mkdir -p $TERMUX_PREFIX/bin/applets # Remove LD_LIBRARY_PATH from environment to avoid conflicting # with system libraries that system binaries may link against: diff --git a/packages/tesseract/api-Makefile.am.patch b/packages/tesseract/api-Makefile.am.patch deleted file mode 100644 index 14ca882c0..000000000 --- a/packages/tesseract/api-Makefile.am.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r ../tesseract-3.05.01/api/Makefile.am ./api/Makefile.am ---- ../tesseract-3.05.01/api/Makefile.am 2017-06-01 20:06:24.000000000 +0200 -+++ ./api/Makefile.am 2017-06-07 10:53:12.835866778 +0200 -@@ -77,6 +77,7 @@ - endif - - tesseract_LDADD = libtesseract.la -+tesseract_LDADD += $(LEPTONICA_LIBS) - - - tesseract_LDFLAGS = $(OPENCL_LDFLAGS) diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 900975baf..8230090e8 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -1,11 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/tesseract-ocr/tesseract TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR engine available" TERMUX_PKG_LICENSE="Apache-2.0" -TERMUX_PKG_VERSION=3.05.02 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=494d64ffa7069498a97b909a0e65a35a213989e0184f1ea15332933a90d43445 +TERMUX_PKG_VERSION=4.0.0 +TERMUX_PKG_SHA256=a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libtool, libuuid, leptonica" +TERMUX_PKG_DEPENDS="libtool, libuuid, leptonica, libandroid-glob" termux_step_pre_configure() { # http://blog.matt-swain.com/post/26419042500/installing-tesseract-ocr-on-mac-os-x-lion @@ -34,15 +33,9 @@ termux_step_post_make_install() { mkdir -p $TERMUX_PKG_CACHEDIR/tessdata - local f - for f in cube.{bigrams,fold,lm,nn,params,size,word-freq} tesseract_cube.nn traineddata; do - # From the tessdata README: "These language data files only work with - # Tesseract 4. They are based on the sources in tesseract-ocr/langdata on GitHub. - # Get language data files for Tesseract 3.04 or 3.05 from the 3.04 tree." - termux_download \ - https://raw.githubusercontent.com/tesseract-ocr/tessdata/3.04.00/eng.$f \ - $TERMUX_PKG_CACHEDIR/tessdata/eng.$f \ - ${checksums[$f]} - cp $TERMUX_PKG_CACHEDIR/tessdata/eng.$f . - done + termux_download \ + https://raw.githubusercontent.com/tesseract-ocr/tessdata/$TERMUX_PKG_VERSION/eng.traineddata \ + $TERMUX_PKG_CACHEDIR/tessdata/eng.traineddata \ + daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 + cp $TERMUX_PKG_CACHEDIR/tessdata/eng.traineddata . } diff --git a/packages/tesseract/src-api-baseapi.cpp.patch b/packages/tesseract/src-api-baseapi.cpp.patch new file mode 100644 index 000000000..17869b2e5 --- /dev/null +++ b/packages/tesseract/src-api-baseapi.cpp.patch @@ -0,0 +1,15 @@ +diff -u -r ../tesseract-4.0.0/src/api/baseapi.cpp ./src/api/baseapi.cpp +--- ../tesseract-4.0.0/src/api/baseapi.cpp 2018-10-29 08:53:12.000000000 +0000 ++++ ./src/api/baseapi.cpp 2019-02-03 22:55:00.470748529 +0000 +@@ -206,11 +206,8 @@ + image_height_(0) { + const char *locale; + locale = std::setlocale(LC_ALL, nullptr); +- ASSERT_HOST(!strcmp(locale, "C")); + locale = std::setlocale(LC_CTYPE, nullptr); +- ASSERT_HOST(!strcmp(locale, "C")); + locale = std::setlocale(LC_NUMERIC, nullptr); +- ASSERT_HOST(!strcmp(locale, "C")); + } + + TessBaseAPI::~TessBaseAPI() { diff --git a/packages/tesseract/src-ccutils-Makefile.am.patch b/packages/tesseract/src-ccutils-Makefile.am.patch new file mode 100644 index 000000000..b7ad48991 --- /dev/null +++ b/packages/tesseract/src-ccutils-Makefile.am.patch @@ -0,0 +1,11 @@ +diff -u -r ../tesseract-4.0.0/src/ccutil/Makefile.am ./src/ccutil/Makefile.am +--- ../tesseract-4.0.0/src/ccutil/Makefile.am 2018-10-29 08:53:12.000000000 +0000 ++++ ./src/ccutil/Makefile.am 2019-02-03 22:45:27.364961733 +0000 +@@ -1,6 +1,7 @@ + SUBDIRS = + AM_CXXFLAGS = + AM_CPPFLAGS = ++AM_LDFLAGS = -landroid-glob + + if !NO_TESSDATA_PREFIX + AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@ diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index b56b85110..d08859996 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -126,7 +126,7 @@ share/texlive/texmf-dist/scripts/lua2dox/lua2dox_filter share/texlive/texmf-dist/scripts/context/perl/mptopdf.pl share/texlive/texmf-dist/scripts/checkcites/checkcites.lua" -termux_step_host_build () { +termux_step_host_build() { mkdir -p auxdir/auxsub mkdir -p texk/kpathsea mkdir -p texk/web2c @@ -159,7 +159,7 @@ termux_step_pre_configure() { export LD_LIBRARY_PATH=$TERMUX_PKG_HOSTBUILD_DIR/texk/kpathsea/.libs } -termux_step_create_debscripts () { +termux_step_create_debscripts() { # Clean texlive's folder if needed (run on fresh install) echo "#!$TERMUX_PREFIX/bin/bash" > preinst echo "if [ ! -d $PREFIX/opt/texlive ]; then echo 'Removing residual files from old version of TeX Live for Termux'; rm -rf $PREFIX/opt/texlive; fi" >> preinst diff --git a/packages/texlive-tlmgr/build.sh b/packages/texlive-tlmgr/build.sh index 1cdb6bf0a..1279fde16 100644 --- a/packages/texlive-tlmgr/build.sh +++ b/packages/texlive-tlmgr/build.sh @@ -14,13 +14,13 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=yes TL_ROOT=$TERMUX_PREFIX/share/texlive TL_BINDIR=$TERMUX_PREFIX/bin -termux_step_make () { +termux_step_make() { mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/web2c} cp -r $TERMUX_PKG_SRCDIR/* $TL_ROOT/ cp $TERMUX_PKG_BUILDER_DIR/texlive.tlpdb $TL_ROOT/tlpkg/ } -termux_step_post_make_install () { +termux_step_post_make_install() { # Replace tlmgr link with a small wrapper that prevents error on "tlmgr update --self" rm -rf $TL_BINDIR/tlmgr ln -sf ../share/texlive/texmf-dist/scripts/texlive/tlmgr.pl $TL_BINDIR/tlmgr.ln @@ -33,7 +33,7 @@ termux_step_post_make_install () { chmod 0744 $TL_BINDIR/tlmgr } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/bash" > postinst echo "mkdir -p $TL_ROOT/{tlpkg/{backups,tlpobj},texmf-var/{web2c,tex/generic/config}}" >> postinst echo "export TMPDIR=$TERMUX_PREFIX/tmp" >> postinst diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index bda8e42c2..e94635592 100644 --- a/packages/texlive/build.sh +++ b/packages/texlive/build.sh @@ -40,7 +40,7 @@ termux_step_make() { perl -I$TL_ROOT/tlpkg/ $TL_ROOT/texmf-dist/scripts/texlive/mktexlsr.pl $TL_ROOT/texmf-dist } -termux_step_create_debscripts () { +termux_step_create_debscripts() { # Clean texlive's folder if needed (run on upgrade) echo "#!$TERMUX_PREFIX/bin/bash" > preinst echo "if [ -d $TERMUX_PREFIX/opt/texlive ]; then echo 'Removing residual files from old version of TeX Live for Termux'; rm -rf $PREFIX/opt/texlive; fi" >> preinst diff --git a/packages/tig/build.sh b/packages/tig/build.sh index 7aace4288..e3153bd39 100644 --- a/packages/tig/build.sh +++ b/packages/tig/build.sh @@ -2,11 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://jonas.github.io/tig/ TERMUX_PKG_DESCRIPTION="Ncurses-based text-mode interface for git" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.4.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=b6b6aa183e571224d0e1fab3ec482542c1a97fa7a85b26352dc31dbafe8558b8 TERMUX_PKG_SRCURL=https://github.com/jonas/tig/releases/download/tig-$TERMUX_PKG_VERSION/tig-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="ncurses, git, libandroid-support" -termux_step_post_make_install () { - make -j 1 install-doc +termux_step_post_make_install() { + make -j 1 install-doc } diff --git a/packages/tinyscheme/build.sh b/packages/tinyscheme/build.sh index 73ab165e6..9f9448674 100644 --- a/packages/tinyscheme/build.sh +++ b/packages/tinyscheme/build.sh @@ -7,12 +7,12 @@ TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tinyscheme/tinyscheme TERMUX_PKG_SHA256=eac0103494c755192b9e8f10454d9f98f2bbd4d352e046f7b253439a3f991999 TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { AR+=" crs" LD=$CC } -termux_step_post_make_install () { +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/tmate/build.sh b/packages/tmate/build.sh index 6a1a87bce..b1362bae2 100644 --- a/packages/tmate/build.sh +++ b/packages/tmate/build.sh @@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/tmate-io/tmate/archive/${TERMUX_PKG_VERSION TERMUX_PKG_SHA256=d9c2ac59f42e65aac5f500f0548ea8056fd79c9c5285e5af324d833e2a84c305 TERMUX_PKG_DEPENDS="libandroid-support, libevent, libmsgpack, libssh, libutil, ncurses" -termux_step_pre_configure () { +termux_step_pre_configure() { CFLAGS+=" -DIOV_MAX=1024" ./autogen.sh diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh old mode 100755 new mode 100644 index b6fb46233..582e2601b --- a/packages/tmux/build.sh +++ b/packages/tmux/build.sh @@ -13,6 +13,6 @@ termux_step_pre_configure() { LDFLAGS+=" -landroid-glob" } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/tmux.conf $TERMUX_PREFIX/etc/tmux.conf } diff --git a/packages/tor/build.sh b/packages/tor/build.sh index 1ac986989..9f64fa1e7 100644 --- a/packages/tor/build.sh +++ b/packages/tor/build.sh @@ -9,11 +9,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-zstd --disable-unittests" TERMUX_PKG_CONFFILES="etc/tor/torrc" TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas" -termux_step_pre_configure () { +termux_step_pre_configure() { LDFLAGS="$LDFLAGS -llog" } -termux_step_post_make_install () { +termux_step_post_make_install() { # use default config mv "$TERMUX_PREFIX/etc/tor/torrc.sample" "$TERMUX_PREFIX/etc/tor/torrc" } diff --git a/packages/torsocks/build.sh b/packages/torsocks/build.sh index 9f9c9f6ec..1ad15cd3a 100644 --- a/packages/torsocks/build.sh +++ b/packages/torsocks/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=817c143e8a9d217f41a223a85139c6ca28e1b99556c547fcdb4c72dbc170b6 TERMUX_PKG_SRCURL=https://github.com/dgoulet/torsocks/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="tor" -termux_step_pre_configure () { +termux_step_pre_configure() { ./autogen.sh } diff --git a/packages/tracepath/build.sh b/packages/tracepath/build.sh index 614c27727..e975db889 100644 --- a/packages/tracepath/build.sh +++ b/packages/tracepath/build.sh @@ -7,15 +7,15 @@ TERMUX_PKG_SRCURL=https://github.com/iputils/iputils/archive/s${TERMUX_PKG_VERSI TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libidn" -termux_step_configure () { +termux_step_configure() { return } -termux_step_make () { +termux_step_make() { return } -termux_step_make_install () { +termux_step_make_install() { $CC $CFLAGS $LDFLAGS -lidn -o $TERMUX_PREFIX/bin/tracepath tracepath.c local MANDIR=$TERMUX_PREFIX/share/man/man8 mkdir -p $MANDIR diff --git a/packages/transmission/build.sh b/packages/transmission/build.sh old mode 100755 new mode 100644 diff --git a/packages/tree/build.sh b/packages/tree/build.sh index 0f827e13d..10d8b1b70 100644 --- a/packages/tree/build.sh +++ b/packages/tree/build.sh @@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Recursive directory lister producing a depth indented li TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Gert Scholten @gscholt" TERMUX_PKG_VERSION=1.8.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 TERMUX_PKG_SRCURL=http://mama.indstate.edu/users/ice/tree/src/tree-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_make () { +termux_step_make() { make \ CC="$CC" \ CFLAGS="$CFLAGS $CPPFLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" \ @@ -16,7 +17,7 @@ termux_step_make () { OBJS="file.o tree.o unix.o html.o xml.o json.o hash.o color.o strverscmp.o" } -termux_step_make_install () { +termux_step_make_install() { make install \ prefix="$TERMUX_PREFIX" \ MANDIR="$TERMUX_PREFIX/share/man/man1" diff --git a/packages/tsu/build.sh b/packages/tsu/build.sh index a8d01655b..6278e81f1 100644 --- a/packages/tsu/build.sh +++ b/packages/tsu/build.sh @@ -11,7 +11,7 @@ termux_step_make() { : } -termux_step_make_install () { +termux_step_make_install() { cp tsu $TERMUX_PREFIX/bin/tsu chmod +x $TERMUX_PREFIX/bin/tsu diff --git a/packages/ttyrec/build.sh b/packages/ttyrec/build.sh index bd9dbda6d..2efa8eb4f 100644 --- a/packages/ttyrec/build.sh +++ b/packages/ttyrec/build.sh @@ -11,7 +11,7 @@ termux_step_pre_configure() { CFLAGS+=" -Dset_progname=setprogname" } -termux_step_make_install () { +termux_step_make_install() { cp ttyrec ttyplay ttytime $TERMUX_PREFIX/bin mkdir -p $TERMUX_PREFIX/share/man/man1 cp ttyrec.1 ttyplay.1 ttytime.1 $TERMUX_PREFIX/share/man/man1 diff --git a/packages/units/build.sh b/packages/units/build.sh index ec9aa52ea..ce62daa39 100644 --- a/packages/units/build.sh +++ b/packages/units/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/units/ TERMUX_PKG_DESCRIPTION="Converts between different systems of units" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=2.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=64959c231c280ceb4f3e6ae6a19b918247b6174833f7f1894704c444869c4678 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/units/units-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="readline, libandroid-support" diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh index 2e7516899..30927d6e7 100644 --- a/packages/unrar/build.sh +++ b/packages/unrar/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://www.rarlab.com/ TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives" TERMUX_PKG_LICENSE="custom" -TERMUX_PKG_VERSION=5.6.8 -TERMUX_PKG_SHA256=a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff +TERMUX_PKG_VERSION=5.7.1 +TERMUX_PKG_SHA256=d208abcceecfee0084bb8a93e9b756319d906a3ac6380ee5d10285fb0ffc4d65 TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support" TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/unstable-repo/build.sh b/packages/unstable-repo/build.sh new file mode 100644 index 000000000..3c6edaf2d --- /dev/null +++ b/packages/unstable-repo/build.sh @@ -0,0 +1,19 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/termux/unstable-packages +TERMUX_PKG_DESCRIPTION="Package repository containing new/unstable programs and libraries." +TERMUX_PKG_LICENSE="Apache-2.0" +TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" +TERMUX_PKG_VERSION=1.0 +TERMUX_PKG_DEPENDS="termux-keyring" +TERMUX_PKG_PLATFORM_INDEPENDENT=yes + +termux_step_make_install() { + mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d + echo "deb https://dl.bintray.com/xeffyr/unstable-packages unstable main" > $TERMUX_PREFIX/etc/apt/sources.list.d/unstable.list +} + +termux_step_create_debscripts() { + echo "#!$TERMUX_PREFIX/bin/sh" > postinst + echo "echo Downloading updated package list ..." >> postinst + echo "apt update" >> postinst + echo "exit 0" >> postinst +} diff --git a/packages/unzip/build.sh b/packages/unzip/build.sh index 09f08824e..4a4a4469a 100644 --- a/packages/unzip/build.sh +++ b/packages/unzip/build.sh @@ -2,16 +2,16 @@ TERMUX_PKG_HOMEPAGE=http://www.info-zip.org/ TERMUX_PKG_DESCRIPTION="Tools for working with zip files" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_VERSION=6.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/unzip60.tar.gz TERMUX_PKG_SHA256=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 TERMUX_PKG_DEPENDS="libbz2" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { cp unix/Makefile Makefile } -termux_step_make () { +termux_step_make() { LD="$CC $LDFLAGS -lbz2" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS -DNO_LCHMOD -DUSE_BZIP2" make -j $TERMUX_MAKE_PROCESSES generic } diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh old mode 100755 new mode 100644 index 1b203533b..7ea13b507 --- a/packages/vim-python/build.sh +++ b/packages/vim-python/build.sh @@ -4,9 +4,8 @@ TERMUX_PKG_LICENSE="VIM License" TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python" # vim should only be updated every 50 releases on multiples of 50. # Update both vim and vim-python to the same version in one PR. -TERMUX_PKG_VERSION=8.1.0800 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=ecc04dea54eb6b096c5df91a3ddbdfb19eebb2adf4aa481c758261555cbcf574 +TERMUX_PKG_VERSION=8.1.0850 +TERMUX_PKG_SHA256=5998db9ea6fd2c53ff955e00c0a26d04700945f9103c0a4ec4f6fb9f9e950202 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" vim_cv_getcwd_broken=no @@ -50,7 +49,7 @@ termux_step_pre_configure() { CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.7m" } -termux_step_pre_configure () { +termux_step_pre_configure() { make distclean # Remove eventually existing symlinks from previous builds so that they get re-created @@ -58,7 +57,7 @@ termux_step_pre_configure () { rm -f $TERMUX_PREFIX/share/man/man1/view.1 } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc # Remove most tutor files: diff --git a/packages/vim/build.sh b/packages/vim/build.sh old mode 100755 new mode 100644 index 34736019e..89d37ffd2 --- a/packages/vim/build.sh +++ b/packages/vim/build.sh @@ -4,9 +4,8 @@ TERMUX_PKG_LICENSE="VIM License" TERMUX_PKG_DEPENDS="ncurses, vim-runtime" # vim should only be updated every 50 releases on multiples of 50. # Update both vim and vim-python to the same version in one PR. -TERMUX_PKG_VERSION=8.1.0800 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=ecc04dea54eb6b096c5df91a3ddbdfb19eebb2adf4aa481c758261555cbcf574 +TERMUX_PKG_VERSION=8.1.0850 +TERMUX_PKG_SHA256=5998db9ea6fd2c53ff955e00c0a26d04700945f9103c0a4ec4f6fb9f9e950202 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" vim_cv_getcwd_broken=no @@ -37,7 +36,7 @@ TERMUX_PKG_CONFFILES="share/vim/vimrc" TERMUX_PKG_CONFLICTS="vim-python" -termux_step_pre_configure () { +termux_step_pre_configure() { make distclean # Remove eventually existing symlinks from previous builds so that they get re-created @@ -45,7 +44,7 @@ termux_step_pre_configure () { rm -f $TERMUX_PREFIX/share/man/man1/view.1 } -termux_step_post_make_install () { +termux_step_post_make_install() { cp $TERMUX_PKG_BUILDER_DIR/vimrc $TERMUX_PREFIX/share/vim/vimrc # Remove most tutor files: diff --git a/packages/vttest/build.sh b/packages/vttest/build.sh old mode 100755 new mode 100644 diff --git a/packages/weechat/build.sh b/packages/weechat/build.sh old mode 100755 new mode 100644 diff --git a/packages/wireguard-tools/build.sh b/packages/wireguard-tools/build.sh index 4c5022099..18423ddfa 100644 --- a/packages/wireguard-tools/build.sh +++ b/packages/wireguard-tools/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_DEPENDS="libmnl, tsu" TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src/tools WITH_BASHCOMPLETION=yes WITH_WGQUICK=no WITH_SYSTEMDUNITS=no" -termux_step_post_make_install () { +termux_step_post_make_install() { cd src/tools/wg-quick $CC $CFLAGS -DWG_CONFIG_SEARCH_PATHS="\"$TERMUX_ANDROID_HOME/.wireguard $TERMUX_PREFIX/etc/wireguard /data/misc/wireguard /data/data/com.wireguard.android/files\"" -o wg-quick android.c install -m 0755 wg-quick $TERMUX_PREFIX/bin diff --git a/packages/x11-repo/build.sh b/packages/x11-repo/build.sh index c1429f964..1390b0026 100644 --- a/packages/x11-repo/build.sh +++ b/packages/x11-repo/build.sh @@ -1,17 +1,17 @@ -TERMUX_PKG_HOMEPAGE=https://termux-x11.ml +TERMUX_PKG_HOMEPAGE=https://github.com/termux/x11-packages TERMUX_PKG_DESCRIPTION="Package repository containing X11 programs and libraries" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" -TERMUX_PKG_VERSION=1.2 +TERMUX_PKG_VERSION=1.3 +TERMUX_PKG_DEPENDS="termux-keyring" TERMUX_PKG_PLATFORM_INDEPENDENT=yes termux_step_make_install() { - mkdir -p $TERMUX_PREFIX/etc/apt/{sources.list.d,trusted.gpg.d} - echo "deb https://termux-x11.ml x11 main" > $TERMUX_PREFIX/etc/apt/sources.list.d/x11.list - cp $TERMUX_PKG_BUILDER_DIR/xeffyr.gpg $TERMUX_PREFIX/etc/apt/trusted.gpg.d/ + mkdir -p $TERMUX_PREFIX/etc/apt/sources.list.d + echo "deb https://dl.bintray.com/xeffyr/x11-packages x11 main" > $TERMUX_PREFIX/etc/apt/sources.list.d/x11.list } -termux_step_create_debscripts () { +termux_step_create_debscripts() { echo "#!$TERMUX_PREFIX/bin/sh" > postinst echo "echo Downloading updated package list ..." >> postinst echo "apt update" >> postinst diff --git a/packages/xvidcore/build.sh b/packages/xvidcore/build.sh index 85cf9f06b..5a89691ea 100644 --- a/packages/xvidcore/build.sh +++ b/packages/xvidcore/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_SHA256=165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894c TERMUX_PKG_SRCURL=http://downloads.xvid.org/downloads/xvidcore-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_pre_configure () { +termux_step_pre_configure() { rm -f $TERMUX_PREFIX/lib/libxvid* export TERMUX_PKG_BUILDDIR=$TERMUX_PKG_BUILDDIR/build/generic export TERMUX_PKG_SRCDIR=$TERMUX_PKG_BUILDDIR diff --git a/packages/yarn/build.sh b/packages/yarn/build.sh index 72d9a749c..6dd8edcf7 100644 --- a/packages/yarn/build.sh +++ b/packages/yarn/build.sh @@ -3,13 +3,13 @@ TERMUX_PKG_DESCRIPTION="Fast, reliable, and secure dependency management" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff" TERMUX_PKG_DEPENDS="nodejs | nodejs-lts" -TERMUX_PKG_VERSION=1.13.0 -TERMUX_PKG_SHA256=125d40ebf621ebb08e3f66a618bd2cc5cd77fa317a312900a1ab4360ed38bf14 +TERMUX_PKG_VERSION=1.14.0 +TERMUX_PKG_SHA256=2d38fc0700f106762f72f0aeebcec0e227f1e94bd10488d179ca1596053ab700 TERMUX_PKG_SRCURL=https://yarnpkg.com/downloads/${TERMUX_PKG_VERSION}/yarn-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes -termux_step_make_install () { +termux_step_make_install() { cp -r . ${TERMUX_PREFIX}/share/yarn/ ln -f -s ../share/yarn/bin/yarn ${TERMUX_PREFIX}/bin/yarn } diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh index abc92ba60..38676abb8 100644 --- a/packages/zbar/build.sh +++ b/packages/zbar/build.sh @@ -11,6 +11,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread --without-x --without-gtk --without-qt --without-python --mandir=$TERMUX_PREFIX/share/man" -termux_step_pre_configure () { +termux_step_pre_configure() { autoconf } diff --git a/packages/zile/build.sh b/packages/zile/build.sh old mode 100755 new mode 100644 diff --git a/packages/zip/build.sh b/packages/zip/build.sh index 274b49b73..f8ace2736 100644 --- a/packages/zip/build.sh +++ b/packages/zip/build.sh @@ -8,10 +8,10 @@ TERMUX_PKG_SHA256=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c08063 TERMUX_PKG_DEPENDS="libandroid-support, libbz2" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_configure () { +termux_step_configure() { cp unix/Makefile Makefile } -termux_step_make () { +termux_step_make() { LD="$CC $LDFLAGS" CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS" make -j $TERMUX_MAKE_PROCESSES generic } diff --git a/packages/zsh/build.sh b/packages/zsh/build.sh index 5aed5be81..8b86f873a 100644 --- a/packages/zsh/build.sh +++ b/packages/zsh/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://www.zsh.org TERMUX_PKG_DESCRIPTION="Shell with lots of features" TERMUX_PKG_LICENSE="BSD" -TERMUX_PKG_VERSION=5.7 -TERMUX_PKG_SHA256=7807b290b361d9fa1e4c2dfafc78cb7e976e7015652e235889c6eff7468bd613 +TERMUX_PKG_VERSION=5.7.1 +TERMUX_PKG_SHA256=7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/zsh-${TERMUX_PKG_VERSION}.tar.xz # Remove hard link to bin/zsh as Android does not support hard links: TERMUX_PKG_RM_AFTER_INSTALL="bin/zsh-${TERMUX_PKG_VERSION}" @@ -17,7 +17,7 @@ ac_cv_func_getpwuid=yes TERMUX_PKG_CONFFILES="etc/zshrc" TERMUX_PKG_BUILD_IN_SRC=yes -termux_step_post_configure () { +termux_step_post_configure() { # INSTALL file: "For a non-dynamic zsh, the default is to compile the complete, compctl, zle, # computil, complist, sched, # parameter, zleparameter and rlimits modules into the shell, # and you will need to edit config.modules to make any other modules available." @@ -36,7 +36,7 @@ termux_step_post_configure () { done } -termux_step_post_make_install () { +termux_step_post_make_install() { # /etc/zshrc - Run for interactive shells (http://zsh.sourceforge.net/Guide/zshguide02.html): sed "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" $TERMUX_PKG_BUILDER_DIR/etc-zshrc > $TERMUX_PREFIX/etc/zshrc