gh: update to 2.4.0

This commit has been automatically submitted by Github Actions.

.github/stale.yml

@@ -0,0 +1,14 @@
+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
+

.github/workflows/packages.yml

@@ -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
@@ -102,8 +102,11 @@ jobs:
             fi
           done<<<${CHANGED_FILES}
         else
-          for i in ${{ github.event.inputs.packages }}; do
-            echo "$i" >> ./built_packages.txt
+          for pkg in ${{ github.event.inputs.packages }}; do
+            echo "$pkg" >> ./built_packages.txt
+            for subpkg in $(find "packages/${pkg}/" -maxdepth 1 -type f -name \*.subpackage.sh | sort); do
+              echo "$(basename "${subpkg%%.subpackage.sh}")" >> ./built_subpackages.txt
+            done
           done
         fi
 
@@ -284,14 +287,19 @@ 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)
+          http_status_code=$(echo "$curl_response" | cut -d'|' -f2 | grep -oP '\d{3}$')
 
           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)] Error: server/proxy has dropped connection."
+            echo "[$(date +%H:%M:%S)] Warning: 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

CODEOWNERS

@@ -10,6 +10,9 @@
 /clean.sh @Grimler91 @xeffyr
 /scripts/ @Grimler91 @xeffyr
 
+# GN setup script
+/scripts/build/setup/termux_setup_gn.sh @thunder-coding
+
 # Repository utilities.
 /scripts/bin/ @xeffyr
 

CONTRIBUTING.md

@@ -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 license. Software which is open source but is distributed
-  under non-free conditions is processed on individual basis.
+  known open-source licenses. Software for which the source is available but
+  distributed under non-free conditions is processed on an individual basis.
 
   Software which is either closed-source, contain binary-only components or
   is distributed under End User License Agreement is not accepted.

README.md

@@ -5,7 +5,7 @@
 [![Docker image status](https://github.com/termux/termux-packages/workflows/Docker%20image/badge.svg)](https://hub.docker.com/r/termux/package-builder)
 [![Repology metadata](https://github.com/termux/repology-metadata/workflows/Repology%20metadata/badge.svg)](https://repology.org/repository/termux)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
-[![Join the Termux discord server](https://img.shields.io/discord/591914197219016707.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X)
+[![Join the Termux discord server](https://img.shields.io/discord/641256914684084234.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X)
 
 <img src=".github/static/powered-by-fosshost.png" alt="Powered by FossHost" width="128px"></img>
 

build-package.sh

@@ -374,9 +374,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 B63168609E8839CA9150CE2DD9EFD56891B2BB50 > /dev/null 2>&1 || {
+	gpg --list-keys 2C7F29AE97891F6419A9E2CDB0076E490B71616B > /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 B63168609E8839CA9150CE2DD9EFD56891B2BB50
+		gpg --no-tty --command-file <(echo -e "trust\n5\ny")  --edit-key 2C7F29AE97891F6419A9E2CDB0076E490B71616B
 	}
 	gpg --list-keys CC72CF8BA7DBFA0182877D045A897D96E57CF20C > /dev/null 2>&1 || {
 		gpg --import "$TERMUX_SCRIPTDIR/packages/termux-keyring/termux-autobuilds.gpg"

disabled-packages/gst-libav/build.sh

@@ -1,14 +0,0 @@
-# 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
-"

disabled-packages/lrzsz/build.sh

@@ -1,6 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://ohse.de/uwe/software/lrzsz.html
-TERMUX_PKG_DESCRIPTION="Tools for zmodem/xmodem/ymodem file transfer"
-TERMUX_PKG_VERSION=0.12.20
-TERMUX_PKG_SRCURL=https://ohse.de/uwe/releases/lrzsz-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --mandir=$TERMUX_PREFIX/share/man"

disabled-packages/netcdf-cxx/build.sh

@@ -0,0 +1,8 @@
+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"

ndk-patches/dirent.h.patch

@@ -0,0 +1,12 @@
+--- ./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

ndk-patches/linux-fcntl.h.patch

@@ -0,0 +1,11 @@
+--- ./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

ndk-patches/mntent.h.patch

@@ -0,0 +1,15 @@
+--- ./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

packages/0verkill/build.sh

@@ -0,0 +1,15 @@
+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"
+}

packages/alpine/build.sh

@@ -3,9 +3,10 @@ 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="libcrypt, ncurses, openssl-tool"
+TERMUX_PKG_DEPENDS="coreutils, libcrypt, ncurses, openssl-tool"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-debug
 --with-c-client-target=lnx

packages/angband/build.sh

@@ -0,0 +1,27 @@
+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
+}

packages/angband/src-main.c.patch

@@ -0,0 +1,23 @@
+--- ./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
+ 

packages/apache2/build.sh

@@ -3,6 +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_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"
@@ -72,7 +73,12 @@ TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man/man8/suexec.8 libexec/httpd.exp"
 TERMUX_PKG_EXTRA_MAKE_ARGS="-s"
 TERMUX_PKG_SERVICE_SCRIPT=("httpd" 'exec httpd -DNO_DETACH 2>&1')
+TERMUX_PKG_HOSTBUILD=true
 
+termux_step_host_build() {
+	gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c \
+		-o gen_test_char
+}
 
 termux_step_pre_configure() {
 	# Certain packages are not safe to build on device because their
@@ -95,11 +101,19 @@ 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() {
-	# thanks to @JetBalsa
-	gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c -o $TERMUX_PKG_BUILDDIR/server/gen_test_char
+	install -m700 $TERMUX_PKG_HOSTBUILD_DIR/gen_test_char \
+		$TERMUX_PKG_BUILDDIR/server/gen_test_char
 	touch -d "1 hour" $TERMUX_PKG_BUILDDIR/server/gen_test_char
 }
 

packages/apache2/libdummy.patch

@@ -0,0 +1,113 @@
+--- 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){}

packages/apkeep/build.sh

@@ -0,0 +1,23 @@
+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
+}

packages/apktool/aapt-wrapper.patch

@@ -0,0 +1,30 @@
+--- 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;
++}

packages/apktool/build.sh

@@ -0,0 +1,36 @@
+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
+}

packages/apr-util/build.sh

@@ -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://ftp.acc.umu.se/mirror/apache.org/apr/apr-util-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=https://downloads.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"

packages/apt/0013-fix-patterns.patch

@@ -0,0 +1,45 @@
+https://github.com/Debian/apt/pull/136
+diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
+index 12d8ae748..7a3255f41 100644
+--- a/apt-pkg/cachefilter-patterns.cc
++++ b/apt-pkg/cachefilter-patterns.cc
+@@ -30,7 +30,7 @@ static const constexpr struct
+    {"c"_sv, "?config-files"_sv, false},
+    // FIXME: The words after ~D should be case-insensitive
+    {"DDepends:"_sv, "?depends"_sv, true},
+-   {"DPre-Depends:"_sv, "?pre-depends"_sv, true},
++   {"DPreDepends:"_sv, "?predepends"_sv, true},
+    {"DSuggests:"_sv, "?suggests"_sv, true},
+    {"DRecommends:"_sv, "?recommends"_sv, true},
+    {"DConflicts:"_sv, "?conflicts"_sv, true},
+@@ -40,7 +40,7 @@ static const constexpr struct
+    {"DEnhances:"_sv, "?enhances"_sv, true},
+    {"D"_sv, "?depends"_sv, true},
+    {"RDepends:"_sv, "?reverse-depends"_sv, true},
+-   {"RPre-Depends:"_sv, "?reverse-pre-depends"_sv, true},
++   {"RPreDepends:"_sv, "?reverse-predepends"_sv, true},
+    {"RSuggests:"_sv, "?reverse-suggests"_sv, true},
+    {"RRecommends:"_sv, "?reverse-recommends"_sv, true},
+    {"RConflicts:"_sv, "?reverse-conflicts"_sv, true},
+diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml
+index 6b1c0f20b..bbcf01138 100644
+--- a/doc/apt-patterns.7.xml
++++ b/doc/apt-patterns.7.xml
+@@ -161,14 +161,15 @@
+    <variablelist>
+      <varlistentry>
+      <term><code>?depends(PATTERN)</code></term><term><code>~DPATTERN</code></term>
+-     <term><code>?pre-depends(PATTERN)</code></term><term><code>~DPre-Depends:PATTERN</code></term>
++     <term><code>?predepends(PATTERN)</code></term><term><code>~DPreDepends:PATTERN</code></term>
+      <term><code>?suggests(PATTERN)</code></term><term><code>~DSuggests:PATTERN</code></term>
++     <term><code>?recommends(PATTERN)</code></term><term><code>~DRecommends:PATTERN</code></term>
+      <term><code>?conflicts(PATTERN)</code></term><term><code>~DConflicts:PATTERN</code></term>
+      <term><code>?replaces(PATTERN)</code></term><term><code>~DReplaces:PATTERN</code></term>
+      <term><code>?obsoletes(PATTERN)</code></term><term><code>~DObsoletes:PATTERN</code></term>
+      <term><code>?breaks(PATTERN)</code></term><term><code>~DBreaks:PATTERN</code></term>
+      <term><code>?enhances(PATTERN)</code></term><term><code>~DEnhances:PATTERN</code></term>
+-     <listitem><para>Selects versions depending/pre-depending/suggesting/conflicting/etc on/with/ packages matching PATTERN.</para></listitem>
++     <listitem><para>Selects versions depending/pre-depending/suggesting/recommending/conflicting/etc on/with/ packages matching PATTERN.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><code>?reverse-<replaceable>depType</replaceable>(PATTERN)</code></term>

packages/apt/build.sh

@@ -2,17 +2,16 @@ 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.11
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=2.3.13
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=cc0c5b24240176e333b11bce1a7ac528ae263317d137ceeebad3ec2d8682cb91
+TERMUX_PKG_SHA256=e519e55f1015d656425e68f8c7c7bebd1908df3ac87836eb6e7b6b58ce3f965d
 # 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, unstable-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_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_SUGGESTS="gnupg, x11-repo"
 TERMUX_PKG_ESSENTIAL=true
 

packages/argon2/build.sh

@@ -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/${TERMUX_PKG_VERSION}/argon2-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c
 TERMUX_PKG_EXTRA_MAKE_ARGS="LIBRARY_REL=lib"
 TERMUX_PKG_BUILD_IN_SRC=true

packages/assimp/build.sh

@@ -2,10 +2,9 @@ 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.0.1
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_VERSION=5.1.4
 TERMUX_PKG_SRCURL=https://github.com/assimp/assimp/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
+TERMUX_PKG_SHA256=bd32cdc27e1f8b7ac09d914ab92dd81d799c97e9e47315c1f40dcb7c6f7938c6
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, zlib"
 TERMUX_PKG_BREAKS="assimp-dev"

packages/assimp/test-CMakeLists.txt.patch

@@ -1,12 +0,0 @@
-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 )

packages/avahi/avahi-autoipd-main.c.patch

@@ -0,0 +1,55 @@
+--- 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;
+ }

packages/avahi/avahi-daemon-main.c.patch

@@ -0,0 +1,105 @@
+--- 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));

packages/avahi/build.sh

@@ -0,0 +1,23 @@
+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"
+}

packages/avahi/configure.ac.patch

@@ -0,0 +1,11 @@
+--- 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)

packages/axel/build.sh

@@ -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.10
+TERMUX_PKG_VERSION=2.17.11
 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=75af1d30a005939205fcf6239ba93d64227d2a3e617fd5bb4777b7db54eadb4e
+TERMUX_PKG_SHA256=f12682f981c83f374b82b0668f25f694a2042b617b236ee6fb057e5473c54e31
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl"

packages/b3sum/build.sh

@@ -0,0 +1,20 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/BLAKE3-team/BLAKE3/tree/master/b3sum
+TERMUX_PKG_DESCRIPTION="A command line utility for calculating BLAKE3 hashes, similar to Coreutils tools like b2sum or md5sum"
+TERMUX_PKG_LICENSE="CC0-1.0"
+TERMUX_PKG_MAINTAINER="@medzikuser"
+TERMUX_PKG_VERSION=1.2.0
+TERMUX_PKG_SRCURL=https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=2873f42f89c0553b7105bda4b3edb93584ba3a163b31bbfae6b6e1bc203ca8c3
+TERMUX_PKG_AUTO_UPDATE=true
+
+termux_step_make() {
+	termux_setup_rust
+
+	cd $TERMUX_PKG_SRCDIR/b3sum
+
+	cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release
+}
+
+termux_step_make_install() {
+	install -Dm755 -t $TERMUX_PREFIX/bin $TERMUX_PKG_SRCDIR/b3sum/target/${CARGO_TARGET_NAME}/release/b3sum
+}

packages/bash-completion/build.sh

@@ -3,9 +3,12 @@ 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=1
+TERMUX_PKG_REVISION=2
 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
+"

packages/bash/build.sh

@@ -3,8 +3,9 @@ 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=8
+_PATCH_VERSION=12
 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"
@@ -45,6 +46,10 @@ 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

packages/bastet/BastetBlockChooser.hpp.patch

@@ -0,0 +1,20 @@
+--- ../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;

packages/bastet/Config.cpp.patch

@@ -0,0 +1,11 @@
+--- ../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());

packages/bastet/build.sh

@@ -0,0 +1,13 @@
+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"

packages/bastet/makefile.patch

@@ -0,0 +1,24 @@
+--- ../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)
+ 

packages/binaryen/build.sh

@@ -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=102
+TERMUX_PKG_VERSION=104
 TERMUX_PKG_SRCURL=https://github.com/WebAssembly/binaryen/archive/version_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=6197a8d7220d1510bb0694a2984bfae4f8b38abd6bdf4c724551c831786992f6
+TERMUX_PKG_SHA256=a6acabb159fcc5b1d8c9506f5036dcd1e4446952b572903b256af955e959780d
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+"

packages/binutils/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.37
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
 TERMUX_PKG_DEPENDS="libc++, zlib"
@@ -26,6 +26,14 @@ termux_step_pre_configure() {
 	else
 		export LIB_PATH="${TERMUX_PREFIX}/lib:/system/lib64"
 	fi
+
+	# Force generation of manpages
+	rm \
+		$TERMUX_PKG_SRCDIR/binutils/doc/*.1 \
+		$TERMUX_PKG_SRCDIR/binutils/doc/cxxfilt.man \
+		$TERMUX_PKG_SRCDIR/gas/doc/as.1 \
+		$TERMUX_PKG_SRCDIR/ld/ld.1 \
+		$TERMUX_PKG_SRCDIR/gprof/gprof.1
 }
 
 termux_step_post_make_install() {

packages/binutils/fix-empty-manpages.patch

@@ -0,0 +1,13 @@
+Patch borrowed from FreeBSD https://github.com/freebsd/freebsd-ports/commit/a055899f4f1c41d07ae5b8d3f5a9983173ef76f6#diff-6257cca5b6087edcb78aee07457b6d2f539402a4fe447484227a65f9948c6b78
+
+--- ./etc/texi2pod.pl.orig	2021-08-30 17:17:09 UTC
++++ ./etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {

packages/bison/build.sh

@@ -3,6 +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_SRCURL=https://mirrors.kernel.org/gnu/bison/bison-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
 TERMUX_PKG_DEPENDS="m4"

packages/bison/ffsl.h.patch

@@ -0,0 +1,50 @@
+--- ../ffsl.h.orig	2021-11-09 21:28:29.347410128 +0100
++++ ./lib/ffsl.h	2021-11-09 21:28:50.760733519 +0100
+@@ -46,47 +46,3 @@
+ #if !defined FUNC || !defined TYPE
+ # error
+ #endif
+-
+-int
+-FUNC (TYPE i)
+-{
+-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) \
+-    || (__clang_major__ >= 4)
+-  return GCC_BUILTIN (i);
+-#elif defined _MSC_VER && defined MSVC_BUILTIN
+-  /* _BitScanForward, _BitScanForward64
+-     <https://docs.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64> */
+-  unsigned long bit;
+-  if (MSVC_BUILTIN (&bit, i))
+-    return bit + 1;
+-  else
+-    return 0;
+-#else
+-  unsigned TYPE j = i;
+-  /* Split j into chunks, and look at one chunk after the other.  */
+-  enum { chunk_bits = CHAR_BIT * sizeof (unsigned int) };
+-  /* The number of chunks is ceil (sizeof (TYPE) / sizeof (unsigned int))
+-     = (sizeof (TYPE) - 1) / sizeof (unsigned int) + 1. */
+-  enum { chunk_count = (sizeof (TYPE) - 1) / sizeof (unsigned int) + 1 };
+-
+-  if (chunk_count > 1)
+-    {
+-      size_t k;
+-
+-      /* It is tempting to write  if (!j)  here, but if we do this,
+-         Solaris 10/x86 "cc -O" miscompiles the code.  */
+-      if (!i)
+-        return 0;
+-      /* Unroll the first loop round.  k = 0.  */
+-      if ((unsigned int) j)
+-        return ffs ((unsigned int) j);
+-      /* Generic loop.  */
+-      for (k = 1; k < chunk_count - 1; k++)
+-        if ((unsigned int) (j >> (k * chunk_bits)) != 0)
+-          return k * chunk_bits + ffs ((unsigned int) (j >> (k * chunk_bits)));
+-    }
+-  /* Last loop round.  k = chunk_count - 1.  */
+-  return (chunk_count - 1) * chunk_bits
+-         + ffs ((unsigned int) (j >> ((chunk_count - 1) * chunk_bits)));
+-#endif
+-}

packages/bitcoin/build.sh

@@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="Bitcoin Core"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=22.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/bitcoin/bitcoin/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_CONFFILES="var/service/bitcoind/run var/service/bitcoind/log/run"
+TERMUX_PKG_SERVICE_SCRIPT=("bitcoind" 'exec bitcoind 2>&1')
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_BLACKLISTED_ARCHES="arm"
 
@@ -25,14 +25,3 @@ termux_step_pre_configure() {
 	(cd depends && make HOST=$TERMUX_HOST_PLATFORM NO_QT=1 -j $TERMUX_MAKE_PROCESSES)
 	./autogen.sh
 }
-
-termux_step_post_make_install() {
-	mkdir -p $TERMUX_PREFIX/var/service
-	cd $TERMUX_PREFIX/var/service
-	mkdir -p bitcoind/log
-	echo "#!$TERMUX_PREFIX/bin/sh" > bitcoind/run
-	echo 'exec bitcoind 2>&1' >> bitcoind/run
-	chmod +x bitcoind/run
-	touch bitcoind/down
-	ln -sf $TERMUX_PREFIX/share/termux-services/svlogger bitcoind/log/run
-}

packages/bk/build.sh

@@ -0,0 +1,22 @@
+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
+}

packages/boinctui/build.sh

@@ -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=4
+TERMUX_PKG_REVISION=5
 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"

packages/boost/boost-math-tools-header_deprecated.hpp.patch

@@ -0,0 +1,31 @@
+--- 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

packages/boost/build.sh

@@ -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=1
+TERMUX_PKG_REVISION=2
 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"

packages/brogue/build.sh

@@ -0,0 +1,21 @@
+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
+}

packages/brogue/curses-platform.c.patch

@@ -0,0 +1,28 @@
+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) {

packages/brogue/no_i586.patch

@@ -0,0 +1,12 @@
+--- ../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
+

packages/brogue/src-platform-platformdependent.c.patch

@@ -0,0 +1,11 @@
+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>

packages/btfs/build.sh

@@ -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.5.3
+TERMUX_PKG_VERSION=1.6.0
 TERMUX_PKG_SRCURL=https://github.com/TRON-US/go-btfs/archive/refs/tags/btfs-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=331cc8a2b3cf2f5813902685f562ab78f602b028c45507ab9d67d35664719942
+TERMUX_PKG_SHA256=27de546a83f2c7655a0dbe2bc12e6a8ca7c05ab52f1246263667396fd374f83e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+\.\d+\.\d+"
 TERMUX_PKG_BUILD_IN_SRC=true

packages/c-toxcore/build.sh

@@ -2,9 +2,9 @@ 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.12
+TERMUX_PKG_VERSION=0.2.13
 TERMUX_PKG_SRCURL=https://github.com/TokTok/toxcore/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=30ae3263c9b68d3bef06f799ba9d7a67e3fad447030625f0ffa4bb22684228b0
+TERMUX_PKG_SHA256=67114fa57504c58b695f5dce8ef85124d555f2c3c353d0d2615e6d4845114ab8
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libsodium"
 TERMUX_PKG_BREAKS="c-toxcore-dev"

packages/caddy/build.sh

@@ -2,9 +2,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_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.4.5
+TERMUX_PKG_VERSION=2.4.6
 TERMUX_PKG_SRCURL=https://github.com/caddyserver/caddy/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=f25a24dfd6398e02ed3e530621f800eb7c7496d302d0a86b6932c219e46320cd
+TERMUX_PKG_SHA256=5a450a4ff0d2dbd165d62f957ecdaebdc4bd0445c66a06a27d0025a82843402d
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make() {

packages/calc/build.sh

@@ -2,10 +2,9 @@ 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.13.0.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=2.14.0.8
 TERMUX_PKG_SRCURL=https://github.com/lcn2/calc/releases/download/v$TERMUX_PKG_VERSION/calc-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_SHA256=6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad
+TERMUX_PKG_SHA256=ad6a2c44eeea7e06efca5384f107ffaee7564407a7474d7cd4928a53b1a28386
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, readline"
 TERMUX_PKG_BUILD_IN_SRC=true

packages/cavez-of-phear/build.sh

@@ -0,0 +1,10 @@
+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"

packages/cavif-rs/build.sh

@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE="https://lib.rs/cavif"
-TERMUX_PKG_DESCRIPTION="Encoder/converter for AVIF images. Based on rav1e and avif-serialize."
+TERMUX_PKG_DESCRIPTION="AVIF image creator in pure Rust"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.3.1-win
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.3.3
 TERMUX_PKG_SRCURL=https://github.com/kornelski/cavif-rs/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0f76ae20081d2031881d51871dd5b66cf5c0bec441a22c605f5bbba7dc55c8a8
+TERMUX_PKG_SHA256=afbf1990916331d6d7a7cf02d1d5aa24b7837088a3830481466771751be69c84
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true

packages/cavif-rs/latest-rav1e.patch

@@ -1,18 +0,0 @@
-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;
- 

packages/cboard/build.sh

@@ -0,0 +1,22 @@
+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
+}

packages/cboard/configure.patch

@@ -0,0 +1,60 @@
+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
+ 
+ 

packages/cboard/libchess-pgn.c.patch

@@ -0,0 +1,20 @@
+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)

packages/ccache/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://ccache.samba.org
 TERMUX_PKG_DESCRIPTION="Compiler cache for fast recompilation of C/C++ code"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.4.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=4.5.1
 TERMUX_PKG_SRCURL=https://github.com/ccache/ccache/releases/download/v$TERMUX_PKG_VERSION/ccache-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=9200cafbaa5fd62c2600fccb40a18214e57747825e6cdcd76688b4b61c2dcba0
+TERMUX_PKG_SHA256=51186ebe0326365f4e6131e1caa8911de7da4aa6718efc00680322d63a759517
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="zlib, zstd"
 

packages/cgal/build.sh

@@ -0,0 +1,15 @@
+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
+"

packages/cgdb/build.sh

@@ -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=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198
 TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb"

packages/cgdb/disable-fdsan.patch

@@ -0,0 +1,35 @@
+--- ./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()) {

packages/chezmoi/build.sh

@@ -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.7.3
+TERMUX_PKG_VERSION=2.9.4
 TERMUX_PKG_SRCURL=https://github.com/twpayne/chezmoi/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=a9dbaa9bd55f1c1e1c82c7ae5b7b1933f907703d5bd9976b2c14321b8c1e0d90
+TERMUX_PKG_SHA256=fca10c19bea51e4e17ddd077f855c3d09be0730997ae50987552ce05190a54a5
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make() {

packages/clash/build.sh

@@ -2,10 +2,9 @@ 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.7.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=1.8.0
 TERMUX_PKG_SRCURL="https://github.com/Dreamacro/clash/archive/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=18c2ef10df608392435a1277d3f2e256c65bec3662bf0a6c325f02be6deb4fce
+TERMUX_PKG_SHA256=e1bae0ba88a0e2ba36702f95fe95fdc8fee58db4751b5b108ea600563c36a972
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {

packages/clpeak/build.sh

@@ -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=2
+TERMUX_PKG_REVISION=3
 _COMMIT=0777205be1d5681d5a76d46ec94588544e8462a5
 TERMUX_PKG_SRCURL=https://github.com/krrishnarraj/clpeak.git
 TERMUX_PKG_GIT_BRANCH=master
@@ -14,7 +14,8 @@ TERMUX_PKG_DEPENDS="libc++, ocl-icd"
 # Use master branch until next release
 
 termux_step_post_get_source() {
-	git pull
+	git fetch --unshallow
 	git reset --hard ${_COMMIT}
-	git submodule foreach --recursive git reset --hard
+	git submodule deinit --force --all
+	git submodule update --init --recursive
 }

packages/clvk/build.sh

@@ -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.20211027
-_COMMIT=ed030247b3a32851f4d9787c162dbf8be5a665c2
+TERMUX_PKG_VERSION=0.0.20211121
+_COMMIT=d8d02aac8ac3e9256e75f3143214777cc3a162e9
 TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git
 TERMUX_PKG_GIT_BRANCH=master
 TERMUX_PKG_BUILD_DEPENDS="vulkan-loader-android"
@@ -42,9 +42,10 @@ 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 pull
+	git fetch --unshallow
 	git reset --hard ${_COMMIT}
-	git submodule foreach --recursive git reset --hard
+	git submodule deinit --force --all
+	git submodule update --init --recursive
 	./external/clspv/utils/fetch_sources.py --deps llvm
 }
 

packages/cmake/Source-cmake.cxx.patch

@@ -1,22 +0,0 @@
-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());

packages/cmake/build.sh

@@ -3,10 +3,9 @@ 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.21.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=3.22.1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
+TERMUX_PKG_SHA256=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
 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"

packages/command-not-found/build.sh

@@ -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.66
+TERMUX_PKG_VERSION=1.70
 TERMUX_PKG_SRCURL=https://github.com/termux/command-not-found/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4a8765a45930715cabc931bd38c4553572db5a4952412cc333910248fd83c8bb
+TERMUX_PKG_SHA256=57f0a39b74ddf90f2b2307122b853f0c522ffe888b999762439d5c525b9f2899

packages/cpio/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="CPIO implementation from the GNU project"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.13
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/cpio/cpio-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_SHA256=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
 TERMUX_PKG_DEPENDS="tar"

packages/cpio/global.c.patch

@@ -0,0 +1,11 @@
+--- ../global.c.orig	2021-11-17 20:03:46.273607977 +0000
++++ ./src/global.c	2021-11-17 20:04:24.600257641 +0000
+@@ -185,7 +185,7 @@
+ bool to_stdout_option = false;
+ 
+ /* The name this program was run with.  */
+-char *program_name;
++extern char *program_name;
+ 
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */

packages/cppcheck/build.sh

@@ -2,6 +2,7 @@ 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.1
+TERMUX_PKG_VERSION=2.6.2
+TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_SRCURL=https://github.com/danmar/cppcheck/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=41700db44b349428d5602356b32183b7776380e7a5b0b82a2f2764fadadb015e
+TERMUX_PKG_SHA256=a11602c15bf951ba5bb67655ca6c06986ec64770d8004759a8c53db013286a5e

packages/cpufetch/Makefile.patch

@@ -0,0 +1,11 @@
+--- ./Makefile	2021-08-23 09:31:46.000000000 +0200
++++ ./Makefile.mod	2021-11-08 12:26:17.099489918 +0200
+@@ -11,7 +11,7 @@
+ COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h
+ 
+ ifneq ($(OS),Windows_NT)
+-	arch := $(shell uname -m)
++	arch := ${TERMUX_ARCH}
+ 	ifeq ($(arch), $(filter $(arch), x86_64 amd64 i686))
+ 		SRC_DIR=src/x86/
+ 		SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c

packages/cpufetch/build.sh

@@ -0,0 +1,8 @@
+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_SRCURL=https://github.com/Dr-Noob/cpufetch/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=d4fe25adc4d12f5f1dc7a7e70a4ed92e9807b6a1ad0294c563a0250f7bd6aca1
+TERMUX_PKG_BUILD_IN_SRC=true

packages/croc/build.sh

@@ -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.4.2
+TERMUX_PKG_VERSION=9.5.0
 TERMUX_PKG_SRCURL=https://github.com/schollz/croc/releases/download/v${TERMUX_PKG_VERSION}/croc_${TERMUX_PKG_VERSION}_src.tar.gz
-TERMUX_PKG_SHA256=f4aacf189eb977d0b6b2d5a0340b3edcccce0c449da6bef0577665647b2efbda
+TERMUX_PKG_SHA256=ed3cdaaf88bee851f7629a19968435c4259b88925a7c214a153e691f71335686
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 

packages/curseofwar/CMakeLists.txt.patch

@@ -0,0 +1,16 @@
+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

packages/curseofwar/build.sh

@@ -0,0 +1,16 @@
+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
+}

packages/curseofwar/include_arpa_inet_h.patch

@@ -0,0 +1,11 @@
+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
+ 

packages/curseofwar/no_hardcoded_cc.patch

@@ -0,0 +1,9 @@
+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

packages/curseofwar/path.c.patch

@@ -0,0 +1,19 @@
+--- ../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));

packages/dar/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A full featured command-line backup tool, short for Disk
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.7.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/dar/dar/${TERMUX_PKG_VERSION}/dar-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=973fa977c19b32b1f9ecb62153c810ba8696f644eca048f214c77ad0e8eca255
 TERMUX_PKG_DEPENDS="attr, libbz2, libgcrypt, liblzma, liblzo, zlib"

packages/dbus/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://dbus.freedesktop.org
 TERMUX_PKG_DESCRIPTION="Freedesktop.org message bus system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=1.12.20
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus/dbus-$TERMUX_PKG_VERSION.tar.gz"
-TERMUX_PKG_SHA256=f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
+TERMUX_PKG_VERSION=1.13.18
+TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus/dbus-$TERMUX_PKG_VERSION.tar.xz"
+TERMUX_PKG_SHA256=8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e
 TERMUX_PKG_DEPENDS="libexpat, libx11"
 TERMUX_PKG_BREAKS="dbus-dev"
 TERMUX_PKG_REPLACES="dbus-dev"
@@ -23,7 +22,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 
 termux_step_pre_configure() {
 	export LIBS="-llog"
-	autoreconf -fi
 }
 
 termux_step_create_debscripts() {

packages/debootstrap/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://wiki.debian.org/Debootstrap
 TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.0.124
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.0.125
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=7700e9864b29f166b26c54153ed8c275b46f4b9a60468bb607e019a64c16cd8f
+TERMUX_PKG_SHA256=9c4c7ca8f3f6653e7eca65aae77bbf7f723d7395fb48403bbc2256ce8b24ec1a
 TERMUX_PKG_DEPENDS="perl, proot, wget"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

packages/debootstrap/functions.patch

@@ -1,26 +1,17 @@
-diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
---- debootstrap-1.0.120/functions	2020-03-07 19:01:59.000000000 +0200
-+++ debootstrap-1.0.120.mod/functions	2020-03-08 19:42:15.194564546 +0200
-@@ -230,17 +230,7 @@
+diff -uNr debootstrap/functions debootstrap.mod/functions
+--- debootstrap/functions	2021-08-19 14:49:19.000000000 +0300
++++ debootstrap.mod/functions	2021-11-06 20:56:36.542688226 +0200
+@@ -231,6 +231,9 @@
  }
  
  detect_container () {
--	if [ "$container" = lxc ]; then
--		CONTAINER="lxc"
--	elif grep -qs container=lxc-libvirt /proc/1/environ; then
--		CONTAINER="lxc-libvirt"
--	elif grep -qs ^systemd-nspawn$ /run/systemd/container || grep -qs systemd-nspawn /proc/1/environ || [ "$container" = "systemd-nspawn" ]; then
--		CONTAINER="systemd-nspawn"
--	elif grep -qs '[[:space:]]/docker/.*/sys/fs/cgroup' /proc/1/mountinfo; then
--		CONTAINER="docker"
--	else
--		CONTAINER=""
--	fi
-+	CONTAINER=""
- }
- 
- ########################################################## variant handling
-@@ -965,7 +955,7 @@
++	#termux
++	return
++
+ 	if [ "$container" = lxc ]; then
+ 		CONTAINER="lxc"
+ 	elif grep -qs container=lxc-libvirt /proc/1/environ; then
+@@ -974,7 +977,7 @@
  extract_dpkg_deb_data () {
  	local pkg="$1"
  
@@ -29,7 +20,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
  }
  
  # Raw .deb extractors
-@@ -1005,7 +995,7 @@
+@@ -1016,7 +1019,7 @@
  	esac
  
  	if in_path "$cat_cmd"; then
@@ -38,7 +29,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
  	else
  		error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
  	fi
-@@ -1061,7 +1051,7 @@
+@@ -1073,7 +1076,7 @@
  ); }
  
  in_target_nofail () {
@@ -47,7 +38,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
  		true
  	fi
  	return 0
-@@ -1073,7 +1063,7 @@
+@@ -1085,7 +1088,7 @@
  	msg="$2"
  	arg="$3"
  	shift; shift; shift
@@ -56,7 +47,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
  		warning "$code" "$msg" "$arg"
  		# Try to point user at actual failing package.
  		msg="See %s for details"
-@@ -1250,7 +1240,6 @@
+@@ -1249,7 +1252,6 @@
  			return 0
  		fi
  

packages/delve/build.sh

@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/go-delve/delve
 TERMUX_PKG_DESCRIPTION="A debugger for the Go programming language"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Krishna kanhaiya @kcubeterm"
-TERMUX_PKG_VERSION=1.7.2
+TERMUX_PKG_VERSION=1.7.3
 TERMUX_PKG_DEPENDS="golang, git"
 TERMUX_PKG_SRCURL=https://github.com/go-delve/delve/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=c2eb068d5677e114286b38f57f784b3792dbd2db06743bb57217611a092b31f2
+TERMUX_PKG_SHA256=961642eb4cd97e11093dda81273971a45e64abb2fe7db39165072c7145f4fcec
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
 

packages/dialog/build.sh

@@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://invisible-island.net/dialog/
 TERMUX_PKG_DESCRIPTION="Application used in shell scripts which displays text user interface widgets"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_VERSION="1.3-20210621"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
+TERMUX_PKG_VERSION="1.3-20211214"
 TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/dialog-${TERMUX_PKG_VERSION}.tgz
-TERMUX_PKG_SHA256=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
+TERMUX_PKG_SHA256=cc2965e05c6a8c37070b36b56414eaa560df8d87f2cea21759e28950e9b27a4b
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ncursesw --enable-widec --with-pkg-config"
 
 termux_step_pre_configure() {
@@ -21,6 +21,4 @@ termux_step_pre_configure() {
 
 termux_step_post_make_install() {
 	rm $TERMUX_PREFIX/lib/libtinfo.so
-	cd $TERMUX_PREFIX/bin
-	ln -f -s dialog whiptail
 }

packages/diffstat/build.sh

@@ -0,0 +1,8 @@
+TERMUX_PKG_HOMEPAGE=https://invisible-island.net/diffstat/diffstat.html
+TERMUX_PKG_DESCRIPTION="Displays a histogram of changes to a file"
+TERMUX_PKG_LICENSE="MIT"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=1.64
+#TERMUX_PKG_SRCURL=https://invisible-mirror.net/archives/diffstat/diffstat-${TERMUX_PKG_VERSION}.tgz
+TERMUX_PKG_SRCURL=https://invisible-island.net/datafiles/release/diffstat.tar.gz
+TERMUX_PKG_SHA256=b8aee38d9d2e1d05926e6b55810a9d2c2dd407f24d6a267387563a4436e3f7fc

packages/diffstat/diffstat.c.patch

@@ -0,0 +1,11 @@
+--- a/diffstat.c
++++ b/diffstat.c
+@@ -3142,7 +3142,7 @@ copy_stdin(char **dirpath)
+     const char *tmp = getenv("TMPDIR");
+     char *result = 0;
+     if (tmp == 0)
+-	tmp = "/tmp/";
++	tmp = "@TERMUX_PREFIX@/tmp/";
+     *dirpath = xmalloc(strlen(tmp) + 12);
+ 
+     strcpy(*dirpath, tmp);

packages/direnv/GNUmakefile.patch

@@ -0,0 +1,11 @@
+--- ./GNUmakefile.orig	2021-09-07 19:57:19.175164197 +0000
++++ ./GNUmakefile	2021-09-07 19:57:28.528497597 +0000
+@@ -3,7 +3,7 @@
+ ############################################################################
+ 
+ # Set this to change the target installation path
+-PREFIX   = /usr/local
++PREFIX  ?= /usr/local
+ BINDIR   = ${PREFIX}/bin
+ SHAREDIR = ${PREFIX}/share
+ MANDIR   = ${SHAREDIR}/man

packages/direnv/build.sh

@@ -2,17 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://github.com/direnv/direnv
 TERMUX_PKG_DESCRIPTION="Environment switcher for shell"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.28.0
+TERMUX_PKG_VERSION=2.29.0
 TERMUX_PKG_SRCURL=https://github.com/direnv/direnv/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=fa539c63034b6161d8238299bb516dcec79e8905cd43ff2b9559ad6bf047cc93
+TERMUX_PKG_SHA256=a0ceb76a58a6ca81a8669a9ef2631fbad41d7c1a27cc0ec738c71c6d71f9751f
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_make() {
+termux_step_pre_configure() {
  	termux_setup_golang
-	make
-}
-
-termux_step_make_install() {
-	make install PREFIX=$TERMUX_PREFIX
 }

packages/diskus/build.sh

@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/sharkdp/diskus
 TERMUX_PKG_DESCRIPTION="A minimal, fast alternative to 'du -sh'"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.6.0
+TERMUX_PKG_VERSION=0.7.0
 TERMUX_PKG_SRCURL=https://github.com/sharkdp/diskus/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=661687edefa3218833677660a38ccd4e2a3c45c4a66055c5bfa4667358b97500
+TERMUX_PKG_SHA256=64b1b2e397ef4de81ea20274f98ec418b0fe19b025860e33beaba5494d3b8bd1
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true

packages/dmagnetic/Makefile.patch

@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2021-07-24 10:36:40.069413331 +0200
++++ ./Makefile	2021-07-24 10:40:29.069413167 +0200
+@@ -99,7 +99,7 @@
+ 	cp dMagneticini.5 $(INSTALLMAN)/man5/
+ 	cp README.txt $(INSTALLSHARE)/dMagnetic/
+ 	cp LICENSE.txt $(INSTALLSHARE)/dMagnetic/
+-	cp dMagnetic.ini $(INSTALLSHARE)/dMagnetic/
++	cp dMagnetic.ini $(INSTALLSHARE)/
+ 
+ 
+ dMagnetic:	$(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL)

packages/dmagnetic/build.sh

@@ -0,0 +1,30 @@
+TERMUX_PKG_HOMEPAGE=https://www.dettus.net/dMagnetic
+TERMUX_PKG_DESCRIPTION="Interpreter for classic text adventure games and interactive fiction"
+TERMUX_PKG_LICENSE="BSD 2-Clause"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=0.32
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://www.dettus.net/dMagnetic/dMagnetic_${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=9671b863cbb126e122923fa974806ff0e998af471c98e878c1392c20a3606206
+TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_HOSTBUILD=true
+TERMUX_PKG_GROUPS="games"
+
+termux_step_host_build() {
+	cd $TERMUX_PKG_BUILDDIR
+	make -j $TERMUX_MAKE_PROCESSES dMagnetic
+	mv dMagnetic $TERMUX_PKG_HOSTBUILD_DIR/
+	make clean
+}
+
+termux_step_post_configure() {
+	# find our host-built dMagnetic
+	export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
+}
+
+termux_step_post_make_install() {
+	sed "s%@TERMUX_PREFIX@%$TERMUX_PREFIX%g" \
+	    $TERMUX_PKG_BUILDER_DIR/magnetic-scrolls.in \
+	    > $TERMUX_PREFIX/bin/magnetic-scrolls
+	chmod 700 $TERMUX_PREFIX/bin/magnetic-scrolls
+}

packages/dmagnetic/change-prefix.patch.beforehostbuild

@@ -0,0 +1,29 @@
+--- ./src/toplevel/dMagnetic_pathnames.h.orig	2021-07-24 11:07:51.905404851 +0200
++++ ./src/toplevel/dMagnetic_pathnames.h	2021-07-24 11:08:56.145404805 +0200
+@@ -33,16 +33,16 @@
+ // some distributions require a specific prefix before the pathnames.
+ // those macros allow them to patch the prefixes in a centralized location.
+ 
+-#define	PATH_ETC			"/etc/"
+-#define	PATH_USR			"/usr/"
+-#define	PATH_USR_LOCAL			"/usr/local/"
+-#define	PATH_USR_LOCAL_SHARE		"/usr/local/share/"
+-#define	PATH_USR_LOCAL_SHARE_GAMES	"/usr/local/share/games/"
+-#define	PATH_USR_LOCAL_GAMES		"/usr/local/games/"
+-#define	PATH_USR_SHARE			"/usr/share/"
+-#define	PATH_USR_SHARE_GAMES		"/usr/share/games/"
+-#define	PATH_USR_GAMES			"/usr/games/"
+-#define	PATH_USR_PKG_SHARE		"/usr/pkg/share/"
++#define	PATH_ETC			"@TERMUX_PREFIX@/etc/"
++#define	PATH_USR			"@TERMUX_PREFIX@/"
++#define	PATH_USR_LOCAL			"@TERMUX_PREFIX@/local/"
++#define	PATH_USR_LOCAL_SHARE		"@TERMUX_PREFIX@/local/share/"
++#define	PATH_USR_LOCAL_SHARE_GAMES	"@TERMUX_PREFIX@/local/share/games/"
++#define	PATH_USR_LOCAL_GAMES		"@TERMUX_PREFIX@/local/games/"
++#define	PATH_USR_SHARE			"@TERMUX_PREFIX@/share/"
++#define	PATH_USR_SHARE_GAMES		"@TERMUX_PREFIX@/share/games/"
++#define	PATH_USR_GAMES			"@TERMUX_PREFIX@/games/"
++#define	PATH_USR_PKG_SHARE		"@TERMUX_PREFIX@/pkg/share/"
+ 
+ 
+ #endif

packages/dmagnetic/dMagnetic_helpscreens.c.patch.beforehostbuild

@@ -0,0 +1,28 @@
+--- ./src/toplevel/dMagnetic_helpscreens.c.orig	2021-07-22 23:13:51.000000000 +0200
++++ ./src/toplevel/dMagnetic_helpscreens.c	2021-07-24 11:23:49.169384729 +0200
+@@ -70,10 +70,10 @@
+ } tGameInfo;
+ 
+ const tPlatformInfo	cdMagnetic_platformInfo[NUMPLATFORMS]={
+-	{"mag",		PATH_USR_LOCAL_SHARE_GAMES"magneticscrolls/",	".mag"	,0,0,1,1,	PLATFORM_MAG,		"-mag MAGFILE.mag"},
+-	{"gfx",		PATH_USR_LOCAL_SHARE_GAMES"magneticscrolls/",	".gfx"	,0,0,1,1,	PLATFORM_GFX,		"-gfx GFXFILE.gfx"},
++	{"mag",		PATH_USR_SHARE_GAMES"magneticscrolls/",	".mag"	,0,0,1,1,	PLATFORM_MAG,		"-mag MAGFILE.mag"},
++	{"gfx",		PATH_USR_SHARE_GAMES"magneticscrolls/",	".gfx"	,0,0,1,1,	PLATFORM_GFX,		"-gfx GFXFILE.gfx"},
+ 	{"msdos",	"/MSDOS/C/",					""	,1,0,1,0,	PLATFORM_MSDOS,		"-msdosdir DIRECTORY/"},
+-	{"tworsc",	PATH_USR_LOCAL_SHARE"games/",			"TWO.RSC",0,1,1,0,	PLATFORM_TWORSC,	"-tworsc DIRECTORY/TWO.RSC"},
++	{"tworsc",	PATH_USR_SHARE"games/",			"TWO.RSC",0,1,1,0,	PLATFORM_TWORSC,	"-tworsc DIRECTORY/TWO.RSC"},
+ 	{"d64",		"/8/",						".D64"	,1,0,2,0,	PLATFORM_D64,		"-d64 IMAGE1.d64,IMAGE2.d64"},
+ 	{"amstradcpc",	"/dsk/amstradcpc/",				".DSK"	,1,0,2,0,	PLATFORM_AMSTRADCPC,	"-amstradcpc IMAGE1.DSK,IMAGE2.DSK"},
+ 	{"spectrum",	"/dsk/spectrum/",				".DSK"	,0,0,1,0,	PLATFORM_SPECTRUM,	"-spectrum IMAGE.DSK"},
+@@ -286,8 +286,9 @@
+ 		fprintf(stderr,"%s %s\n",argv0,cdMagnetic_platformInfo[i].cmdline);
+ 	}
+ 	fprintf(stderr,"\n");
+-	fprintf(stderr,"You can get the .mag and .gfx files from\n");
+-	fprintf(stderr," https://msmemorial.if-legends.org/\n");
++	fprintf(stderr,"You can download the .mag and .gfx files using the\n");
++	fprintf(stderr,"'magnetic-scrolls'-script, or manually by visiting\n");
++	fprintf(stderr,"https://msmemorial.if-legends.org/\n");
+ 	fprintf(stderr,"\n");
+ 	fprintf(stderr,"To get a more detailed help, please run\n");
+ 	fprintf(stderr," %s --help\n",argv0);