calc: patch Makefile instead of overriding a lot of variables

And fix so that the package is installed to TERMUX_PKG_MASSAGEDIR.
neovim: install to TERMUX_PKG_MASSAGEDIR
2021-11-18 08:46:09 +01:00 · 2021-11-18 08:46:09 +01:00 · 2021-11-18 08:46:09 +01:00 · 2021-11-18 08:46:09 +01:00 · 2021-11-18 08:46:09 +01:00 · 2021-11-18 08:46:09 +01:00
916 changed files with 3104 additions and 23702 deletions
@@ -1,14 +0,0 @@
-daysUntilStale: 45
-daysUntilClose: 14
-
-exemptLabels:
-  - "not stale"
-  - "package request"
-
-markComment: >
-  This issue/PR has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-staleLabel: wontfix
-
@@ -79,14 +79,14 @@ jobs:
              # This file does not belong to a package, so ignore it
              continue
            fi
-            if [[ $file =~ ^packages/([.a-z0-9+-]*)/([.a-z0-9+-]*).subpackage.sh$ ]]; then
+            if [[ $file =~ ^packages/([a-z0-9+-]*)/([a-z0-9+-]*).subpackage.sh$ ]]; then
              # A subpackage was modified, check if it was deleted or just updated
              pkg=${BASH_REMATCH[1]}
              subpkg=${BASH_REMATCH[2]}
              if [ ! -f "packages/${pkg}/${subpkg}.subpackage.sh" ]; then
                echo "$subpkg" >> ./deleted_packages.txt
              fi
-            elif [[ $file =~ ^packages/([.a-z0-9+-]*)/.*$ ]]; then
+            elif [[ $file =~ ^packages/([a-z0-9+-]*)/.*$ ]]; then
              # package, check if it was deleted or updated
              pkg=${BASH_REMATCH[1]}
              if [ ! -d "packages/${pkg}" ]; then
@@ -287,19 +287,14 @@ jobs:
              --write-out '|%{http_code}' \
              https://packages-cf.termux.org/aptly-api/publish/${REPOSITORY_NAME}/${REPOSITORY_DISTRIBUTION} || true
          )
-          http_status_code=$(echo "$curl_response" | cut -d'|' -f2 | grep -oP '\d{3}$')
+          http_status_code=$(echo "$curl_response" | cut -d'|' -f2)

          if [ "$http_status_code" = "200" ]; then
            echo "[$(date +%H:%M:%S)] Repository has been updated successfully."
          elif [ "$http_status_code" = "000" ]; then
-            echo "[$(date +%H:%M:%S)] Warning: server/proxy has dropped connection."
+            echo "[$(date +%H:%M:%S)] Error: server/proxy has dropped connection."
            # Ignore - nothing can be done with that unless we change proxy.
            #exit 1
-          elif [ "$http_status_code" = "504" ]; then
-            echo "[$(date +%H:%M:%S)] Warning: request processing time was too long, connection dropped."
-            # Ignore - nothing can be done with that unless we change repository
-            # management tool or reduce repository size.
-            #exit 1
          else
            echo "[$(date +%H:%M:%S)] Error: got http_status_code == '$http_status_code'"
            exit 1
@@ -10,9 +10,6 @@
 /clean.sh @Grimler91 @xeffyr
 /scripts/ @Grimler91 @xeffyr

-# GN setup script
-/scripts/build/setup/termux_setup_gn.sh @thunder-coding
-
 # Repository utilities.
 /scripts/bin/ @xeffyr

@@ -92,8 +92,8 @@ met these conditions:
 - **Packages must be licensed under widely recognized open source license**

  Software should be licensed under Apache, BSD, GNU GPL, MIT or other well
-  known open-source licenses. Software for which the source is available but
-  distributed under non-free conditions is processed on an individual basis.
+  known open source license. Software which is open source but is distributed
+  under non-free conditions is processed on individual basis.

  Software which is either closed-source, contain binary-only components or
  is distributed under End User License Agreement is not accepted.
@@ -9,19 +9,6 @@ export SOURCE_DATE_EPOCH
 : "${TMPDIR:=/tmp}"
 export TMPDIR

-if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then
-	if [ "$(id -u)" = "0" ]; then
-		echo "On-device execution of this script as root is disabled."
-		exit 1
-	fi
-
-	# This variable tells all parts of build system that build
-	# is performed on device.
-	export TERMUX_ON_DEVICE_BUILD=true
-else
-	export TERMUX_ON_DEVICE_BUILD=false
-fi
-
 cd "$(realpath "$(dirname "$0")")"
 TERMUX_SCRIPTDIR=$(pwd)
 export TERMUX_SCRIPTDIR
@@ -39,6 +26,19 @@ if [ ! -e "$TERMUX_BUILD_LOCK_FILE" ]; then
 	touch "$TERMUX_BUILD_LOCK_FILE"
 fi

+if [ "$(uname -o)" = "Android" ] || [ -e "/system/bin/app_process" ]; then
+	if [ "$(id -u)" = "0" ]; then
+		echo "On-device execution of this script as root is disabled."
+		exit 1
+	fi
+
+	# This variable tells all parts of build system that build
+	# is performed on device.
+	export TERMUX_ON_DEVICE_BUILD=true
+else
+	export TERMUX_ON_DEVICE_BUILD=false
+fi
+
 # Special variable for internal use. It forces script to ignore
 # lock file.
 : "${TERMUX_BUILD_IGNORE_LOCK:=false}"
@@ -213,9 +213,10 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_install_service_scripts.sh"
 # shellcheck source=scripts/build/termux_step_install_license.sh
 source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_install_license.sh"

-# Function to cp (through tar) installed files to massage dir
-# shellcheck source=scripts/build/termux_step_extract_into_massagedir.sh
-source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_extract_into_massagedir.sh"
+# Check so that we have not modified $TERMUX_PREFIX, all files should
+# be installed into $TERMUX_PKG_MASSAGEDIR.
+# source=scripts/build/termux_step_check_prefix.sh
+source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_check_prefix.sh"

 # Hook function to create {pre,post}install, {pre,post}rm-scripts for subpkgs
 termux_step_create_subpkg_debscripts() {
@@ -374,9 +375,9 @@ if [ "${TERMUX_INSTALL_DEPS-false}" = "true" ]; then
 		gpg --import "$TERMUX_SCRIPTDIR/packages/termux-keyring/fornwall.gpg"
 		gpg --no-tty --command-file <(echo -e "trust\n5\ny")  --edit-key 2218893D3F679BEFC421FD976700B77E6D8D0AE7
 	}
-	gpg --list-keys 2C7F29AE97891F6419A9E2CDB0076E490B71616B > /dev/null 2>&1 || {
+	gpg --list-keys B63168609E8839CA9150CE2DD9EFD56891B2BB50 > /dev/null 2>&1 || {
 		gpg --import "$TERMUX_SCRIPTDIR/packages/termux-keyring/grimler.gpg"
-		gpg --no-tty --command-file <(echo -e "trust\n5\ny")  --edit-key 2C7F29AE97891F6419A9E2CDB0076E490B71616B
+		gpg --no-tty --command-file <(echo -e "trust\n5\ny")  --edit-key B63168609E8839CA9150CE2DD9EFD56891B2BB50
 	}
 	gpg --list-keys CC72CF8BA7DBFA0182877D045A897D96E57CF20C > /dev/null 2>&1 || {
 		gpg --import "$TERMUX_SCRIPTDIR/packages/termux-keyring/termux-autobuilds.gpg"
@@ -475,13 +476,15 @@ for ((i=0; i<${#PACKAGE_LIST[@]}; i++)); do
 		cd "$TERMUX_PKG_BUILDDIR"
 		termux_step_make
 		cd "$TERMUX_PKG_BUILDDIR"
+
 		termux_step_make_install
 		cd "$TERMUX_PKG_BUILDDIR"
+
 		termux_step_post_make_install
 		termux_step_install_service_scripts
 		termux_step_install_license
+		termux_step_check_prefix
 		cd "$TERMUX_PKG_MASSAGEDIR"
-		termux_step_extract_into_massagedir
 		termux_step_massage
 		cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
 		termux_step_post_massage
@@ -0,0 +1,14 @@
+# NOTE: Disabled due to not being ffmpeg 4 compatible.
+TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
+TERMUX_PKG_DESCRIPTION="GStreamer libav/ffmpeg wrapper"
+TERMUX_PKG_VERSION=1.14.1
+TERMUX_PKG_SHA256=eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d
+TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_DEPENDS="gst-plugins-base,ffmpeg"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-android_media
+--disable-examples
+--disable-tests
+--with-system-libav
+"
@@ -1,8 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-TERMUX_PKG_DESCRIPTION="NetCDF is a set of software libraries and self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data"
-TERMUX_PKG_LICENSE="custom"
-TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=4.3.0
-TERMUX_PKG_SHA256=25da1c97d7a01bc4cee34121c32909872edd38404589c0427fefa1301743f18f
-TERMUX_PKG_SRCURL=https://github.com/Unidata/netcdf-cxx4/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libhdf5, libcurl, openssl, libnghttp2, netcdf-c"
@@ -1,12 +0,0 @@
--- ./usr/include/dirent.h.orig
-+++ ./usr/include/dirent.h
-@@ -57,6 +57,9 @@
- #define DT_SOCK 12
- #define DT_WHT 14
- 
-+#define IFTODT(x) ((x)>>12 & 0xF)
-+#define DTTOIF(x) ((x)<<12)
-+
- #if defined(__LP64__)
- #define __DIRENT64_INO_T ino_t
- #else
@@ -1,11 +0,0 @@
--- ./usr/include/linux/fcntl.h
-+++ ./usr/include/linux/fcntl.h
-@@ -54,7 +54,7 @@
- #define DN_MULTISHOT 0x80000000
- #define AT_FDCWD - 100
- #define AT_SYMLINK_NOFOLLOW 0x100
-#define AT_EACCESS 0x200
-+#define AT_EACCESS 0
- #define AT_REMOVEDIR 0x200
- #define AT_SYMLINK_FOLLOW 0x400
- #define AT_NO_AUTOMOUNT 0x800
@@ -1,15 +0,0 @@
--- ./usr/include/mntent.h.orig	2021-12-10 16:17:07.041722648 +0530
-+++ ./usr/include/mntent.h	2021-12-10 16:17:41.171722635 +0530
-@@ -70,9 +70,9 @@
- #endif /* __ANDROID_API__ >= 21 */
- 
- 
-#if __ANDROID_API__ >= 26
-char* hasmntopt(const struct mntent* __entry, const char* __option) __INTRODUCED_IN(26);
-#endif /* __ANDROID_API__ >= 26 */
-+#if __ANDROID_API__ >= 21
-+char* hasmntopt(const struct mntent* __entry, const char* __option) __INTRODUCED_IN(21);
-+#endif /* __ANDROID_API__ >= 21 */
- 
- 
- __END_DECLS
@@ -1,15 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/hackndev/0verkill
-TERMUX_PKG_DESCRIPTION="Bloody 2D action deathmatch-like game in ASCII-ART"
-TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.16-git
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/ravener/0verkill/archive/refs/tags/v${TERMUX_PKG_VERSION:0:4}.tar.gz
-TERMUX_PKG_SHA256=d337e4a7dd91f26c837e96492d960c7fd77c75bc24bcc6ed8d350df39edf8bb8
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_GROUPS="games"
-
-termux_step_pre_configure() {
-	autoreconf -vfi
-	CFLAGS+=" -fcommon"
-}
@@ -12,8 +12,8 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 termux_step_make_install() {
 	termux_download \
 		$TERMUX_PKG_SRCURL \
-		$TERMUX_PREFIX/bin/ack \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/ack \
 		$TERMUX_PKG_SHA256
-	touch $TERMUX_PREFIX/bin/ack
-	chmod +x $TERMUX_PREFIX/bin/ack
+	touch $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/ack
+	chmod +x $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/ack
 }
@@ -17,7 +17,7 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm755 -t "${TERMUX_PREFIX}"/bin \
+	install -Dm755 -t "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}"/bin \
 		"${TERMUX_PKG_SRCDIR}"/age \
 		"${TERMUX_PKG_SRCDIR}"/age-keygen
 }
@@ -20,13 +20,13 @@ termux_step_make() {
 }

 termux_step_make_install() {
+	mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/
 	install -Dm700 \
 		"$GOPATH"/src/github.com/xyproto/algernon/algernon \
-		"$TERMUX_PREFIX"/bin/
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/

 	# Offline samples may be useful to get started with Algernon.
-	rm -rf "$TERMUX_PREFIX"/share/doc/algernon
-	mkdir -p "$TERMUX_PREFIX"/share/doc/algernon
+	mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/share/doc/algernon
 	cp -a "$GOPATH"/src/github.com/xyproto/algernon/samples \
-		"$TERMUX_PREFIX"/share/doc/algernon/
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/share/doc/algernon/
 }
@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.25
-TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://alpine.x10host.com/alpine/release/src/alpine-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
-TERMUX_PKG_DEPENDS="coreutils, libcrypt, ncurses, openssl-tool"
+TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl-tool"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-debug
 --with-c-client-target=lnx
@@ -1,27 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://rephial.org/
-TERMUX_PKG_DESCRIPTION="Dungeon exploration adventure game"
-TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.2.3
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=f001299283fb8a81865e07983d54cf04cd0f9addfeb7daeef75ed60f6ca417ff
-TERMUX_PKG_SRCURL=https://github.com/angband/angband/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-x11
--bindir=$TERMUX_PREFIX/bin
--sysconfdir=$TERMUX_PREFIX/share/angband
-"
-TERMUX_PKG_RM_AFTER_INSTALL="
-share/angband/fonts
-share/angband/icons
-share/angband/sounds
-share/angband/xtra
-"
-TERMUX_PKG_GROUPS="games"
-
-termux_step_pre_configure () {
-	./autogen.sh
-	perl -p -i -e 's|ncursesw5-config|ncursesw6-config|g' configure
-}
@@ -1,23 +0,0 @@
--- ./src/main.c.orig	2021-08-01 00:28:01.000000000 +0200
-+++ ./src/main.c	2021-09-10 09:34:27.031713786 +0200
-@@ -36,7 +36,7 @@
-  */
- #include "locale.h"
- 
-#if !defined(WINDOWS)
-+#if !defined(WINDOWS) && !defined(__ANDROID__)
- #include "langinfo.h"
- #endif
- 
-@@ -497,9 +497,11 @@
- 		ANGBAND_SYS = mstr;
- #if !defined(WINDOWS)
- 	if (setlocale(LC_CTYPE, "")) {
-+#ifndef __ANDROID__
- 		/* Require UTF-8 */
- 		if (!streq(nl_langinfo(CODESET), "UTF-8"))
- 			quit("Angband requires UTF-8 support");
-+#endif
- 	}
- #endif
- 
@@ -10,12 +10,12 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true

 termux_step_make_install() {
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/opt/ant/bin
+
 	mv ./bin/ant .
 	rm -f ./bin/*
 	mv ./ant ./bin/
 	rm -rf manual
-	rm -rf $TERMUX_PREFIX/opt/ant
-	mkdir -p $TERMUX_PREFIX/opt/ant
-	cp -r ./* $TERMUX_PREFIX/opt/ant
-	ln -sfr $TERMUX_PREFIX/opt/ant/bin/ant $TERMUX_PREFIX/bin/ant
+	cp -r ./* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/opt/ant
+	ln -sfr $TERMUX_PREFIX/opt/ant/bin/ant $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/ant
 }
@@ -21,5 +21,5 @@ termux_step_make() {
 termux_step_make_install() {
 	install -Dm700 \
 		"$GOPATH"/src/github.com/getantibody/antibody/antibody \
-		"$TERMUX_PREFIX"/bin/
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/
 }
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:2.4.51
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION:2}.tar.bz2
 TERMUX_PKG_SHA256=20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4
 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
@@ -81,16 +81,6 @@ termux_step_host_build() {
 }

 termux_step_pre_configure() {
-	# Certain packages are not safe to build on device because their
-	# build.sh script deletes specific files in $TERMUX_PREFIX.
-	if $TERMUX_ON_DEVICE_BUILD; then
-		termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
-	fi
-
-	# remove old files
-	rm -rf "$TERMUX_PREFIX"/{libexec,share,etc}/apache2
-	rm -rf "$TERMUX_PREFIX"/lib/cgi-bin
-
 	if [ $TERMUX_ARCH_BITS -eq 32 ]; then
 		export ap_cv_void_ptr_lt_long=4
 	else
@@ -101,14 +91,6 @@ termux_step_pre_configure() {

 	# use custom layout
 	cat $TERMUX_PKG_BUILDER_DIR/Termux.layout > $TERMUX_PKG_SRCDIR/config.layout
-
-	make -C $TERMUX_PKG_SRCDIR/libdummy
-	ldflags_tmp="-L$TERMUX_PKG_SRCDIR/libdummy -Wl,--as-needed"
-	for m in cache dav proxy session watchdog; do
-		ldflags_tmp+=,-ldummy-mod_$m
-	done
-	libexecdir=$TERMUX_PREFIX/libexec/apache2
-	LDFLAGS+=" $ldflags_tmp -Wl,-rpath=$libexecdir"
 }

 termux_step_post_configure() {
@@ -131,16 +113,17 @@ termux_step_post_make_install() {
 		-e 's|#\(Include extra/httpd-mpm.conf\)|\1|' \
 		-e 's|User daemon|#User daemon|' \
 		-e 's|Group daemon|#Group daemon|' \
-		-i "$TERMUX_PREFIX/etc/apache2/httpd.conf"
-	echo -e "#\n#  Load config files from the config directory 'conf.d'.\n#\nInclude etc/apache2/conf.d/*.conf" >> $TERMUX_PREFIX/etc/apache2/httpd.conf
+		-i "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/apache2/httpd.conf"
+	echo -e "#\n#  Load config files from the config directory 'conf.d'.\n#\nInclude etc/apache2/conf.d/*.conf" \
+		>> $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/apache2/httpd.conf
 }

 termux_step_post_massage() {
 	# sometimes it creates a $TERMUX_PREFIX/bin/sh -> /bin/sh
-	rm -f ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/bin/sh
+	rm -f ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/bin/sh

-	mkdir -p ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/etc/apache2/conf.d
-	touch ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/etc/apache2/conf.d/placeholder.conf
-	mkdir -p ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/var/run/apache2
-	mkdir -p ${TERMUX_PKG_MASSAGEDIR}${TERMUX_PREFIX}/var/log/apache2
+	mkdir -p ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/etc/apache2/conf.d
+	touch ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/etc/apache2/conf.d/placeholder.conf
+	mkdir -p ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/var/run/apache2
+	mkdir -p ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/var/log/apache2
 }
@@ -1,113 +0,0 @@
--- a/libdummy/Makefile
-+++ b/libdummy/Makefile
-@@ -0,0 +1,10 @@
-+
-+libdummy-%.so: dummy-%.c
-+	$(CC) $< -shared -nostdlib -Wl,-soname=$*.so -o $@
-+
-+all: $(patsubst %,libdummy-mod_%.so,cache dav proxy session watchdog)
-+
-+install:
-+
-+clean:
-+	$(RM) *.so
--- a/libdummy/dummy-mod_cache.c
-+++ b/libdummy/dummy-mod_cache.c
-@@ -0,0 +1,3 @@
-+void ap_cache_cacheable_headers_in(void){}
-+void ap_cache_cacheable_headers_out(void){}
-+void ap_cache_generate_name(void){}
--- a/libdummy/dummy-mod_dav.c
-+++ b/libdummy/dummy-mod_dav.c
-@@ -0,0 +1,18 @@
-+void dav_add_response(void){}
-+void dav_buffer_append(void){}
-+void dav_buffer_init(void){}
-+void dav_buffer_place(void){}
-+void dav_buffer_place_mem(void){}
-+void dav_check_bufsize(void){}
-+void dav_do_find_liveprop(void){}
-+void dav_get_liveprop_info(void){}
-+void dav_hook_find_liveprop(void){}
-+void dav_hook_gather_propsets(void){}
-+void dav_hook_insert_all_liveprops(void){}
-+void dav_lock_query(void){}
-+void dav_new_error(void){}
-+void dav_push_error(void){}
-+void dav_register_liveprop_group(void){}
-+void dav_register_provider(void){}
-+void dav_set_bufsize(void){}
-+void dav_xmlns_add(void){}
--- a/libdummy/dummy-mod_proxy.c
-+++ b/libdummy/dummy-mod_proxy.c
-@@ -0,0 +1,58 @@
-+void ap_proxy_acquire_connection(void){}
-+void ap_proxy_backend_broke(void){}
-+void ap_proxy_buckets_lifetime_transform(void){}
-+void ap_proxy_canon_netloc(void){}
-+void ap_proxy_canonenc(void){}
-+void ap_proxy_check_connection(void){}
-+void ap_proxy_checkproxyblock2(void){}
-+void ap_proxy_conn_is_https(void){}
-+void ap_proxy_connect_backend(void){}
-+void ap_proxy_connect_to_backend(void){}
-+void ap_proxy_connect_uds(void){}
-+void ap_proxy_connection_create(void){}
-+void ap_proxy_connection_create_ex(void){}
-+void ap_proxy_connection_reusable(void){}
-+void ap_proxy_cookie_reverse_map(void){}
-+void ap_proxy_create_hdrbrgd(void){}
-+void ap_proxy_define_worker(void){}
-+void ap_proxy_determine_connection(void){}
-+void ap_proxy_find_balancershm(void){}
-+void ap_proxy_find_workershm(void){}
-+void ap_proxy_get_balancer(void){}
-+void ap_proxy_get_worker(void){}
-+void ap_proxy_hashfunc(void){}
-+void ap_proxy_hex2c(void){}
-+void ap_proxy_initialize_balancer(void){}
-+void ap_proxy_initialize_worker(void){}
-+void ap_proxy_location_reverse_map(void){}
-+void ap_proxy_parse_wstatus(void){}
-+void ap_proxy_pass_brigade(void){}
-+void ap_proxy_port_of_scheme(void){}
-+void ap_proxy_pre_http_request(void){}
-+void ap_proxy_prefetch_input(void){}
-+void ap_proxy_read_input(void){}
-+void ap_proxy_release_connection(void){}
-+void ap_proxy_set_wstatus(void){}
-+void ap_proxy_share_balancer(void){}
-+void ap_proxy_share_worker(void){}
-+void ap_proxy_should_override(void){}
-+void ap_proxy_show_hcmethod(void){}
-+void ap_proxy_spool_input(void){}
-+void ap_proxy_ssl_engine(void){}
-+void ap_proxy_ssl_val(void){}
-+void ap_proxy_strncpy(void){}
-+void ap_proxy_sync_balancer(void){}
-+void ap_proxy_transfer_between_connections(void){}
-+void ap_proxy_tunnel_create(void){}
-+void ap_proxy_tunnel_run(void){}
-+void ap_proxy_worker_can_upgrade(void){}
-+void ap_proxy_worker_name(void){}
-+void ap_proxyerror(void){}
-+void proxy_hcmethods(void){}
-+void proxy_hook_canon_handler(void){}
-+void proxy_hook_check_trans(void){}
-+void proxy_hook_post_request(void){}
-+void proxy_hook_pre_request(void){}
-+void proxy_hook_scheme_handler(void){}
-+void proxy_module(void){}
-+void proxy_run_create_req(void){}
--- a/libdummy/dummy-mod_session.c
-+++ b/libdummy/dummy-mod_session.c
-@@ -0,0 +1,2 @@
-+void ap_hook_session_load(void){}
-+void ap_hook_session_save(void){}
--- a/libdummy/dummy-mod_watchdog.c
-+++ b/libdummy/dummy-mod_watchdog.c
-@@ -0,0 +1,4 @@
-+void ap_hook_watchdog_exit(void){}
-+void ap_hook_watchdog_init(void){}
-+void ap_hook_watchdog_need(void){}
-+void ap_hook_watchdog_step(void){}
@@ -1,23 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/EFForg/apkeep
-TERMUX_PKG_DESCRIPTION="A command-line tool for downloading APK files from various sources"
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.8.0
-TERMUX_PKG_SRCURL=https://github.com/EFForg/apkeep/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=2b3ca13fc23f5e08ef52de76d02b3f6e0a9d39a02496b5a895c618c99264ddbe
-TERMUX_PKG_DEPENDS="openssl"
-TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_pre_configure() {
-	export OPENSSL_INCLUDE_DIR=$TERMUX_PREFIX/include/openssl
-	export OPENSSL_LIB_DIR=$TERMUX_PREFIX/lib
-}
-
-termux_step_make() {
-	termux_setup_rust
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
-}
-
-termux_step_make_install() {
-	install -Dm755 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/apkeep
-}
@@ -18,10 +18,10 @@ termux_step_pre_configure() {

 termux_step_make_install() {
 	install -Dm600 $ANDROID_HOME/build-tools/${TERMUX_PKG_VERSION}/lib/apksigner.jar \
-		$TERMUX_PREFIX/share/java/apksigner.jar
-	cat <<- EOF > $TERMUX_PREFIX/bin/apksigner
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/java/apksigner.jar
+	cat <<- EOF > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/apksigner
 	#!${TERMUX_PREFIX}/bin/sh
 	exec java -jar $TERMUX_PREFIX/share/java/apksigner.jar "\$@"
 	EOF
-	chmod 700 $TERMUX_PREFIX/bin/apksigner
+	chmod 700 $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/apksigner
 }
@@ -1,30 +0,0 @@
--- a/aapt-wrapper/aapt-wrapper.c
-+++ b/aapt-wrapper/aapt-wrapper.c
-@@ -0,0 +1,12 @@
-+
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+int
-+main(int argc, char **argv, char **envp)
-+{
-+  execve("@TERMUX_PREFIX@/bin/aapt", argv, envp);
-+  perror("aapt-wrapper: execve");
-+  return -1;
-+}
--- a/aapt-wrapper/aapt2-wrapper.c
-+++ b/aapt-wrapper/aapt2-wrapper.c
-@@ -0,0 +1,12 @@
-+
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+
-+int
-+main(int argc, char **argv, char **envp)
-+{
-+  execve("@TERMUX_PREFIX@/bin/aapt2", argv, envp);
-+  perror("aapt2-wrapper: execve");
-+  return -1;
-+}
@@ -1,36 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://ibotpeaches.github.io/Apktool/
-TERMUX_PKG_DESCRIPTION="A tool for reverse engineering 3rd party, closed, binary Android apps"
-TERMUX_PKG_LICENSE="Apache-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.6.0
-TERMUX_PKG_SRCURL=https://github.com/iBotPeaches/Apktool/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=74739cdb1434ca35ec34e51ca7272ad3f378ae3ed0a2d5805d9a2fab5016037f
-TERMUX_PKG_DEPENDS="aapt, openjdk-17"
-TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_pre_configure() {
-	local prebuilt_dir="brut.apktool/apktool-lib/src/main/resources/prebuilt"
-	rm -rf $prebuilt_dir/{linux,macosx,windows}
-	mkdir -p $prebuilt_dir/linux
-	for exe_name in aapt aapt2; do
-		local exe_path=$prebuilt_dir/linux/${exe_name}
-		$CC $CFLAGS $CPPFLAGS aapt-wrapper/${exe_name}-wrapper.c \
-			-o ${exe_path} $LDFLAGS
-		$STRIP --strip-unneeded ${exe_path}
-		cp -a ${exe_path} ${exe_path}_64
-	done
-}
-
-termux_step_make() {
-	sh gradlew build shadowJar -x test
-}
-
-termux_step_make_install() {
-	install -Dm600 brut.apktool/apktool-cli/build/libs/apktool-cli-all.jar \
-		$TERMUX_PREFIX/share/java/apktool.jar
-	cat <<- EOF > $TERMUX_PREFIX/bin/apktool
-	#!${TERMUX_PREFIX}/bin/sh
-	exec java -jar $TERMUX_PREFIX/share/java/apktool.jar "\$@"
-	EOF
-	chmod 700 $TERMUX_PREFIX/bin/apktool
-}
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.6.1
 TERMUX_PKG_REVISION=5
-TERMUX_PKG_SRCURL=https://downloads.apache.org/apr/apr-util-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=https://ftp.acc.umu.se/mirror/apache.org/apr/apr-util-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459
 TERMUX_PKG_DEPENDS="apr, libcrypt, libexpat, libiconv, libuuid"
 TERMUX_PKG_BREAKS="apr-util-dev"
@@ -2,16 +2,17 @@ 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_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.3.13
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=2.3.11
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=e519e55f1015d656425e68f8c7c7bebd1908df3ac87836eb6e7b6b58ce3f965d
+TERMUX_PKG_SHA256=cc0c5b24240176e333b11bce1a7ac528ae263317d137ceeebad3ec2d8682cb91
 # apt-key requires utilities from coreutils, findutils, gpgv, grep, sed.
 TERMUX_PKG_DEPENDS="coreutils, dpkg, findutils, gpgv, grep, libandroid-glob, libbz2, libc++, libcurl, libgnutls, liblz4, liblzma, sed, termux-licenses, xxhash, zlib"
 TERMUX_PKG_BUILD_DEPENDS="docbook-xsl"
 TERMUX_PKG_CONFLICTS="apt-transport-https, libapt-pkg"
-TERMUX_PKG_REPLACES="apt-transport-https, libapt-pkg, unstable-repo, game-repo, science-repo"
-TERMUX_PKG_PROVIDES="unstable-repo, game-repo, science-repo"
+TERMUX_PKG_REPLACES="apt-transport-https, libapt-pkg, unstable-repo"
+TERMUX_PKG_PROVIDES="unstable-repo"
+TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
 TERMUX_PKG_SUGGESTS="gnupg, x11-repo"
 TERMUX_PKG_ESSENTIAL=true

@@ -18,15 +18,17 @@ termux_step_make() {

 	go mod init
 	go mod vendor
-	make install VERSION=$TERMUX_PKG_VERSION
 }

 termux_step_make_install() {
+	cd "$GOPATH"/src/github.com/aptly-dev/aptly
+	make install VERSION=$TERMUX_PKG_VERSION
+
 	install -Dm700 \
 		"$GOPATH"/bin/${GOOS}_${GOARCH}/aptly \
-		"$TERMUX_PREFIX"/bin/aptly
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/aptly

 	install -Dm600 \
 		"$TERMUX_PKG_SRCDIR"/man/aptly.1 \
-		"$TERMUX_PREFIX"/share/man/man1/aptly.1
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/share/man/man1/aptly.1
 }
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A password-hashing function (reference C implementation)
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=20190702
-TERMUX_PKG_SRCURL=https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=https://github.com/P-H-C/phc-winner-argon2/archive/${TERMUX_PKG_VERSION}/argon2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c
 TERMUX_PKG_EXTRA_MAKE_ARGS="LIBRARY_REL=lib"
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -9,6 +9,6 @@ TERMUX_PKG_SHA256=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8
 TERMUX_PKG_NO_STATICSPLIT=true

 termux_step_post_make_install() {
-	cp libargp.a $TERMUX_PREFIX/lib
-	cp $TERMUX_PKG_SRCDIR/argp.h $TERMUX_PREFIX/include
+	install -Dm600 libargp.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	install -Dm600 $TERMUX_PKG_SRCDIR/argp.h $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include
 }
@@ -22,10 +22,10 @@ termux_step_make_install() {

 	local LANGS="de_DE de_AT de_CH"
 	for l in ${LANGS}; do
-		install -Dm644 -t "${TERMUX_PREFIX}/lib/aspell-0.60/" \
+		install -Dm644 -t "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib/aspell-0.60/" \
 			${l}.alias ${l}.dat ${l}_affix.dat ${l}.multi ${l}.rws
 	done
-	echo "add de_DE.multi" > "${TERMUX_PREFIX}/lib/aspell-0.60/deutsch.alias"
-	echo "add de_DE.multi" > "${TERMUX_PREFIX}/lib/aspell-0.60/german.alias"
-	echo "add de_CH.multi" > "${TERMUX_PREFIX}/lib/aspell-0.60/swiss.alias"
+	echo "add de_DE.multi" > "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib/aspell-0.60/deutsch.alias"
+	echo "add de_DE.multi" > "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib/aspell-0.60/german.alias"
+	echo "add de_CH.multi" > "${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib/aspell-0.60/swiss.alias"
 }
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=http://assimp.sourceforge.net/index.html
 TERMUX_PKG_DESCRIPTION="Library to import various well-known 3D model formats in an uniform manner"
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=5.1.4
+TERMUX_PKG_VERSION=5.0.1
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/assimp/assimp/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6
+TERMUX_PKG_SHA256=11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, zlib"
 TERMUX_PKG_BREAKS="assimp-dev"
@@ -0,0 +1,12 @@
+diff -uNr assimp-4.1.0/test/CMakeLists.txt assimp-4.1.0.mod/test/CMakeLists.txt
+--- assimp-4.1.0/test/CMakeLists.txt	2017-12-11 15:22:45.000000000 +0200
+++ assimp-4.1.0.mod/test/CMakeLists.txt	2019-07-01 22:47:01.990765003 +0300
+@@ -174,7 +174,7 @@
+ IF( WIN32 )
+     SET( platform_libs )
+ ELSE( WIN32 )
+-    SET( platform_libs pthread )
+    SET( platform_libs )
+ ENDIF( WIN32 )
+ 
+ IF( WIN32 )
@@ -22,6 +22,9 @@ ac_cv_path_SENDMAIL=$TERMUX_PREFIX/bin/sendmail
 --with-atspool=$TERMUX_PREFIX/var/spool/atd
 "

+# at uses IROOT instead of DESTDIR
+TERMUX_PKG_EXTRA_MAKE_ARGS="IROOT=$TERMUX_PKG_MASSAGEDIR"
+
 # at.allow and at.deny are not supported in Termux.
 TERMUX_PKG_RM_AFTER_INSTALL="
 share/man/man5
@@ -10,5 +10,6 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, zlib"

 termux_step_make_install() {
-	install -Dm700 -t $TERMUX_PREFIX/bin AtomicParsley
+	install -Dm700 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin \
+		AtomicParsley
 }
@@ -23,7 +23,7 @@ termux_step_post_configure() {

 termux_step_make_install() {
 	install -Dm700 "$TERMUX_PKG_BUILDDIR"/src/AtomVM \
-		"$TERMUX_PREFIX"/bin/AtomVM
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/AtomVM
 	install -Dm700 "$TERMUX_PKG_BUILDDIR"/tools/packbeam/PackBEAM \
-		"$TERMUX_PREFIX"/bin/PackBEAM
+		"$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin/PackBEAM
 }
@@ -0,0 +1,46 @@
+--- ../Makefile.in.orig	2021-11-14 20:25:55.230428690 +0000
+++ ./Makefile.in	2021-11-14 20:29:12.119978214 +0000
+@@ -137,23 +137,23 @@
+ 	cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
+ 
+ installdirs:
+-	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
+	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(acdatadir)
+ 
+ install: all $(M4FILES) acconfig.h installdirs install-info
+ 	for p in $(ASCRIPTS); do \
+-	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+	  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ 	done
+ 	for i in $(M4FROZEN); do \
+-	  $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
+	  $(INSTALL_DATA) $$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done
+ 	for i in $(M4FILES) acconfig.h; do \
+-	  $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done
+ 	-if test -f autoscan; then \
+-	$(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
+	$(INSTALL_PROGRAM) autoscan $(DESTDIR)$(bindir)/`echo autoscan|sed '$(transform)'`; \
+ 	for i in acfunctions acheaders acidentifiers acprograms \
+ 	  acmakevars; do \
+-	$(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
+	$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(acdatadir)/$$i; \
+ 	done; \
+ 	else :; fi
+ 
+@@ -161,11 +161,11 @@
+ install-info: info installdirs
+ 	if test -f autoconf.info; then \
+ 	  for i in *.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+ 	  done; \
+ 	else \
+ 	  for i in $(srcdir)/*.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ 	  done; \
+ 	fi
+ 
@@ -1,55 +0,0 @@
--- a/avahi-autoipd/main.c
-+++ b/avahi-autoipd/main.c
-@@ -934,6 +934,7 @@
- 
-     /* Get user/group ID */
- 
-+#ifndef __ANDROID__
-     if (!no_drop_root) {
- 
-         if (!(pw = getpwnam(AVAHI_AUTOIPD_USER))) {
-@@ -948,6 +949,7 @@
- 
-         daemon_log(LOG_INFO, "Found user '"AVAHI_AUTOIPD_USER"' (UID %lu) and group '"AVAHI_AUTOIPD_GROUP"' (GID %lu).", (unsigned long) pw->pw_uid, (unsigned long) gr->gr_gid);
-     }
-+#endif
- 
-     /* Create directory */
-     u = umask(0000);
-@@ -964,14 +966,20 @@
-     if (!no_drop_root) {
-         struct stat st;
- 
-+#ifndef __ANDROID__
-         chown(AVAHI_IPDATA_DIR, pw->pw_uid, gr->gr_gid);
-+#endif
- 
-         if (stat(AVAHI_IPDATA_DIR, &st) < 0) {
-             daemon_log(LOG_ERR, "stat(): %s\n", strerror(errno));
-             return -1;
-         }
- 
-+#ifndef __ANDROID__
-         if (!S_ISDIR(st.st_mode) || st.st_uid != pw->pw_uid || st.st_gid != gr->gr_gid) {
-+#else
-+        if (!S_ISDIR(st.st_mode)) {
-+#endif
-             daemon_log(LOG_ERR, "Failed to create runtime directory "AVAHI_IPDATA_DIR".");
-             return -1;
-         }
-@@ -995,6 +1003,7 @@
- 
- #endif
- 
-+#ifndef __ANDROID__
-     if (!no_drop_root) {
- 
-         if (initgroups(AVAHI_AUTOIPD_USER, gr->gr_gid) != 0) {
-@@ -1040,6 +1049,7 @@
- 
-         daemon_log(LOG_INFO, "Successfully dropped root privileges.");
-     }
-+#endif /* __ANDROID__ */
- 
-     return 0;
- }
@@ -1,105 +0,0 @@
--- a/avahi-daemon/main.c
-+++ b/avahi-daemon/main.c
-@@ -135,7 +135,7 @@
- #endif
- } DaemonConfig;
- 
-#define RESOLV_CONF "/etc/resolv.conf"
-+#define RESOLV_CONF "@TERMUX_PREFIX@/etc/resolv.conf"
- #define BROWSE_DOMAINS_MAX 16
- 
- static AvahiSEntryGroup *dns_servers_entry_group = NULL;
-@@ -587,9 +587,9 @@
-     int fd;
-     char buf[32];
- 
-    fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+    fd = open("@TERMUX_PREFIX@/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-     if (fd == -1 && errno == ENOENT)
-        fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+        fd = open("@TERMUX_PREFIX@/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-     if (fd == -1)
-         return NULL;
- 
-@@ -1338,6 +1338,7 @@
- 
- #define set_env(key, value) putenv(avahi_strdup_printf("%s=%s", (key), (value)))
- 
-+#ifndef __ANDROID__
- static int drop_root(void) {
-     struct passwd *pw;
-     struct group * gr;
-@@ -1400,6 +1401,7 @@
- 
-     return 0;
- }
-+#endif /* __ANDROID__ */
- 
- static const char* pid_file_proc(void) {
-     return AVAHI_DAEMON_RUNTIME_DIR"/pid";
-@@ -1413,6 +1415,7 @@
-     struct group * gr;
-     struct stat st;
- 
-+#ifndef __ANDROID__
-     if (!(pw = getpwnam(AVAHI_USER))) {
-         avahi_log_error( "Failed to find user '"AVAHI_USER"'.");
-         goto fail;
-@@ -1422,6 +1425,7 @@
-         avahi_log_error( "Failed to find group '"AVAHI_GROUP"'.");
-         goto fail;
-     }
-+#endif
- 
-     u = umask(0000);
-     reset_umask = 1;
-@@ -1431,14 +1435,20 @@
-         goto fail;
-     }
- 
-+#ifndef __ANDROID__
-     chown(AVAHI_DAEMON_RUNTIME_DIR, pw->pw_uid, gr->gr_gid);
-+#endif
- 
-     if (stat(AVAHI_DAEMON_RUNTIME_DIR, &st) < 0) {
-         avahi_log_error("stat(): %s\n", strerror(errno));
-         goto fail;
-     }
- 
-+#ifndef __ANDROID__
-     if (!S_ISDIR(st.st_mode) || st.st_uid != pw->pw_uid || st.st_gid != gr->gr_gid) {
-+#else
-+    if (!S_ISDIR(st.st_mode)) {
-+#endif
-         avahi_log_error("Failed to create runtime directory "AVAHI_DAEMON_RUNTIME_DIR".");
-         goto fail;
-     }
-@@ -1594,10 +1604,12 @@
-     else if (config.command == DAEMON_RUN) {
-         pid_t pid;
- 
-+#ifndef __ANDROID__
-         if (getuid() != 0 && config.drop_root) {
-             avahi_log_error("This program is intended to be run as root.");
-             goto finish;
-         }
-+#endif
- 
-         if ((pid = daemon_pid_file_is_running()) >= 0) {
-             avahi_log_error("Daemon already running on PID %u", pid);
-@@ -1641,6 +1653,7 @@
-         if (make_runtime_dir() < 0)
-             goto finish;
- 
-+#ifndef __ANDROID__
-         if (config.drop_root) {
- #ifdef ENABLE_CHROOT
-             if (config.use_chroot)
-@@ -1657,6 +1670,7 @@
-                     goto finish;
- #endif
-         }
-+#endif /* __ANDROID__ */
- 
-         if (daemon_pid_file_create() < 0) {
-             avahi_log_error("Failed to create PID file: %s", strerror(errno));
@@ -1,23 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://www.avahi.org/
-TERMUX_PKG_DESCRIPTION="A system for service discovery on a local network via mDNS/DNS-SD"
-TERMUX_PKG_LICENSE="LGPL-2.1"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.8
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://github.com/lathiat/avahi/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f
-TERMUX_PKG_DEPENDS="glib, libandroid-glob, libcap, libdaemon, libevent, libexpat"
-
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-dbus
--disable-gdbm
--disable-gtk3
--disable-pygobject
--disable-qt5
--with-distro=none
-ac_cv_func_chroot=no
-"
-termux_step_pre_configure() {
-	autoreconf -fi
-	LDFLAGS+=" -landroid-glob"
-}
@@ -1,11 +0,0 @@
--- a/configure.ac
-+++ b/configure.ac
-@@ -1004,7 +1004,7 @@
- #
- # Avahi runtime dir
- #
-avahi_runtime_dir="/run"
-+avahi_runtime_dir="@TERMUX_PREFIX@/var/run"
- avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
- AC_SUBST(avahi_runtime_dir)
- AC_SUBST(avahi_socket)
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/axel-download-accelerator/axel
 TERMUX_PKG_DESCRIPTION="light command line download accelerator"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.17.11
+TERMUX_PKG_VERSION=2.17.10
 TERMUX_PKG_SRCURL=https://github.com/axel-download-accelerator/axel/releases/download/v${TERMUX_PKG_VERSION}/axel-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f12682f981c83f374b82b0668f25f694a2042b617b236ee6fb057e5473c54e31
+TERMUX_PKG_SHA256=75af1d30a005939205fcf6239ba93d64227d2a3e617fd5bb4777b7db54eadb4e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl"
@@ -16,5 +16,6 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm755 -t $TERMUX_PREFIX/bin $TERMUX_PKG_SRCDIR/b3sum/target/${CARGO_TARGET_NAME}/release/b3sum
+	install -Dm755 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin \
+		$TERMUX_PKG_SRCDIR/b3sum/target/${CARGO_TARGET_NAME}/release/b3sum
 }
@@ -3,12 +3,9 @@ TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.11
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="bash"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
-TERMUX_PKG_RM_AFTER_INSTALL="
-share/bash-completion/completions/makepkg
-"
@@ -3,9 +3,8 @@ TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAIN_VERSION=5.1
-_PATCH_VERSION=12
+_PATCH_VERSION=8
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
-TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses, readline (>= 8.0), termux-tools"
@@ -46,10 +45,6 @@ termux_step_pre_configure() {
 	PATCH_CHECKSUMS[006]=75e17d937de862615c6375def40a7574462210dce88cf741f660e2cc29473d14
 	PATCH_CHECKSUMS[007]=acfcb8c7e9f73457c0fb12324afb613785e0c9cef3315c9bbab4be702f40393a
 	PATCH_CHECKSUMS[008]=f22cf3c51a28f084a25aef28950e8777489072628f972b12643b4534a17ed2d1
-	PATCH_CHECKSUMS[009]=e45cda953ab4b4b4bde6dc34d0d8ca40d1cc502046eb28070c9ebcd47e33c3ee
-	PATCH_CHECKSUMS[010]=a2c8d7b2704eeceff7b1503b7ad9500ea1cb6e9393faebdb3acd2afdd7aeae2a
-	PATCH_CHECKSUMS[011]=58191f164934200746f48459a05bca34d1aec1180b08ca2deeee3bb29622027b
-	PATCH_CHECKSUMS[012]=10f189c8367c4a15c7392e7bf70d0ff6953f78c9b312ed7622303a779273ab98

 	for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do
 		PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${PATCH_NUM}.patch
@@ -1,20 +0,0 @@
--- ../cache/bastet-0.43.2/BastetBlockChooser.hpp	2015-08-30 07:04:24.000000000 +0000
-+++ ./BastetBlockChooser.hpp	2017-09-25 03:10:40.601198625 +0000
-@@ -23,7 +23,7 @@
- 
- #include "Well.hpp"
- 
-#include <boost/tr1/tr1/unordered_set>
-+#include <boost/unordered/unordered_set.hpp>
- #include <set>
- #include <boost/functional/hash.hpp>
- 
-@@ -75,7 +75,7 @@
-   public:
-     Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor);
-   private:
-    std::tr1::unordered_set<Vertex> _visited;
-+    boost::unordered::unordered_set<Vertex> _visited;
-     //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts
-     BlockType _block;
-     const Well *_well;
@@ -1,11 +0,0 @@
--- ../cache/bastet-0.43.2/Config.cpp	2015-08-30 07:04:24.000000000 +0000
-+++ ./Config.cpp	2017-09-19 08:56:50.122235753 +0000
-@@ -38,7 +38,7 @@
-   const size_t HowManyHighScores=10;
-   const std::string RcFileName="/.bastetrc";
-   const std::string LocalHighScoresFileName="/.bastetscores";
-  const std::string GlobalHighScoresFileName="/var/games/bastet.scores2";
-+  const std::string GlobalHighScoresFileName="/data/data/com.termux/files/usr/var/games/bastet.scores2";
- 
-   bool HighScores::Qualifies(int score){
-     stable_sort(begin(),end());
@@ -1,13 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://fph.altervista.org/prog/bastet.html
-TERMUX_PKG_DESCRIPTION="Tetris clone with 'bastard' block-choosing AI"
-TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=0.43.2
-TERMUX_PKG_REVISION=8
-TERMUX_PKG_SRCURL=https://github.com/fph/bastet/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=f219510afc1d83e4651fbffd5921b1e0b926d5311da4f8fa7df103dc7f2c403f
-TERMUX_PKG_DEPENDS="libc++, ncurses"
-TERMUX_PKG_BUILD_DEPENDS="boost-static"
-TERMUX_PKG_EXTRA_MAKE_ARGS=" BOOST_PO=$TERMUX_PREFIX/lib/libboost_program_options.a"
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_GROUPS="games"
@@ -1,24 +0,0 @@
--- ../cache/bastet-0.43.2/Makefile	2015-08-30 07:04:24.000000000 +0000
-+++ ./Makefile	2017-09-19 09:09:21.992227135 +0000
-@@ -17,11 +17,19 @@
- depend: *.hpp $(SOURCES) $(MAIN) $(TESTS)
- 	$(CXX) -MM $(SOURCES) $(MAIN) $(TESTS)> depend
- 
-include depend
-+#include depend
- 
- $(PROGNAME): $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o)
- 	$(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) 
-
-+install: 
-+	cp bastet $(PREFIX)/bin
-+	chmod +x $(PREFIX)/bin/bastet
-+	mkdir -p $(PREFIX)/var/games
-+	touch $(PREFIX)/var/games/bastet.scores2
-+	chmod +w $(PREFIX)/var/games/bastet.scores2
-+	mkdir -p $(PREFIX)/share/man/man6/
-+	cp bastet.6 $(PREFIX)/share/man/man6/ 
-+	
- clean:
- 	rm -f $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(MAIN:.cpp=.o) $(PROGNAME)
- 
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/WebAssembly/binaryen
 TERMUX_PKG_DESCRIPTION="Binaryen is a compiler and toolchain infrastructure library for WebAssembly"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=104
+TERMUX_PKG_VERSION=102
 TERMUX_PKG_SRCURL=https://github.com/WebAssembly/binaryen/archive/version_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=a6acabb159fcc5b1d8c9506f5036dcd1e4446952b572903b256af955e959780d
+TERMUX_PKG_SHA256=6197a8d7220d1510bb0694a2984bfae4f8b38abd6bdf4c724551c831786992f6
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+"
@@ -37,10 +37,10 @@ termux_step_pre_configure() {
 }

 termux_step_post_make_install() {
-	cp $TERMUX_PKG_BUILDER_DIR/ldd $TERMUX_PREFIX/bin/ldd
-	cd $TERMUX_PREFIX/bin
+	cp $TERMUX_PKG_BUILDER_DIR/ldd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/ldd
 	# Setup symlinks as these are used when building, so used by
 	# system setup in e.g. python, perl and libtool:
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin
 	for b in ar ld nm objdump ranlib readelf strip; do
 		ln -s -f $b $TERMUX_HOST_PLATFORM-$b
 	done
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="General-purpose parser generator"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.8.2
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
 TERMUX_PKG_DEPENDS="m4"
@@ -1,22 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/aeosynth/bk
-TERMUX_PKG_DESCRIPTION="A terminal EPUB reader"
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.5.3
-# Whenever the next release happens, we can change to git release tarball.
-_COMMIT=61beded518e759884d72732a068744935c11ea6f
-TERMUX_PKG_SRCURL=https://github.com/aeosynth/bk/archive/$_COMMIT.zip
-TERMUX_PKG_SHA256=c8d738eaf56684fcaeda9c46549e0f024801805d82cf31542a35c007faf07085
-TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_pre_configure() {
-	termux_setup_rust
-}
-
-termux_step_make() {
-	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
-}
-
-termux_step_make_install() {
-	install -Dm700 -t $TERMUX_PREFIX/bin target/${CARGO_TARGET_NAME}/release/bk
-}
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="curses based manager for Boinc client"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.5.1
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL="https://sourceforge.net/projects/boinctui/files/boinctui_${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=319f539535f3af342ec0bafc5228673bf12f2d7a7addf5851f2c003200e51da9
 TERMUX_PKG_DEPENDS="glib, libandroid-support, libexpat, ncurses, ncurses-ui-libs, openssl"
@@ -1,31 +0,0 @@
--- a/boost/math/tools/header_deprecated.hpp
-+++ b/boost/math/tools/header_deprecated.hpp
-@@ -6,12 +6,22 @@
- #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
- #define BOOST_MATH_TOOLS_HEADER_DEPRECATED
- 
-#ifdef _MSC_VER
-// Expands to "This header is deprecated; use expr instead."
-#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
-#else // GNU, Clang, Intel, IBM, etc.
-+#ifndef BOOST_MATH_STANDALONE
-+
-+#   include <boost/config/header_deprecated.hpp>
-+#   define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
-+
-+#else
-+
-+#   ifdef _MSC_VER
- // Expands to "This header is deprecated; use expr instead."
-#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
-#endif
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
-+#   else // GNU, Clang, Intel, IBM, etc.
-+// Expands to "This header is deprecated use expr instead"
-+#       define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
-+#       define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
-+#   endif
-+
-+#endif // BOOST_MATH_STANDALONE
- 
- #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.77.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
 TERMUX_PKG_SHA256=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
@@ -1,21 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://sites.google.com/site/broguegame/
-TERMUX_PKG_DESCRIPTION="Roguelike dungeon crawling game"
-TERMUX_PKG_LICENSE="AGPL-V3"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.7.5
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://github.com/termux/distfiles/releases/download/2021.01.04/brogue-${TERMUX_PKG_VERSION}-linux-amd64.tbz2
-TERMUX_PKG_SHA256=a74ff18139564c597d047cfb167f74ab1963dd8608b6fb2e034e7635d6170444
-TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_EXTRA_MAKE_ARGS="curses"
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_GROUPS="games"
-
-termux_step_pre_configure () {
-        CFLAGS+=" -fcommon"
-	CC="$CC $CFLAGS $CPPFLAGS $LDFLAGS"
-}
-
-termux_step_make_install () {
-	install -m700 bin/brogue $TERMUX_PREFIX/bin
-}
@@ -1,28 +0,0 @@
-In Android the <sys/timeb.h> header and associated ftime(3) has been
-removed in android-21 since it is deprecated and removed from POSIX.
-
-diff -u -r ../brogue-1.7.4/src/platform/curses-platform.c ./src/platform/curses-platform.c
--- ../brogue-1.7.4/src/platform/curses-platform.c	2014-07-03 15:19:10.000000000 -0400
-+++ ./src/platform/curses-platform.c	2014-12-20 03:47:20.303572495 -0500
-@@ -3,7 +3,7 @@
- #include <string.h>
- #include <time.h>
- #include "term.h"
-#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <stdint.h>
- #include <signal.h>
- #include "platform.h"
-@@ -109,9 +109,9 @@
- #define PAUSE_BETWEEN_EVENT_POLLING		34//17
-
- static uint32_t getTime() {
-	struct timeb time;
-	ftime(&time);
-	return 1000 * time.time + time.millitm;
-+	struct timeval tv;
-+	gettimeofday(&tv, NULL);
-+	return 1000 * tv.tv_sec + tv.tv_usec / 1000;
- }
-
- static boolean curses_pauseForMilliseconds(short milliseconds) {
@@ -1,12 +0,0 @@
--- ../brogue-linux-1.7.3/brogue-1.7.3/Makefile	2013-09-11 07:38:48.000000000 +0200
-+++ ./Makefile	2014-01-28 07:57:06.000000000 +0100
-@@ -81,7 +81,7 @@
- .PHONY : clean both curses tcod tar
- 
- bin/brogue : ${DEPENDENCIES} ${BROGUEFILES}
-	$(CC) -O2 -march=i586 -o bin/brogue ${BROGUEFILES} ${LIBRARIES} -Wl,-rpath,.
-+	$(CC) -o bin/brogue ${BROGUEFILES} ${LIBRARIES} -Wl,-rpath,.
- 
- clean : 
- 	rm -f src/brogue/*.o src/platform/*.o bin/brogue
-
@@ -1,11 +0,0 @@
-diff -u -r ../brogue-1.7.4/src/platform/platformdependent.c ./src/platform/platformdependent.c
--- ../brogue-1.7.4/src/platform/platformdependent.c	2014-07-03 19:19:10.000000000 +0000
-+++ ./src/platform/platformdependent.c	2017-07-07 07:09:10.116242335 +0000
-@@ -21,6 +21,7 @@
-  *  along with Brogue.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <string.h>
- #include <time.h>
@@ -14,7 +14,6 @@ termux_step_make() {

 	export GOPATH=$TERMUX_PKG_BUILDDIR
 	mkdir -p "$GOPATH"/src/github.com/txthinking
-	mkdir -p "$TERMUX_PREFIX"/share/doc/brook
 	cp -a "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/txthinking/brook
 	cd "$GOPATH"/src/github.com/txthinking/brook/cli/brook
 	go get -d -v
@@ -22,6 +21,7 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm700 -t "$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/txthinking/brook/cli/brook/brook
-	cp -r "$TERMUX_PKG_SRCDIR"/docs/* "$TERMUX_PREFIX"/share/doc/brook
+        mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/share/doc/brook
+	install -Dm700 -t "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/bin "$GOPATH"/src/github.com/txthinking/brook/cli/brook/brook
+	cp -r "$TERMUX_PKG_SRCDIR"/docs/* "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/share/doc/brook/
 }
@@ -12,7 +12,7 @@ TERMUX_PKG_REPLACES="brotli-dev"
 TERMUX_PKG_FORCE_CMAKE=true

 termux_step_post_make_install() {
-	mkdir -p $TERMUX_PREFIX/share/man/man{1,3}
-	cp $TERMUX_PKG_SRCDIR/docs/brotli.1 $TERMUX_PREFIX/share/man/man1/
-	cp $TERMUX_PKG_SRCDIR/docs/*.3 $TERMUX_PREFIX/share/man/man3/
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/man/man{1,3}
+	install -Dm600 $TERMUX_PKG_SRCDIR/docs/brotli.1 $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/man/man1/
+	install -Dm600 $TERMUX_PKG_SRCDIR/docs/*.3 $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/man/man3/
 }
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.bittorrent.com/btfs/
 TERMUX_PKG_DESCRIPTION="Decentralized file system integrating with TRON network"
 TERMUX_PKG_LICENSE="Apache-2.0, MIT"
 TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=1.6.0
+TERMUX_PKG_VERSION=1.5.3
 TERMUX_PKG_SRCURL=https://github.com/TRON-US/go-btfs/archive/refs/tags/btfs-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=27de546a83f2c7655a0dbe2bc12e6a8ca7c05ab52f1246263667396fd374f83e
+TERMUX_PKG_SHA256=331cc8a2b3cf2f5813902685f562ab78f602b028c45507ab9d67d35664719942
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+\.\d+\.\d+"
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -17,5 +17,5 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm700 -t $TERMUX_PREFIX/bin $TERMUX_PKG_SRCDIR/cmd/btfs/btfs
+	install -Dm700 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin cmd/btfs/btfs
 }
@@ -14,14 +14,6 @@ TERMUX_PKG_SERVICE_SCRIPT=(
 	"busybox-httpd" "exec busybox httpd -f -p 0.0.0.0:8080 -h $TERMUX_PREFIX/srv/www/ 2>&1"
 )

-termux_step_pre_configure() {
-	# Certain packages are not safe to build on device because their
-	# build.sh script deletes specific files in $TERMUX_PREFIX.
-	if $TERMUX_ON_DEVICE_BUILD; then
-		termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
-	fi
-}
-
 termux_step_configure() {
 	# Prevent spamming logs with useless warnings to make them more readable.
 	CFLAGS+=" -Wno-ignored-optimization-argument -Wno-unused-command-line-argument"
@@ -40,9 +32,11 @@ termux_step_configure() {

 termux_step_post_make_install() {
 	if $TERMUX_DEBUG_BUILD; then
-		install -Dm700 busybox_unstripped $TERMUX_PREFIX/bin/busybox
+		install -m700 busybox_unstripped \
+			$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/busybox
 	fi

 	# Install busybox man page.
-	install -Dm600 -t $TERMUX_PREFIX/share/man/man1 $TERMUX_PKG_SRCDIR/docs/busybox.1
+	install -Dm600 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/man/man1 \
+		$TERMUX_PKG_SRCDIR/docs/busybox.1
 }
@@ -0,0 +1,11 @@
+--- ./Makefile.custom.orig	2021-05-12 14:15:47.343248550 +0000
+++ ./Makefile.custom	2021-05-12 14:16:01.780263168 +0000
+@@ -37,7 +37,7 @@
+ endif
+ install: $(srctree)/applets/install.sh busybox busybox.links
+ 	$(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \
+-		$(SHELL) $< $(CONFIG_PREFIX) $(INSTALL_OPTS)
+		$(SHELL) $< $(DESTDIR)$(CONFIG_PREFIX) $(INSTALL_OPTS)
+ ifeq ($(strip $(CONFIG_FEATURE_SUID)),y)
+ 	@echo
+ 	@echo
@@ -2,17 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://tox.chat
 TERMUX_PKG_DESCRIPTION="Backend library for the Tox protocol"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.2.13
+TERMUX_PKG_VERSION=0.2.12
 TERMUX_PKG_SRCURL=https://github.com/TokTok/toxcore/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8
+TERMUX_PKG_SHA256=30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libsodium"
 TERMUX_PKG_BREAKS="c-toxcore-dev"
 TERMUX_PKG_REPLACES="c-toxcore-dev"
 #TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCMAKE_INSTALL_PREFIX=${TERMUX_PREFIX}
-DCMAKE_INSTALL_LIBDIR=${TERMUX_PREFIX}/lib
 -DBOOTSTRAP_DAEMON=off
 -DDHT_BOOTSTRAP=off
 -DBUILD_TOXAV=off
@@ -10,7 +10,7 @@ TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

 termux_step_make_install() {
-	local CERTDIR=$TERMUX_PREFIX/etc/tls
+	local CERTDIR=$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/tls
 	local CERTFILE=$CERTDIR/cert.pem

 	mkdir -p $CERTDIR
@@ -27,7 +27,7 @@ termux_step_make_install() {
 		$KEYUTIL_JAR \
 		18f1d2c82839d84949b1ad015343c509e81ef678c24db6112acc6c0761314610

-	local JAVA_KEYSTORE_DIR=$TERMUX_PREFIX/opt/openjdk-17/lib/security
+	local JAVA_KEYSTORE_DIR=$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/opt/openjdk-17/lib/security
 	mkdir -p $JAVA_KEYSTORE_DIR

 	java -jar $KEYUTIL_JAR \
@@ -20,5 +20,6 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm700 -t $TERMUX_PREFIX/bin $GOPATH/src/github.com/caddyserver/caddy/cmd/caddy/caddy
+	install -Dm700 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin \
+		$GOPATH/src/github.com/caddyserver/caddy/cmd/caddy/caddy
 }
@@ -0,0 +1,139 @@
+--- ../Makefile.orig	2021-11-17 21:06:56.106437332 +0000
+++ ./Makefile	2021-11-17 21:11:04.509701245 +0000
+@@ -104,7 +104,7 @@
+ #
+ #	PREFIX= /usr/local
+ #
+-PREFIX= /usr/local
+PREFIX ?= /usr/local
+ #PREFIX= /usr
+ #PREFIX= /usr/global
+ 
+@@ -692,8 +692,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default INCDIR for non-macOS
+-INCDIR= /usr/include
+-#INCDIR= ${PREFIX}/include
+#INCDIR= /usr/include
+INCDIR= ${PREFIX}/include
+ #INCDIR= /dev/env/DJDIR/include
+ 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -755,8 +755,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default BINDIR for non-macOS
+-BINDIR= /usr/bin
+-#BINDIR= ${PREFIX}/bin
+#BINDIR= /usr/bin
+BINDIR= ${PREFIX}/bin
+ #BINDIR= /dev/env/DJDIR/bin
+ 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -771,8 +771,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default LIBDIR for non-macOS
+-LIBDIR= /usr/lib
+-#LIBDIR= ${PREFIX}/lib
+#LIBDIR= /usr/lib
+LIBDIR= ${PREFIX}/lib
+ #LIBDIR= /dev/env/DJDIR/lib
+ 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -787,8 +787,8 @@
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default CALC_SHAREDIR for non-macOS
+-CALC_SHAREDIR= /usr/share/calc
+-#CALC_SHAREDIR= ${PREFIX}/lib/calc
+#CALC_SHAREDIR= /usr/share/calc
+CALC_SHAREDIR= ${PREFIX}/lib/calc
+ #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+ 
+ #if 0	/* start of skip for non-Gnu makefiles */
+@@ -870,7 +870,7 @@
+ #
+ # If in doubt, use T=
+ #
+-T=
+T=${DESTDIR}
+ 
+ # where man section 1 pages are installed
+ #
+@@ -892,7 +892,7 @@
+ MANDIR= ${PREFIX}/share/man/man1
+ else
+ #endif	/* end of skip for non-Gnu makefiles */
+-MANDIR= /usr/share/man/man1
+MANDIR= ${PREFIX}/share/man/man1
+ #if 0	/* start of skip for non-Gnu makefiles */
+ endif
+ #endif	/* end of skip for non-Gnu makefiles */
+@@ -1033,11 +1033,11 @@
+ #
+ # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
+-USE_READLINE=
+-#USE_READLINE= -DUSE_READLINE
+#USE_READLINE=
+USE_READLINE= -DUSE_READLINE
+ #
+-READLINE_LIB=
+-READLINE_EXTRAS=
+#READLINE_LIB=
+#READLINE_EXTRAS=
+ #
+ #READLINE_LIB= -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+@@ -1045,8 +1045,8 @@
+ #READLINE_LIB= -L/usr/gnu/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+ #
+-#READLINE_LIB= -L${PREFIX}/lib -lreadline
+-#READLINE_EXTRAS= -lhistory -lncurses
+READLINE_LIB= -L${PREFIX}/lib -lreadline
+READLINE_EXTRAS= -lhistory -lncurses
+ #
+ # For Apple OS X: install fink from http://fink.sourceforge.net
+ #		  and then do a 'fink install readline' and then use:
+@@ -1063,9 +1063,9 @@
+ #READLINE_LIB= -L${PREFIX}/opt/readline/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+ #
+-READLINE_INCLUDE=
+#READLINE_INCLUDE=
+ #READLINE_INCLUDE= -I/usr/gnu/include
+-#READLINE_INCLUDE= -I${PREFIX}/include
+READLINE_INCLUDE= -I${PREFIX}/include
+ 
+ # If $PAGER is not set, use this program to display a help file
+ #
+@@ -1109,7 +1109,7 @@
+ # a *.a link library.  Set RANLIB to the utility that performs this
+ # action.  Set RANLIB to : if your system does not need such a utility.
+ #
+-RANLIB=ranlib
+RANLIB?=ranlib
+ #RANLIB=:
+ 
+ # Normally certain files depend on the Makefile.  If the Makefile is
+@@ -1207,7 +1207,7 @@
+ 
+ # standard utilities used during make
+ #
+-AR= ar
+AR?= ar
+ AWK= awk
+ CAT= cat
+ CHMOD= chmod
+@@ -1423,7 +1423,7 @@
+ CCMISC=
+ #
+ LCC= gcc
+-CC= ${PURIFY} ${LCC} ${CCWERR}
+CC?= ${PURIFY} ${LCC} ${CCWERR}
+ #
+ endif
+ 
@@ -2,23 +2,11 @@ TERMUX_PKG_HOMEPAGE=http://www.isthe.com/chongo/tech/comp/calc/
 TERMUX_PKG_DESCRIPTION="Arbitrary precision console calculator"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.14.0.8
+TERMUX_PKG_VERSION=2.13.0.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/lcn2/calc/releases/download/v$TERMUX_PKG_VERSION/calc-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_SHA256=ad6a2c44eeea7e06efca5384f107ffaee7564407a7474d7cd4928a53b1a28386
+TERMUX_PKG_SHA256=6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, readline"
 TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_make() {
-	# Fails with -j$TERMUX_MAKE_PROCESSES for some reason
-	make USE_READLINE="-DUSE_READLINE" READLINE_EXTRAS="-lhistory -lncurses" \
-		READLINE_LIB="-L$TERMUX_PREFIX/lib -lreadline" \
-		READLINE_INCLUDE="-I$TERMUX_PREFIX/include" \
-		DEFAULT_LIB_INSTALL_PATH="$TERMUX_PREFIX/lib" CC="$CC" -j1 \
-		LONG_BITS=$TERMUX_ARCH_BITS
-}
-
-termux_step_make_install() {
-	make T="$TERMUX_PREFIX" BINDIR="/bin" LIBDIR="/lib" INCDIR="/include" \
-		SCRIPTDIR="/share/calc/cscript" CALC_SHAREDIR="/share/calc" install 
-}
+TERMUX_MAKE_PROCESSES=1
@@ -1,6 +1,6 @@
 --- ./Makefile	2021-02-13 06:35:46.000000000 +0000
 +++ ./Makefile	2021-02-14 07:20:08.457009951 +0000
-@@ -1125,8 +1125,8 @@
+@@ -1273,8 +1273,8 @@
 # The ARCH_CFLAGS are ${CC} when compiling C files. They follow
 # CCMISC and precede EXTRA_CFLAGS.
 #
@@ -1,10 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/AMDmi3/cavezofphear
-TERMUX_PKG_DESCRIPTION="A Boulder Dash like game for consoles/terminals"
-TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_MAINTAINER="Dmitry Marakasov <amdmi3@amdmi3.ru>"
-TERMUX_PKG_VERSION=0.6.1
-TERMUX_PKG_SRCURL=https://github.com/AMDmi3/cavezofphear/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=29ea76dd1a0f38904cd09e36b7205d4a4c01324d2ba28d03f15d9ae53881aa10
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DSYSTEMWIDE=ON -DWITH_MANPAGE=OFF"
-TERMUX_PKG_GROUPS="games"
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE="https://lib.rs/cavif"
-TERMUX_PKG_DESCRIPTION="AVIF image creator in pure Rust"
+TERMUX_PKG_DESCRIPTION="Encoder/converter for AVIF images. Based on rav1e and avif-serialize."
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.3.3
+TERMUX_PKG_VERSION=1.3.1-win
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/kornelski/cavif-rs/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=afbf1990916331d6d7a7cf02d1d5aa24b7837088a3830481466771751be69c84
+TERMUX_PKG_SHA256=0f76ae20081d2031881d51871dd5b66cf5c0bec441a22c605f5bbba7dc55c8a8
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -0,0 +1,18 @@
+commit e3580f273a8dd83c71bb4ad10b393585dde02c46
+Author: Kornel <kornel@geekhood.net>
+Date:   Wed Sep 15 09:40:59 2021 +0100
+
+    Update for latest rav1e
+
+diff --git a/ravif/src/av1encoder.rs b/ravif/src/av1encoder.rs
+index edcc1c1..2afcb85 100644
+--- a/ravif/src/av1encoder.rs
+++ b/ravif/src/av1encoder.rs
+@@ -285,7 +285,6 @@ impl SpeedTweaks {
+         let mut speed_settings = SpeedSettings::from_preset(self.speed_preset.into());
+ 
+         speed_settings.multiref = false;
+-        speed_settings.fast_scene_detection = true;
+         speed_settings.no_scene_detection = true;
+         speed_settings.include_near_mvs = false;
+ 
@@ -1,22 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://benkibbey.wordpress.com/cboard/
-TERMUX_PKG_DESCRIPTION="PGN browser, editor and chess engine frontend"
-TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.7.5
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/c-board/${TERMUX_PKG_VERSION}/cboard-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=dd748039f3531653e1573577cd814741524e1b16e16e3a841ef512e5150da6a0
-TERMUX_PKG_DEPENDS="libandroid-support,libandroid-glob,gnuchess, ncurses, ncurses-ui-libs"
-TERMUX_PKG_GROUPS="games"
-
-termux_step_pre_configure() {
-	CFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX -fcommon"
-	LDFLAGS+=" -landroid-glob"
-
-	if $TERMUX_DEBUG_BUILD; then
-		# When doing debug build, -D_FORTIFY_SOURCE=2 gives this error:
-		# /home/builder/.termux-build/cboard/src/libchess/pgn.c:2235:33: error: 'umask' called with invalid mode
-		# mode = umask(600);
-		export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-	fi
-}
@@ -1,60 +0,0 @@
-diff -uNr cboard-0.7.5/configure cboard-0.7.5.mod/configure
--- cboard-0.7.5/configure	2018-09-27 17:48:24.000000000 +0300
-+++ cboard-0.7.5.mod/configure	2019-08-16 14:05:44.294565834 +0300
-@@ -12194,13 +12194,8 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Unix98 pty support" >&5
- $as_echo_n "checking for Unix98 pty support... " >&6; }
-if test -c "/dev/ptmx"; then
-    have_ptmx=yes
-else
-    have_ptmx=no
-fi
-
-ptmx_works=no
-+have_ptmx=yes
-+ptmx_works=yes
- 
- if test "x$have_ptmx" = "xyes"; then
-     ac_ext=c
-@@ -12210,40 +12205,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-     if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-\
-		   #include <stdio.h>
-		   #include <sys/types.h>
-		   #include <sys/stat.h>
-		   #include <fcntl.h>
-
-		   int main()
-		   {
-		       int fd;
-
-		       if ((fd = open("/dev/ptmx", O_RDWR)) == -1)
-		           exit(1);
-
-		       if (ptsname(fd) == NULL)
-		           exit(1);
-
-		       exit(0);
-		   }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-   ptmx_works=yes
-else
-  ptmx_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
@@ -1,20 +0,0 @@
-diff -u -r ../cboard-0.7.5/libchess/pgn.c ./libchess/pgn.c
--- ../cboard-0.7.5/libchess/pgn.c	2018-09-17 15:58:48.000000000 +0000
-+++ ./libchess/pgn.c	2018-12-19 00:16:27.204984323 +0000
-@@ -883,7 +883,6 @@
-   time_t now;
-   char tbuf[11] = { 0 };
-   struct tm *tp;
-  struct passwd *pw = getpwuid (getuid ());
-   char host[64] = { 0 };
- 
-   time (&now);
-@@ -904,7 +903,7 @@
-   if (pgn_tag_add (&g->tag, (char *) "Round", (char *) "-") != E_PGN_OK)
-     warn ("pgn_tag_add()");
- 
-  if (pgn_tag_add (&g->tag, (char *) "White", pw->pw_gecos) != E_PGN_OK)
-+  if (pgn_tag_add (&g->tag, (char *) "White", (char *) "You") != E_PGN_OK)
-     warn ("pgn_tag_add()");
- 
-   if (pgn_tag_add (&g->tag, (char *) "Black", (char *) "?") != E_PGN_OK)
@@ -1,15 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://www.cgal.org/
-TERMUX_PKG_DESCRIPTION="Computational Geometry Algorithms Library"
-TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=5.3.1
-TERMUX_PKG_SRCURL=https://github.com/CGAL/cgal/releases/download/v${TERMUX_PKG_VERSION}/CGAL-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=ab76633b023d72ea3ca9ad22e2fa39ed3b5c8fb4e2c091a78035fabb5eb3fccf
-TERMUX_PKG_DEPENDS="boost, libc++, libgmp, libmpfr, zlib"
-
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DWITH_CGAL_Qt5=OFF
-DWITH_demos=OFF
-DWITH_examples=OFF
-DWITH_tests=OFF
-"
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the G
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.7.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198
 TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb"
@@ -1,35 +0,0 @@
--- ./cgdb/cgdb.cpp~	2021-12-13 09:02:26.731050742 +0100
-+++ ./cgdb/cgdb.cpp	2021-12-13 09:07:32.078899611 +0100
-@@ -84,6 +84,11 @@
- #include "rline.h"
- #include "usage.h"
- 
-+#ifdef __ANDROID__
-+#include <android/fdsan.h>
-+#include <dlfcn.h>
-+#endif
-+
- /* --------- */
- /* Constants */
- /* --------- */
-@@ -1757,6 +1762,20 @@
- {
-     parse_long_options(&argc, &argv);
- 
-+
-+    #ifdef __ANDROID__
-+        // For Android 11+.
-+        void *lib_handle = dlopen("libc.so", RTLD_LAZY);
-+        if (lib_handle) {
-+            void (*set_fdsan_error_level)(enum android_fdsan_error_level);
-+            set_fdsan_error_level = (void (*)(enum android_fdsan_error_level))dlsym(lib_handle, "android_fdsan_set_error_level");
-+            if (set_fdsan_error_level) {
-+                set_fdsan_error_level(ANDROID_FDSAN_ERROR_LEVEL_DISABLED);
-+            }
-+            dlclose(lib_handle);
-+        }
-+    #endif
-+
-     /* Debugging helper - wait for debugger to attach to us before continuing */
-     if (wait_for_debugger_to_attach) {
-         if (cgdb_supports_debugger_attach_detection()) {
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://chezmoi.io
 TERMUX_PKG_DESCRIPTION="Manage your dotfiles across multiple machines"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=2.9.4
+TERMUX_PKG_VERSION=2.7.5
 TERMUX_PKG_SRCURL=https://github.com/twpayne/chezmoi/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=fca10c19bea51e4e17ddd077f855c3d09be0730997ae50987552ce05190a54a5
+TERMUX_PKG_SHA256=ed9de88a851cbbb2acce77e13615fe45a19350112f58d9acc268b2ff4961d8ab
 TERMUX_PKG_AUTO_UPDATE=true

 termux_step_make() {
@@ -22,20 +22,21 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -Dm700 ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/chezmoi $TERMUX_PREFIX/bin/chezmoi
+	install -Dm700 ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/chezmoi \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/chezmoi

-	mkdir -p $TERMUX_PREFIX/share/bash-completion/completions \
-		$TERMUX_PREFIX/share/fish/completions \
-		$TERMUX_PREFIX/share/zsh/site-functions \
-		$TERMUX_PREFIX/share/doc/chezmoi
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/bash-completion \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/fish/completions \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/zsh/site-functions \
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/doc/chezmoi

 	install ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/completions/chezmoi-completion.bash \
-		$TERMUX_PREFIX/share/bash-completion/completions/chezmoi
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/bash-completion/chezmoi
 	install ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/completions/chezmoi.fish \
-		$TERMUX_PREFIX/share/fish/completions/chezmoi.fish
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/fish/completions/chezmoi.fish
 	install ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/completions/chezmoi.zsh \
-		$TERMUX_PREFIX/share/zsh/site-functions/_chezmoi
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/zsh/site-functions/_chezmoi

 	install ${TERMUX_PKG_BUILDDIR}/src/github.com/twpayne/chezmoi/docs/{FAQ,HOWTO,QUICKSTART,REFERENCE,TEMPLATING}.md \
-		$TERMUX_PREFIX/share/doc/chezmoi/
+		$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/doc/chezmoi/
 }
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Dreamacro/clash
 TERMUX_PKG_DESCRIPTION="A rule-based tunnel in Go."
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Philipp Schmitt <philipp@schmitt.co>"
-TERMUX_PKG_VERSION=1.8.0
+TERMUX_PKG_VERSION=1.7.1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/Dreamacro/clash/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=e1bae0ba88a0e2ba36702f95fe95fdc8fee58db4751b5b108ea600563c36a972
+TERMUX_PKG_SHA256=18c2ef10df608392435a1277d3f2e256c65bec3662bf0a6c325f02be6deb4fce
 TERMUX_PKG_BUILD_IN_SRC=true

 termux_step_make() {
@@ -17,12 +18,12 @@ termux_step_make() {
 		go build \
 			-trimpath \
 			-ldflags "-X 'github.com/Dreamacro/clash/constant.Version=${TERMUX_PKG_VERSION}'
-								-X 'github.com/Dreamacro/clash/constant.BuildTime=$(date -u)'
-								-w -s -buildid='" \
+				  -X 'github.com/Dreamacro/clash/constant.BuildTime=$(date -u)'
+				  -w -s -buildid='" \
 			-o "clash.bin" \
 			main.go
 }

 termux_step_make_install() {
-	mv ./clash.bin "${TERMUX_PREFIX}/bin/clash"
+	install -Dm700 clash.bin "$TERMUX_PKG_MASSAGEDIR${TERMUX_PREFIX}/bin/clash"
 }
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool which profiles OpenCL devices to find their peak
 TERMUX_PKG_LICENSE="Unlicense"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.1.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=2
 _COMMIT=0777205be1d5681d5a76d46ec94588544e8462a5
 TERMUX_PKG_SRCURL=https://github.com/krrishnarraj/clpeak.git
 TERMUX_PKG_GIT_BRANCH=master
@@ -14,8 +14,7 @@ TERMUX_PKG_DEPENDS="libc++, ocl-icd"
 # Use master branch until next release

 termux_step_post_get_source() {
-	git fetch --unshallow
+	git pull
 	git reset --hard ${_COMMIT}
-	git submodule deinit --force --all
-	git submodule update --init --recursive
+	git submodule foreach --recursive git reset --hard
 }
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kpet/clvk
 TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.0.20211121
-_COMMIT=d8d02aac8ac3e9256e75f3143214777cc3a162e9
+TERMUX_PKG_VERSION=0.0.20211115
+_COMMIT=4274b043208da23dc86a707e04d5c39980edefa4
 TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_BUILD_DEPENDS="vulkan-loader-android"
@@ -42,10 +42,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCLVK_BUILD_TESTS=OFF"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DCLVK_CLSPV_ONLINE_COMPILER=1"

 termux_step_post_get_source() {
-	git fetch --unshallow
+	git pull
 	git reset --hard ${_COMMIT}
-	git submodule deinit --force --all
-	git submodule update --init --recursive
+	git submodule foreach --recursive git reset --hard
 	./external/clspv/utils/fetch_sources.py --deps llvm
 }

@@ -84,8 +83,9 @@ termux_step_pre_configure() {

 termux_step_make_install() {
 	# clvk has a very basic install rule
-	install -Dm644 "$TERMUX_PKG_BUILDDIR/libOpenCL.so" "$TERMUX_PREFIX/lib/clvk/libOpenCL.so"
+	install -Dm644 -t "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/lib/clvk libOpenCL.so

-	echo "$TERMUX_PREFIX/lib/clvk/libOpenCL.so" > "$TERMUX_PKG_TMPDIR/clvk.icd"
-	install -Dm644 "$TERMUX_PKG_TMPDIR/clvk.icd" "$TERMUX_PREFIX/etc/OpenCL/vendors/clvk.icd"
+	mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/etc/OpenCL/vendors
+	echo "$TERMUX_PREFIX/lib/clvk/libOpenCL.so" \
+		> "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"/etc/OpenCL/vendors/clvk.icd
 }
@@ -0,0 +1,22 @@
+diff --git a/Source/cmake.cxx b/Source/cmake.cxx
+index a99d9a633..55ae9d254 100644
+--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
+@@ -109,7 +109,7 @@
+ #  include "cmExtraEclipseCDT4Generator.h"
+ #endif
+ 
+-#if defined(__linux__) || defined(_WIN32)
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
+ #  include "cmGlobalGhsMultiGenerator.h"
+ #endif
+ 
+@@ -1982,7 +1982,7 @@ void cmake::AddDefaultGenerators()
+ #endif
+   this->Generators.push_back(cmGlobalUnixMakefileGenerator3::NewFactory());
+ #if !defined(CMAKE_BOOTSTRAP)
+-#  if defined(__linux__) || defined(_WIN32)
+#  if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
+   this->Generators.push_back(cmGlobalGhsMultiGenerator::NewFactory());
+ #  endif
+   this->Generators.push_back(cmGlobalNinjaGenerator::NewFactory());
@@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package soft
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating version here, please update termux_setup_cmake.sh as well.
-TERMUX_PKG_VERSION=3.22.1
+TERMUX_PKG_VERSION=3.21.3
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
+TERMUX_PKG_SHA256=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON"
@@ -8,12 +8,11 @@ TERMUX_PKG_SHA256=66d92c8bef533744674c5b64d8744227584b12704bcfebbe16dab69f81e620
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BREAKS="cmark-dev"
 TERMUX_PKG_REPLACES="cmark-dev"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib"

 termux_step_post_make_install() {
-    cd $TERMUX_PREFIX/bin
-    ln -f -s cmark-gfm cmark
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin
+	ln -f -s cmark-gfm cmark

-    cd $TERMUX_PREFIX/share/man/man1
-    ln -f -s cmark-gfm.1 cmark.1
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/share/man/man1
+	ln -f -s cmark-gfm.1 cmark.1
 }
@@ -2,6 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/command-not-found
 TERMUX_PKG_DESCRIPTION="Suggest installation of packages in interactive shell sessions"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.70
+TERMUX_PKG_VERSION=1.66
 TERMUX_PKG_SRCURL=https://github.com/termux/command-not-found/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=57f0a39b74ddf90f2b2307122b853f0c522ffe888b999762439d5c525b9f2899
+TERMUX_PKG_SHA256=4a8765a45930715cabc931bd38c4553572db5a4952412cc333910248fd83c8bb
@@ -7,8 +7,8 @@ TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/c/cowsay/cowsay_3.03+d
 TERMUX_PKG_SHA256=10bae895d9afb2d720d2211db58f396352b00fe1386c369ca3608cbf6497b839
 TERMUX_PKG_DEPENDS="perl"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
+TERMUX_PKG_BUILD_IN_SRC=true

 termux_step_make_install() {
-	cd $TERMUX_PKG_SRCDIR
-	sh install.sh
+	DESTDIR=$TERMUX_PKG_MASSAGEDIR sh install.sh
 }
@@ -1,8 +1,6 @@
-Only in .: install.pl
-diff -u -r ../cowsay-3.03+dfsg1/install.sh ./install.sh
--- ../cowsay-3.03+dfsg1/install.sh	1999-11-01 15:19:21.000000000 -0500
-+++ ./install.sh	2016-04-14 21:14:44.715683710 -0400
-@@ -14,55 +14,8 @@
+--- ../cowsay-3.03+dfsg1/install.sh	1999-11-01 20:19:21.000000000 +0000
+++ ./install.sh	2021-11-14 20:36:22.959215687 +0000
+@@ -14,76 +14,30 @@
 
 filelist='cows'
 
@@ -53,29 +51,42 @@ diff -u -r ../cowsay-3.03+dfsg1/install.sh ./install.sh
 -else
 -	read prefix
 -fi
-
-PREFIX=${prefix:-/usr/local}
 +usethisperl=@TERMUX_PREFIX@/bin/perl
 +PREFIX=@TERMUX_PREFIX@
 
+-PREFIX=${prefix:-/usr/local}
+ 
 echo Okay, time to install this puppy.
 
-@@ -70,13 +23,13 @@
+ echo s,%BANGPERL%,!$usethisperl,\; > install.pl
 echo s,%PREFIX%,$PREFIX,\; >> install.pl
 set -x
- mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin)
+-mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin)
 -$usethisperl -p install.pl cowsay > $PREFIX/bin/cowsay
-+perl -p install.pl cowsay > $PREFIX/bin/cowsay
- chmod a+x $PREFIX/bin/cowsay
- ln -s cowsay $PREFIX/bin/cowthink
+-chmod a+x $PREFIX/bin/cowsay
+-ln -s cowsay $PREFIX/bin/cowthink
 -mkdir -p $PREFIX/man/man1 || ($mkdir $PREFIX; mkdir $PREFIX/man; mkdir $PREFIX/man/man1)
 -$usethisperl -p install.pl cowsay.1 > $PREFIX/man/man1/cowsay.1
 -chmod a+r $PREFIX/man/man1/cowsay.1
 -ln -s cowsay.1 $PREFIX/man/man1/cowthink.1
-+mkdir -p $PREFIX/share/man/man1
-+perl -p install.pl cowsay.1 > $PREFIX/share/man/man1/cowsay.1
-+chmod a+r $PREFIX/share/man/man1/cowsay.1
-+(cd $PREFIX/share/man/man1; ln -f -s cowsay.1 cowthink.1 )
- mkdir -p $PREFIX/share/cows || (mkdir $PREFIX; mkdir $PREFIX/share; mkdir $PREFIX/share/cows)
- tar -cf - $filelist | (cd $PREFIX/share && tar -xvf -)
+-mkdir -p $PREFIX/share/cows || (mkdir $PREFIX; mkdir $PREFIX/share; mkdir $PREFIX/share/cows)
+-tar -cf - $filelist | (cd $PREFIX/share && tar -xvf -)
+mkdir -p $DESTDIR/$PREFIX/bin || (mkdir $DESTDIR/$PREFIX; mkdir $DESTDIR/$PREFIX/bin)
+perl -p install.pl cowsay > $DESTDIR/$PREFIX/bin/cowsay
+chmod a+x $DESTDIR/$PREFIX/bin/cowsay
+ln -s cowsay $DESTDIR/$PREFIX/bin/cowthink
+mkdir -p $DESTDIR/$PREFIX/share/man/man1
+perl -p install.pl cowsay.1 > $DESTDIR/$PREFIX/share/man/man1/cowsay.1
+chmod a+r $DESTDIR/$PREFIX/share/man/man1/cowsay.1
+(cd $DESTDIR/$PREFIX/share/man/man1; ln -f -s cowsay.1 cowthink.1 )
+mkdir -p $DESTDIR/$PREFIX/share/cows || (mkdir $DESTDIR/$PREFIX; mkdir $DESTDIR/$PREFIX/share; mkdir $DESTDIR/$PREFIX/share/cows)
+tar -cf - $filelist | (cd $DESTDIR/$PREFIX/share && tar -xvf -)
 set +x
+ 
+ echo Okay, let us see if the install actually worked.
+ 
+-if [ ! -f $PREFIX/share/cows/default.cow ]; then
+if [ ! -f $DESTDIR/$PREFIX/share/cows/default.cow ]; then
+     echo The default cow file did not make it across!
+     echo Ooops, it failed...sorry!
+     exit 1
@@ -2,7 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/danmar/cppcheck
 TERMUX_PKG_DESCRIPTION="tool for static C/C++ code analysis"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.6.2
-TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_VERSION=2.6.1
 TERMUX_PKG_SRCURL=https://github.com/danmar/cppcheck/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=a11602c15bf951ba5bb67655ca6c06986ec64770d8004759a8c53db013286a5e
+TERMUX_PKG_SHA256=41700db44b349428d5602356b32183b7776380e7a5b0b82a2f2764fadadb015e
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/Dr-Noob/cpufetch
 TERMUX_PKG_DESCRIPTION="Simple yet fancy CPU architecture fetching tool"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@ELWAER-M"
-TERMUX_PKG_VERSION=1.01
+TERMUX_PKG_VERSION=1.00
 TERMUX_PKG_SRCURL=https://github.com/Dr-Noob/cpufetch/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d4fe25adc4d12f5f1dc7a7e70a4ed92e9807b6a1ad0294c563a0250f7bd6aca1
+TERMUX_PKG_SHA256=2254c2578435cc35c4d325b25fdff4c4b681de92cbce9a7a36e58ad58a3d9173
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -8,5 +8,5 @@ TERMUX_PKG_SHA256=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2
 TERMUX_PKG_BUILD_IN_SRC=true

 termux_step_make_install() {
-	install -Dm700 -t $TERMUX_PREFIX/bin src/cpulimit
+	install -Dm700 -t $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin src/cpulimit
 }
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/schollz/croc
 TERMUX_PKG_DESCRIPTION="Easily and securely send things from one computer to another."
 TERMUX_PKG_LICENSE=MIT
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=9.5.0
+TERMUX_PKG_VERSION=9.4.2
 TERMUX_PKG_SRCURL=https://github.com/schollz/croc/releases/download/v${TERMUX_PKG_VERSION}/croc_${TERMUX_PKG_VERSION}_src.tar.gz
-TERMUX_PKG_SHA256=ed3cdaaf88bee851f7629a19968435c4259b88925a7c214a153e691f71335686
+TERMUX_PKG_SHA256=f4aacf189eb977d0b6b2d5a0340b3edcccce0c449da6bef0577665647b2efbda
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true

@@ -17,5 +17,5 @@ termux_step_make() {
 }

 termux_step_make_install() {
-	install -m755 croc $TERMUX_PREFIX/bin/croc
+	install -Dm755 croc $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin/
 }
@@ -1,16 +0,0 @@
-Pretending that the source is c++ instead of c is apparently needed to make visual studio happy: https://github.com/a-nikolaev/curseofwar/commit/ca752d9af5a7616ef9faca6cd79c3de6f5a07aa9
-
-clang gives warnings that the source is actually c though, and we get lots of:
-warning: ISO C++11 does not allow conversion from string literal to 'char *'
--- ../CMakeLists.txt.orig	2020-08-16 19:49:42.870095140 +0200
-+++ ./CMakeLists.txt	2020-08-16 19:50:02.580234051 +0200
-@@ -32,8 +32,7 @@
-                     client.c
-                     server.c)
- 
-SET (SOURCES ${SOURCE_COMMON} ${SOURCE_SDL} ${SOURCE_NCURSES} ${SOURCE_NETWORK})                    
-set_source_files_properties( ${SOURCES} PROPERTIES LANGUAGE "CXX" )                    
-+SET (SOURCES ${SOURCE_COMMON} ${SOURCE_SDL} ${SOURCE_NCURSES} ${SOURCE_NETWORK})
- 
- if(WIN32)
-     # Windows includes the math lib by default, no need to add them
@@ -1,16 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://a-nikolaev.github.io/curseofwar/
-TERMUX_PKG_DESCRIPTION="Fast-paced action strategy game focusing on high-level strategic planning"
-TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.3.0
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL=https://github.com/a-nikolaev/curseofwar/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=2a90204d95a9f29a0e5923f43e65188209dc8be9d9eb93576404e3f79b8a652b
-TERMUX_PKG_DEPENDS="libc++, ncurses"
-TERMUX_PKG_GROUPS="games"
-
-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
-}
@@ -1,11 +0,0 @@
-diff -u -r ../curseofwar-1.2.0/network.h ./network.h
--- ../curseofwar-1.2.0/network.h	2013-08-16 07:57:44.000000000 +0200
-+++ ./network.h	2014-01-29 01:09:19.000000000 +0100
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <arpa/inet.h>
- 
- #define MSG_BUF_SIZE 50000
- 
@@ -1,9 +0,0 @@
-diff -u -r ../curseofwar-1.2.0/Makefile ./Makefile
--- ../curseofwar-1.2.0/Makefile	2013-08-16 07:57:44.000000000 +0200
-+++ ./Makefile	2014-01-29 01:07:04.000000000 +0100
-@@ -1,5 +1,4 @@
- SHELL = /bin/sh
-CC      = gcc
- INSTALL = install
- EXEC_NCURSES = curseofwar
- EXEC_SDL = curseofwar-sdl
@@ -1,19 +0,0 @@
--- ../path.c.orig	2020-08-16 19:40:30.098928495 +0200
-+++ ./path.c	2020-08-16 19:41:56.786161977 +0200
-@@ -77,11 +77,11 @@
-   path[1] = concat(s, suffix);
-   free(s);
-   path[2] = concat(getenv("HOME"), "/.curseofwar/");
-  path[3] = strdup("/usr/local/share/curseofwar/");
-  path[4] = strdup("/usr/share/curseofwar/");
-  path[5] = strdup("/usr/share/curseofwar-sdl/");
-  path[6] = strdup("/usr/share/curseofwar-common/");
-  path[7] = strdup(INSTALL_DATA);
-+  path[3] = strdup("@TERMUX_PREFIX@/local/share/curseofwar/");
-+  path[4] = strdup("@TERMUX_PREFIX@/share/curseofwar/");
-+  path[5] = strdup("@TERMUX_PREFIX@/share/curseofwar-sdl/");
-+  path[6] = strdup("@TERMUX_PREFIX@/share/curseofwar-common/");
-+  path[7] = strdup("@TERMUX_PREFIX@/share/curseofwar/");
- #else
-   int dirs_num = 1;
-   char **path = (char**) malloc(sizeof(char*) * (dirs_num + 1));
@@ -7,3 +7,4 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/bmc/daemonize/archive/release-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setpgrp_void=yes"
+TERMUX_PKG_EXTRA_MAKE_ARGS="INSTALL_SBIN=$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/bin"
--- a/Show More
+++ b/Show More