libcln: bump revision

2021-10-23 17:00:47 +02:00
1045 changed files with 3540 additions and 29081 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
-
@@ -7,7 +7,6 @@ on:

 jobs:
  update-packages:
-    if: github.repository == 'termux/termux-packages'
    runs-on: ubuntu-latest
    steps:
    - name: Clone repository
@@ -9,11 +9,6 @@ on:
  pull_request:
    paths:
    - 'packages/**'
-  workflow_dispatch:
-    inputs:
-      packages:
-        description: "A space-separated names of packages selected for rebuilding"
-        required: true

 jobs:
  build:
@@ -32,83 +27,72 @@ jobs:
        fetch-depth: 1000
    - name: Build
      run: |
-        if [ "${{ github.event_name }}" != "workflow_dispatch" ]; then
-          BASE_COMMIT=$(jq --raw-output .pull_request.base.sha "$GITHUB_EVENT_PATH")
-          OLD_COMMIT=$(jq --raw-output .commits[0].id "$GITHUB_EVENT_PATH")
-          HEAD_COMMIT=$(jq --raw-output .commits[-1].id "$GITHUB_EVENT_PATH")
-          if [ "$BASE_COMMIT" = "null" ]; then
-            if [ "$OLD_COMMIT" = "$HEAD_COMMIT" ]; then
-              # Single-commit push.
-              echo "Processing commit: ${HEAD_COMMIT}"
-              CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${HEAD_COMMIT}")
-            else
-              # Multi-commit push.
-              OLD_COMMIT="${OLD_COMMIT}~1"
-              echo "Processing commit range: ${OLD_COMMIT}..${HEAD_COMMIT}"
-              CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${OLD_COMMIT}" "${HEAD_COMMIT}")
-            fi
+        BASE_COMMIT=$(jq --raw-output .pull_request.base.sha "$GITHUB_EVENT_PATH")
+        OLD_COMMIT=$(jq --raw-output .commits[0].id "$GITHUB_EVENT_PATH")
+        HEAD_COMMIT=$(jq --raw-output .commits[-1].id "$GITHUB_EVENT_PATH")
+        if [ "$BASE_COMMIT" = "null" ]; then
+          if [ "$OLD_COMMIT" = "$HEAD_COMMIT" ]; then
+            # Single-commit push.
+            echo "Processing commit: ${HEAD_COMMIT}"
+            CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${HEAD_COMMIT}")
          else
-            # Pull requests.
-            echo "Processing pull request #$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH"): ${BASE_COMMIT}..HEAD"
-            CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${BASE_COMMIT}" "HEAD")
+            # Multi-commit push.
+            OLD_COMMIT="${OLD_COMMIT}~1"
+            echo "Processing commit range: ${OLD_COMMIT}..${HEAD_COMMIT}"
+            CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${OLD_COMMIT}" "${HEAD_COMMIT}")
          fi
+        else
+          # Pull requests.
+          echo "Processing pull request #$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH"): ${BASE_COMMIT}..HEAD"
+          CHANGED_FILES=$(git diff-tree --no-commit-id --name-only -r "${BASE_COMMIT}" "HEAD")
        fi
        mkdir -p ./artifacts ./debs
        touch ./debs/.placeholder
-        if [ "${{ github.event_name }}" != "workflow_dispatch" ]; then
-          # Process tag '%ci:no-build' that may be added as line to commit message.
-          # Forces CI to cancel current build with status 'passed'.
-          if grep -qiP '^\s*%ci:no-build\s*$' <(git log --format="%B" -n 1 "HEAD"); then
-            tar cf artifacts/debs-${{ matrix.target_arch }}.tar debs
-            echo "[!] Force exiting as tag '%ci:no-build' was applied to HEAD commit message."
-            exit 0
-          fi
-          # Build local Docker image if setup scripts were changed.
-          # Useful for pull requests submitting changes for both build environment and packages.
-          if grep -qP '^scripts/(Dockerfile|setup-ubuntu\.sh)$' <<< "$CHANGED_FILES"; then
-            echo "Detected changes for environment setup scripts. Building custom Docker image now."
-            cd ./scripts
-            docker build -t termux/package-builder:latest .
-            cd ..
-          fi
-          # Parse changed files and identify new packages and deleted packages.
-          # Create lists of those packages that will be passed to upload job for
-          # further processing.
-          while read -r file; do
-            if ! [[ $file == packages/* ]]; then
-              # 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
-              # 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
-              # package, check if it was deleted or updated
-              pkg=${BASH_REMATCH[1]}
-              if [ ! -d "packages/${pkg}" ]; then
-                echo "$pkg" >> ./deleted_packages.txt
-              else
-                echo "$pkg" >> ./built_packages.txt
-                # If there are subpackages we want to create a list of those
-                # as well
-                for file in $(find "packages/${pkg}/" -maxdepth 1 -type f -name \*.subpackage.sh | sort); do
-                  echo "$(basename "${file%%.subpackage.sh}")" >> ./built_subpackages.txt
-                done
-              fi
-            fi
-          done<<<${CHANGED_FILES}
-        else
-          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
+        # Process tag '%ci:no-build' that may be added as line to commit message.
+        # Forces CI to cancel current build with status 'passed'.
+        if grep -qiP '^\s*%ci:no-build\s*$' <(git log --format="%B" -n 1 "HEAD"); then
+          tar cf artifacts/debs-${{ matrix.target_arch }}.tar debs
+          echo "[!] Force exiting as tag '%ci:no-build' was applied to HEAD commit message."
+          exit 0
        fi
+        # Build local Docker image if setup scripts were changed.
+        # Useful for pull requests submitting changes for both build environment and packages.
+        if grep -qP '^scripts/(Dockerfile|setup-ubuntu\.sh)$' <<< "$CHANGED_FILES"; then
+          echo "Detected changes for environment setup scripts. Building custom Docker image now."
+          cd ./scripts
+          docker build -t termux/package-builder:latest .
+          cd ..
+        fi
+        # Parse changed files and identify new packages and deleted packages.
+        # Create lists of those packages that will be passed to upload job for
+        # further processing.
+        while read -r file; do
+          if ! [[ $file == packages/* ]]; then
+            # 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
+            # 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
+            # package, check if it was deleted or updated
+            pkg=${BASH_REMATCH[1]}
+            if [ ! -d "packages/${pkg}" ]; then
+              echo "$pkg" >> ./deleted_packages.txt
+            else
+              echo "$pkg" >> ./built_packages.txt
+              # If there are subpackages we want to create a list of those
+              # as well
+              for file in $(find "packages/${pkg}/" -maxdepth 1 -type f -name \*.subpackage.sh | sort); do
+                echo "$(basename "${file%%.subpackage.sh}")" >> ./built_subpackages.txt
+              done
+            fi
+          fi
+        done<<<${CHANGED_FILES}

        # Fix so that lists do not contain duplicates
        if [ -f ./built_packages.txt ]; then
@@ -287,19 +271,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.
@@ -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/641256914684084234.svg?label=&logo=discord&logoColor=ffffff&color=5865F2)](https://discord.gg/HXpF69X)
+[![Join the Termux discord server](https://img.shields.io/discord/591914197219016707.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>

@@ -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 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"
@@ -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
+"
@@ -0,0 +1,6 @@
+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"
@@ -1,6 +1,9 @@
--- ./src/Makefile.am.orig	2021-11-10 10:12:52.155281162 +0100
-+++ ./src/Makefile.am	2021-11-10 10:13:10.452346589 +0100
-@@ -16,19 +16,19 @@
+Hard links are not supported on Android 6.0+
+
+diff -u -r ../lrzsz-0.12.20/src/Makefile.in ./src/Makefile.in
+--- ../lrzsz-0.12.20/src/Makefile.in	1998-12-30 17:31:46.000000000 +0100
+++ ./src/Makefile.in	2017-01-25 01:17:46.135033894 +0100
+@@ -370,16 +370,16 @@
 
 install-exec-local:
 	rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
@@ -20,8 +23,4 @@
 +	ln -s $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
 		$(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
 #	rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
-#	ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
-+#	ln -s $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
- #		$(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
- 
- uninstall-local:
+ #	ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
@@ -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,58 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://bellard.org/tcc/
-TERMUX_PKG_DESCRIPTION="Tiny C Compiler"
-TERMUX_PKG_LICENSE="LGPL-2.1"
-TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=1:0.9.27
-TERMUX_PKG_REVISION=10
-TERMUX_PKG_SRCURL=https://repo.or.cz/tinycc.git/snapshot/fef838db2d124db3f1357385972371ccba7af2c6.tar.gz
-TERMUX_PKG_SHA256=f6a022994b9903485a1777540c0c9e0571990fc339a2b325be6127b616534f33
-TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_NO_STATICSPLIT=true
-
-termux_step_configure() {
-	unset CFLAGS CXXFLAGS
-
-	if [ "${TERMUX_ARCH}" = "arm" ] || [ "${TERMUX_ARCH}" = "i686" ]; then
-		ELF_INTERPRETER_PATH="/system/bin/linker"
-		ANDROID_LIB_PATH="/system/lib:/system/vendor/lib"
-	else
-		ELF_INTERPRETER_PATH="/system/bin/linker64"
-		ANDROID_LIB_PATH="/system/lib64:/system/vendor/lib64"
-	fi
-}
-
-termux_step_make() {
-	(
-		unset CC CFLAGS LDFLAGS
-		./configure --prefix="/tmp/tcc.host" --cpu="${TERMUX_ARCH}"
-		make -j $TERMUX_MAKE_PROCESSES tcc
-		mv -f tcc tcc.host
-		make distclean
-	)
-
-	./configure \
-		--prefix="$TERMUX_PREFIX" \
-		--cross-prefix="${CC//clang}" \
-		--cc="clang" \
-		--cpu="$TERMUX_ARCH" \
-		--disable-rpath \
-		--elfinterp="$ELF_INTERPRETER_PATH" \
-		--crtprefix="$TERMUX_PREFIX/lib/tcc/crt" \
-		--sysincludepaths="$TERMUX_PREFIX/include:$TERMUX_PREFIX/lib/tcc/include" \
-		--libpaths="$TERMUX_PREFIX/lib:$TERMUX_PREFIX/lib/tcc:$ANDROID_LIB_PATH"
-
-	mv tcc.host tcc
-	touch -d "next minute" tcc
-	make -j ${TERMUX_MAKE_PROCESSES} libtcc1.a
-
-	rm -f tcc
-	make -j ${TERMUX_MAKE_PROCESSES} tcc
-
-	make install
-
-	for file in crtbegin_dynamic.o crtbegin_so.o crtend_android.o crtend_so.o; do
-		install -Dm600 \
-			"${TERMUX_STANDALONE_TOOLCHAIN}/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/$file" \
-			"${TERMUX_PREFIX}/lib/tcc/crt/$file"
-	done
-}
@@ -1,25 +0,0 @@
-diff -uNr tcc-0.9.27/libtcc.c tcc-0.9.27.mod/libtcc.c
--- tcc-0.9.27/libtcc.c	2017-12-17 10:27:05.000000000 +0200
-+++ tcc-0.9.27.mod/libtcc.c	2018-08-09 19:25:44.086756864 +0300
-@@ -974,9 +974,20 @@
-     /* add libc crt1/crti objects */
-     if ((output_type == TCC_OUTPUT_EXE || output_type == TCC_OUTPUT_DLL) &&
-         !s->nostdlib) {
-        if (output_type != TCC_OUTPUT_DLL)
-+
-+#ifdef __ANDROID__
-+        if (output_type != TCC_OUTPUT_DLL) {
-+            tcc_add_crt(s, "crtbegin_dynamic.o");
-+        } else {
-+            tcc_add_crt(s, "crtbegin_so.o");
-+        }
-+#else
-+        if (output_type != TCC_OUTPUT_DLL) {
-             tcc_add_crt(s, "crt1.o");
-+        }
-         tcc_add_crt(s, "crti.o");
-+#endif // __ANDROID__
-+
-     }
- #endif
-     return 0;
@@ -1,22 +0,0 @@
-diff -uNr tcc-0.9.27/tccelf.c tcc-0.9.27.mod/tccelf.c
--- tcc-0.9.27/tccelf.c	2017-12-17 10:27:05.000000000 +0200
-+++ tcc-0.9.27.mod/tccelf.c	2018-08-09 19:28:33.036752853 +0300
-@@ -1202,8 +1202,17 @@
- #endif
-         tcc_add_support(s1, TCC_LIBTCC1);
-         /* add crt end if not memory output */
-        if (s1->output_type != TCC_OUTPUT_MEMORY)
-+        if (s1->output_type != TCC_OUTPUT_MEMORY) {
-+#ifdef __ANDROID__
-+            if (s1->output_type == TCC_OUTPUT_DLL) {
-+                tcc_add_crt(s1, "crtend_so.o");
-+            } else {
-+                tcc_add_crt(s1, "crtend_android.o");
-+            }
-+#else
-             tcc_add_crt(s1, "crtn.o");
-+#endif
-+        }
-     }
- }
- 
@@ -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"
-}
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://algernon.roboticoverlords.org/
 TERMUX_PKG_DESCRIPTION="Small self-contained web server with Lua, Markdown, QUIC, Redis and PostgreSQL support"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.12.14
+TERMUX_PKG_VERSION=1.12.12
 TERMUX_PKG_SRCURL=https://github.com/xyproto/algernon/archive/$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=cab5b01923142e0326ea2a01797814bb2e8ea9f7c6c41a3ea0ae7df3b667e86e
+TERMUX_PKG_SHA256=6127eb975da960fd8aa7732c82f3b5e62d14ea763801778552bdbeec28846bf7
 TERMUX_PKG_AUTO_UPDATE=true

 termux_step_make() {
@@ -1,13 +0,0 @@
-https://github.com/lib/pq/pull/1060
-diff --git a/vendor/github.com/lib/pq/user_posix.go b/vendor/github.com/lib/pq/user_posix.go
-index a510192..33bc5b7 100644
--- a/vendor/github.com/lib/pq/user_posix.go
-+++ b/vendor/github.com/lib/pq/user_posix.go
-@@ -1,6 +1,6 @@
- // Package pq is a pure Go Postgres driver for the database/sql package.
- 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris rumprun
-+// +build aix darwin dragonfly freebsd linux,!android nacl netbsd openbsd plan9 solaris rumprun
- 
- package pq
- 
@@ -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
@@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/
 TERMUX_PKG_DESCRIPTION="Android platform tools"
 TERMUX_PKG_LICENSE="Apache-2.0, MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=31.0.3
+TERMUX_PKG_VERSION=31.0.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/nmeum/android-tools/releases/download/$TERMUX_PKG_VERSION/android-tools-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=d7d2d945b6e1a7ba0c7d0b68a6d21ada6914155bf3ca02ff06c9db628ae6b029
+TERMUX_PKG_SHA256=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, libusb, pcre2, googletest, libprotobuf, brotli, zstd, liblz4"

@@ -0,0 +1,334 @@
+diff -uNr android-tools-31.0.2/vendor/adb/sysdeps.h android-tools-31.0.2.mod/vendor/adb/sysdeps.h
+--- android-tools-31.0.2/vendor/adb/sysdeps.h	2021-07-20 11:13:01.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/adb/sysdeps.h	2021-10-08 09:55:05.170121003 +0000
+@@ -514,7 +514,11 @@
+ }
+ 
+ static inline int adb_getlogin_r(char* buf, size_t bufsize) {
+-    return getlogin_r(buf, bufsize);
+    char* logname = getlogin();
+    if (!logname) return ENXIO;
+    if (strlen(logname) >= bufsize) return ERANGE;
+    strcpy(buf, logname);
+    return 0;
+ }
+ 
+ static inline int adb_read(borrowed_fd fd, void* buf, size_t len) {
+diff -uNr android-tools-31.0.2/vendor/base/libs/androidfw/ResourceTypes.cpp android-tools-31.0.2.mod/vendor/base/libs/androidfw/ResourceTypes.cpp
+--- android-tools-31.0.2/vendor/base/libs/androidfw/ResourceTypes.cpp	2021-05-28 20:48:32.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/base/libs/androidfw/ResourceTypes.cpp	2021-10-08 09:55:05.174121003 +0000
+@@ -42,7 +42,7 @@
+ #include <utils/String16.h>
+ #include <utils/String8.h>
+ 
+-#ifdef __ANDROID__
+#if 0
+ #include <binder/TextOutput.h>
+ #endif
+ 
+diff -uNr android-tools-31.0.2/vendor/boringssl/crypto/CMakeLists.txt android-tools-31.0.2.mod/vendor/boringssl/crypto/CMakeLists.txt
+--- android-tools-31.0.2/vendor/boringssl/crypto/CMakeLists.txt	2021-06-02 15:08:20.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/boringssl/crypto/CMakeLists.txt	2021-10-08 09:55:05.175121003 +0000
+@@ -167,7 +167,7 @@
+ 
+ add_custom_command(
+   OUTPUT err_data.c
+-  COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
+  COMMAND GOOS=linux GOARCH=amd64 ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
+   DEPENDS
+   err/err_data_generate.go
+   err/asn1.errordata
+diff -uNr android-tools-31.0.2/vendor/CMakeLists.adb.txt android-tools-31.0.2.mod/vendor/CMakeLists.adb.txt
+--- android-tools-31.0.2/vendor/CMakeLists.adb.txt	2021-06-02 15:20:44.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/CMakeLists.adb.txt	2021-10-08 09:55:05.167121003 +0000
+@@ -192,7 +192,6 @@
+ 	brotlidec
+ 	brotlienc
+ 	lz4
+-	pthread
+ 	usb-1.0
+ 	z
+ 	zstd)
+diff -uNr android-tools-31.0.2/vendor/CMakeLists.fastboot.txt android-tools-31.0.2.mod/vendor/CMakeLists.fastboot.txt
+--- android-tools-31.0.2/vendor/CMakeLists.fastboot.txt	2021-07-15 11:17:07.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/CMakeLists.fastboot.txt	2021-10-08 09:55:05.168121003 +0000
+@@ -135,4 +135,4 @@
+ target_link_libraries(fastboot
+ 	libsparse libzip libcutils liblog libfsmgr libutil
+ 	libbase libext4 libselinux libsepol libdiagnoseusb crypto
+-	z pcre2-8 pthread dl)
+	z pcre2-8 dl)
+diff -uNr android-tools-31.0.2/vendor/CMakeLists.mke2fs.txt android-tools-31.0.2.mod/vendor/CMakeLists.mke2fs.txt
+--- android-tools-31.0.2/vendor/CMakeLists.mke2fs.txt	2021-06-02 15:20:41.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/CMakeLists.mke2fs.txt	2021-10-08 09:55:05.169121003 +0000
+@@ -112,6 +112,6 @@
+ 	e2fsprogs/misc/util.c)
+ 
+ target_link_libraries("${ANDROID_MKE2FS_NAME}"
+-	libext2fs libsparse libbase libzip liblog libutil pthread z)
+	libext2fs libsparse libbase libzip liblog libutil z)
+ target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
+ 	e2fsprogs/lib)
+diff -uNr android-tools-31.0.2/vendor/core/fs_mgr/liblp/utility.cpp android-tools-31.0.2.mod/vendor/core/fs_mgr/liblp/utility.cpp
+--- android-tools-31.0.2/vendor/core/fs_mgr/liblp/utility.cpp	2020-12-20 20:06:59.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/core/fs_mgr/liblp/utility.cpp	2021-10-08 09:55:05.176121003 +0000
+@@ -34,7 +34,7 @@
+ #include <ext4_utils/ext4_utils.h>
+ #include <openssl/sha.h>
+ 
+-#ifdef __ANDROID__
+#if 0
+ #include <cutils/android_get_control_file.h>
+ #endif
+ 
+@@ -208,7 +208,7 @@
+ }
+ 
+ base::unique_fd GetControlFileOrOpen(std::string_view path, int flags) {
+-#if defined(__ANDROID__)
+#if 0
+     int fd = android_get_control_file(path.data());
+     if (fd >= 0) {
+         int newfd = TEMP_FAILURE_RETRY(dup(fd));
+diff -uNr android-tools-31.0.2/vendor/core/init/reboot.cpp android-tools-31.0.2.mod/vendor/core/init/reboot.cpp
+--- android-tools-31.0.2/vendor/core/init/reboot.cpp	2021-07-20 11:13:01.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/core/init/reboot.cpp	2021-10-08 09:55:05.177121003 +0000
+@@ -246,7 +246,7 @@
+         if (dump) {
+             LOG(INFO) << "mount entry " << mentry->mnt_fsname << ":" << mentry->mnt_dir << " opts "
+                       << mentry->mnt_opts << " type " << mentry->mnt_type;
+-        } else if (MountEntry::IsBlockDevice(*mentry) && hasmntopt(mentry, "rw")) {
+        } else if (MountEntry::IsBlockDevice(*mentry) && 0) {
+             std::string mount_dir(mentry->mnt_dir);
+             // These are R/O partitions changed to R/W after adb remount.
+             // Do not umount them as shutdown critical services may rely on them.
+diff -uNr android-tools-31.0.2/vendor/core/libcutils/properties.cpp android-tools-31.0.2.mod/vendor/core/libcutils/properties.cpp
+--- android-tools-31.0.2/vendor/core/libcutils/properties.cpp	2020-12-20 20:06:59.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/core/libcutils/properties.cpp	2021-10-08 09:55:05.178121003 +0000
+@@ -91,7 +91,7 @@
+     return len;
+ }
+ 
+-#if __has_include(<sys/system_properties.h>)
+#if 0
+ 
+ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
+ #include <sys/_system_properties.h>
+diff -uNr android-tools-31.0.2/vendor/e2fsprogs/lib/ext2fs/ismounted.c android-tools-31.0.2.mod/vendor/e2fsprogs/lib/ext2fs/ismounted.c
+--- android-tools-31.0.2/vendor/e2fsprogs/lib/ext2fs/ismounted.c	2019-08-21 17:14:14.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/e2fsprogs/lib/ext2fs/ismounted.c	2021-10-08 09:55:05.178121003 +0000
+@@ -196,7 +196,7 @@
+ #endif /* __GNU__ */
+ 	*mount_flags = EXT2_MF_MOUNTED;
+ 
+-#ifdef MNTOPT_RO
+#if 0
+ 	/* Check to see if the ro option is set */
+ 	if (hasmntopt(mnt, MNTOPT_RO))
+ 		*mount_flags |= EXT2_MF_READONLY;
+diff -uNr android-tools-31.0.2/vendor/f2fs-tools/lib/libf2fs.c android-tools-31.0.2.mod/vendor/f2fs-tools/lib/libf2fs.c
+--- android-tools-31.0.2/vendor/f2fs-tools/lib/libf2fs.c	2020-12-20 12:53:55.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/f2fs-tools/lib/libf2fs.c	2021-10-08 09:55:05.179121003 +0000
+@@ -714,7 +714,7 @@
+ 
+ 	while ((mnt = getmntent(file)) != NULL) {
+ 		if (!strcmp(device, mnt->mnt_fsname)) {
+-#ifdef MNTOPT_RO
+#if 0
+ 			if (hasmntopt(mnt, MNTOPT_RO))
+ 				c.ro = 1;
+ #endif
+diff -uNr android-tools-31.0.2/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h android-tools-31.0.2.mod/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h
+--- android-tools-31.0.2/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h	2021-07-20 11:13:01.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h	2021-10-08 10:01:07.304004004 +0000
+@@ -23,6 +23,7 @@
+ #include <android-base/logging.h>
+ #include <android-base/off64_t.h>
+ 
+#undef __ANDROID__
+ #ifdef __ANDROID__
+ #include <linux/incrementalfs.h>
+ #endif
+@@ -400,4 +401,4 @@
+ 
+ } // namespace incfs
+ 
+-} // namespace android
+\ No newline at end of file
+} // namespace android
+diff -uNr android-tools-31.0.2/vendor/libbase/include/android-base/unique_fd.h android-tools-31.0.2.mod/vendor/libbase/include/android-base/unique_fd.h
+--- android-tools-31.0.2/vendor/libbase/include/android-base/unique_fd.h	2020-11-12 18:02:33.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/libbase/include/android-base/unique_fd.h	2021-10-08 09:55:05.180121003 +0000
+@@ -46,7 +46,7 @@
+ // unique_fd is also known as ScopedFd/ScopedFD/scoped_fd; mentioned here to help
+ // you find this class if you're searching for one of those names.
+ 
+-#if defined(__BIONIC__)
+#if 0
+ #include <android/fdsan.h>
+ #endif
+ 
+@@ -54,7 +54,7 @@
+ namespace base {
+ 
+ struct DefaultCloser {
+-#if defined(__BIONIC__)
+#if 0
+   static void Tag(int fd, void* old_addr, void* new_addr) {
+     if (android_fdsan_exchange_owner_tag) {
+       uint64_t old_tag = android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_UNIQUE_FD,
+diff -uNr android-tools-31.0.2/vendor/libbase/logging.cpp android-tools-31.0.2.mod/vendor/libbase/logging.cpp
+--- android-tools-31.0.2/vendor/libbase/logging.cpp	2021-07-20 11:13:01.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/libbase/logging.cpp	2021-10-08 09:55:05.180121003 +0000
+@@ -61,11 +61,17 @@
+ namespace android {
+ namespace base {
+ 
+#if defined(__linux__)
+extern "C" {
+extern char*  __progname;
+}
+#endif
+
+ // BSD-based systems like Android/macOS have getprogname(). Others need us to provide one.
+ #if defined(__linux__) || defined(_WIN32)
+ static const char* getprogname() {
+ #if defined(__linux__)
+-  return program_invocation_short_name;
+  return __progname;
+ #elif defined(_WIN32)
+   static bool first = true;
+   static char progname[MAX_PATH] = {};
+diff -uNr android-tools-31.0.2/vendor/libbase/properties.cpp android-tools-31.0.2.mod/vendor/libbase/properties.cpp
+--- android-tools-31.0.2/vendor/libbase/properties.cpp	2020-11-12 18:02:33.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/libbase/properties.cpp	2021-10-08 09:55:05.181121003 +0000
+@@ -16,7 +16,7 @@
+ 
+ #include "android-base/properties.h"
+ 
+-#if defined(__BIONIC__)
+#if 0
+ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
+ #include <sys/system_properties.h>
+ #include <sys/_system_properties.h>
+@@ -32,8 +32,6 @@
+ #include <android-base/parseint.h>
+ #include <android-base/strings.h>
+ 
+-#if !defined(__BIONIC__)
+-
+ #define PROP_VALUE_MAX 92
+ 
+ static std::map<std::string, std::string>& g_properties = *new std::map<std::string, std::string>;
+@@ -63,8 +61,6 @@
+   return strlen(value);
+ }
+ 
+-#endif
+-
+ namespace android {
+ namespace base {
+ 
+@@ -108,7 +104,7 @@
+ 
+ std::string GetProperty(const std::string& key, const std::string& default_value) {
+   std::string property_value;
+-#if defined(__BIONIC__)
+#if 0
+   const prop_info* pi = __system_property_find(key.c_str());
+   if (pi == nullptr) return default_value;
+ 
+@@ -134,7 +130,7 @@
+   return (__system_property_set(key.c_str(), value.c_str()) == 0);
+ }
+ 
+-#if defined(__BIONIC__)
+#if 0
+ 
+ struct WaitForPropertyData {
+   bool done;
+diff -uNr android-tools-31.0.2/vendor/libziparchive/zip_archive.cc android-tools-31.0.2.mod/vendor/libziparchive/zip_archive.cc
+--- android-tools-31.0.2/vendor/libziparchive/zip_archive.cc	2021-06-02 15:08:21.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/libziparchive/zip_archive.cc	2021-10-08 09:55:05.182121003 +0000
+@@ -39,7 +39,9 @@
+ #define lseek64 lseek
+ #endif
+ 
+-#if defined(__BIONIC__)
+#undef __ANDROID__
+
+#if 0
+ #include <android/fdsan.h>
+ #endif
+ 
+@@ -88,7 +90,7 @@
+  * of the string length into the hash table entry.
+  */
+ 
+-#if defined(__BIONIC__)
+#if 0
+ uint64_t GetOwnerTag(const ZipArchive* archive) {
+   return android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_ZIPARCHIVE,
+                                         reinterpret_cast<uint64_t>(archive));
+@@ -102,7 +104,7 @@
+       central_directory(),
+       directory_map(),
+       num_entries(0) {
+-#if defined(__BIONIC__)
+#if 0
+   if (assume_ownership) {
+     CHECK(mapped_zip.HasFd());
+     android_fdsan_exchange_owner_tag(mapped_zip.GetFileDescriptor(), 0, GetOwnerTag(this));
+@@ -120,7 +122,7 @@
+ 
+ ZipArchive::~ZipArchive() {
+   if (close_file && mapped_zip.GetFileDescriptor() >= 0) {
+-#if defined(__BIONIC__)
+#if 0
+     android_fdsan_close_with_tag(mapped_zip.GetFileDescriptor(), GetOwnerTag(this));
+ #else
+     close(mapped_zip.GetFileDescriptor());
+diff -uNr android-tools-31.0.2/vendor/logging/liblog/logger_write.cpp android-tools-31.0.2.mod/vendor/logging/liblog/logger_write.cpp
+--- android-tools-31.0.2/vendor/logging/liblog/logger_write.cpp	2021-07-20 11:13:01.000000000 +0000
+++ android-tools-31.0.2.mod/vendor/logging/liblog/logger_write.cpp	2021-10-08 09:55:05.183121003 +0000
+@@ -39,6 +39,8 @@
+ #include "logger.h"
+ #include "uio.h"
+ 
+#undef __ANDROID__
+
+ #ifdef __ANDROID__
+ #include "logd_writer.h"
+ #include "pmsg_writer.h"
+@@ -108,31 +110,6 @@
+ #endif
+ }
+ 
+-#if defined(__linux__) || defined(_WIN32)
+-static const char* getprogname() {
+-#if defined(__linux__)
+-  return program_invocation_short_name;
+-#elif defined(_WIN32)
+-  static bool first = true;
+-  static char progname[MAX_PATH] = {};
+-
+-  if (first) {
+-    char path[PATH_MAX + 1];
+-    DWORD result = GetModuleFileName(nullptr, path, sizeof(path) - 1);
+-    if (result == 0 || result == sizeof(path) - 1) return "";
+-    path[PATH_MAX - 1] = 0;
+-
+-    char* path_basename = basename(path);
+-
+-    snprintf(progname, sizeof(progname), "%s", path_basename);
+-    first = false;
+-  }
+-
+-  return progname;
+-#endif
+-}
+-#endif
+-
+ // It's possible for logging to happen during static initialization before our globals are
+ // initialized, so we place this std::string in a function such that it is initialized on the first
+ // call. We use a pointer to avoid exit time destructors.
@@ -1,12 +0,0 @@
-diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt
-index 2b6d8f0..ee55949 100644
--- a/vendor/CMakeLists.adb.txt
-+++ b/vendor/CMakeLists.adb.txt
-@@ -192,7 +192,6 @@ target_link_libraries(adb
- 	brotlidec
- 	brotlienc
- 	lz4
-	pthread
- 	usb-1.0
- 	z
- 	zstd)
@@ -1,10 +0,0 @@
-diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt
-index 1d43937..189d91b 100644
--- a/vendor/CMakeLists.fastboot.txt
-+++ b/vendor/CMakeLists.fastboot.txt
-@@ -135,4 +135,4 @@ target_compile_definitions(fastboot PRIVATE
- target_link_libraries(fastboot
- 	libsparse libzip libcutils liblog libfsmgr libutil
- 	libbase libext4 libselinux libsepol libdiagnoseusb crypto
-	z pcre2-8 pthread dl)
-+	z pcre2-8 dl)
@@ -1,12 +0,0 @@
-diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
-index a8f89fd..d1cae40 100644
--- a/vendor/CMakeLists.mke2fs.txt
-+++ b/vendor/CMakeLists.mke2fs.txt
-@@ -112,6 +112,6 @@ add_executable("${ANDROID_MKE2FS_NAME}"
- 	e2fsprogs/misc/util.c)
- 
- target_link_libraries("${ANDROID_MKE2FS_NAME}"
-	libext2fs libsparse libbase libzip liblog libutil pthread z)
-+	libext2fs libsparse libbase libzip liblog libutil z)
- target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
- 	e2fsprogs/lib)
@@ -1,93 +0,0 @@
-diff --git a/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h b/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h
-index 83f40a9..9804b76 100644
--- a/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h
-+++ b/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h
-@@ -53,7 +53,7 @@ typedef struct PairingAuthCtx PairingAuthCtx;
-  * @return a new PairingAuthCtx server instance. Caller is responsible for
-  *         destroying the context via #pairing_auth_destroy.
-  */
-PairingAuthCtx* pairing_auth_server_new(const uint8_t* pswd, size_t len) __INTRODUCED_IN(30);
-+PairingAuthCtx* pairing_auth_server_new(const uint8_t* pswd, size_t len) __INTRODUCED_IN(24);
- 
- /**
-  * Creates a new PairingAuthCtx instance as the client.
-@@ -64,14 +64,14 @@ PairingAuthCtx* pairing_auth_server_new(const uint8_t* pswd, size_t len) __INTRO
-  * @return a new PairingAuthCtx client instance. Caller is responsible for
-  *         destroying the context via #pairing_auth_destroy.
-  */
-PairingAuthCtx* pairing_auth_client_new(const uint8_t* pswd, size_t len) __INTRODUCED_IN(30);
-+PairingAuthCtx* pairing_auth_client_new(const uint8_t* pswd, size_t len) __INTRODUCED_IN(24);
- 
- /**
-  * Destroys the PairingAuthCtx.
-  *
-  * @param ctx the PairingAuthCtx instance to destroy. Will abort if null.
-  */
-void pairing_auth_destroy(PairingAuthCtx* ctx) __INTRODUCED_IN(30);
-+void pairing_auth_destroy(PairingAuthCtx* ctx) __INTRODUCED_IN(24);
- 
- /**
-  * Returns the exact size of the SPAKE2 msg.
-@@ -82,7 +82,7 @@ void pairing_auth_destroy(PairingAuthCtx* ctx) __INTRODUCED_IN(30);
-  * @param ctx the PairingAuthCtx instance. Will abort if null.
-  * @return the size of the SPAKE2 message in bytes. This is guaranteed to be > 0.
-  */
-size_t pairing_auth_msg_size(PairingAuthCtx* ctx) __INTRODUCED_IN(30);
-+size_t pairing_auth_msg_size(PairingAuthCtx* ctx) __INTRODUCED_IN(24);
- 
- /**
-  * Writes the SPAKE2 message to exchange with the other party to |out_buf|.
-@@ -96,7 +96,7 @@ size_t pairing_auth_msg_size(PairingAuthCtx* ctx) __INTRODUCED_IN(30);
-  *                be have at least #pairing_auth_msg_size size. Will abort if
-  *                out_buf is null.
-  */
-void pairing_auth_get_spake2_msg(PairingAuthCtx* ctx, uint8_t* out_buf) __INTRODUCED_IN(30);
-+void pairing_auth_get_spake2_msg(PairingAuthCtx* ctx, uint8_t* out_buf) __INTRODUCED_IN(24);
- 
- /**
-  * Processes the peer's |their_msg| and attempts to initialize the cipher for
-@@ -117,7 +117,7 @@ void pairing_auth_get_spake2_msg(PairingAuthCtx* ctx, uint8_t* out_buf) __INTROD
-  *         for more details on the SPAKE2 protocol.
-  */
- bool pairing_auth_init_cipher(PairingAuthCtx* ctx, const uint8_t* their_msg, size_t msg_len)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- /**
-  * Returns a safe buffer size for encrypting data of a certain size.
-@@ -130,7 +130,7 @@ bool pairing_auth_init_cipher(PairingAuthCtx* ctx, const uint8_t* their_msg, siz
-  * @return the minimum buffer size, in bytes, to hold an encrypted message of size len. See
-  * #pairing_auth_encrypt for usage.
-  */
-size_t pairing_auth_safe_encrypted_size(PairingAuthCtx* ctx, size_t len) __INTRODUCED_IN(30);
-+size_t pairing_auth_safe_encrypted_size(PairingAuthCtx* ctx, size_t len) __INTRODUCED_IN(24);
- 
- /**
-  * Encrypts input data and writes the encrypted data into a user-provided buffer.
-@@ -147,7 +147,7 @@ size_t pairing_auth_safe_encrypted_size(PairingAuthCtx* ctx, size_t len) __INTRO
-  *         otherwise.
-  */
- bool pairing_auth_encrypt(PairingAuthCtx* ctx, const uint8_t* inbuf, size_t inlen, uint8_t* outbuf,
-                          size_t* outlen) __INTRODUCED_IN(30);
-+                          size_t* outlen) __INTRODUCED_IN(24);
- 
- /**
-  * Returns a safe buffer size for decrypting data of a certain size.
-@@ -162,7 +162,7 @@ bool pairing_auth_encrypt(PairingAuthCtx* ctx, const uint8_t* inbuf, size_t inle
-  *         #pairing_auth_decrypt for usage.
-  */
- size_t pairing_auth_safe_decrypted_size(PairingAuthCtx* ctx, const uint8_t* buf, size_t len)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- /**
-  * Decrypts input data and writes the decrypted data into a user-provided buffer.
-@@ -180,7 +180,7 @@ size_t pairing_auth_safe_decrypted_size(PairingAuthCtx* ctx, const uint8_t* buf,
-  *         otherwise.
-  */
- bool pairing_auth_decrypt(PairingAuthCtx* ctx, const uint8_t* inbuf, size_t inlen, uint8_t* outbuf,
-                          size_t* outlen) __INTRODUCED_IN(30);
-+                          size_t* outlen) __INTRODUCED_IN(24);
- 
- #ifdef __cplusplus
- }
@@ -1,39 +0,0 @@
-diff --git a/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h b/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h
-index 8e63db7..f158015 100644
--- a/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h
-+++ b/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h
-@@ -79,7 +79,7 @@ typedef void (*pairing_result_cb)(const PeerInfo*, int, void*);
- //         invoked. Otherwise, cb is guaranteed to be invoked, even if you
- //         destroy the ctx while in the pairing process.
- bool pairing_connection_start(PairingConnectionCtx* ctx, int fd, pairing_result_cb cb, void* opaque)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- // Creates a new PairingConnectionCtx instance as the client.
- //
-@@ -98,7 +98,7 @@ PairingConnectionCtx* pairing_connection_client_new(const uint8_t* pswd, size_t
-                                                     const PeerInfo* peer_info,
-                                                     const uint8_t* x509_cert_pem, size_t x509_size,
-                                                     const uint8_t* priv_key_pem, size_t priv_size)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- // Creates a new PairingConnectionCtx instance as the server.
- //
-@@ -117,14 +117,14 @@ PairingConnectionCtx* pairing_connection_server_new(const uint8_t* pswd, size_t
-                                                     const PeerInfo* peer_info,
-                                                     const uint8_t* x509_cert_pem, size_t x509_size,
-                                                     const uint8_t* priv_key_pem, size_t priv_size)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- // Destroys the PairingConnectionCtx instance.
- //
- // It is safe to destroy the instance at any point in the pairing process.
- //
- // @param ctx the PairingConnectionCtx instance to destroy. Will abort if null.
-void pairing_connection_destroy(PairingConnectionCtx* ctx) __INTRODUCED_IN(30);
-+void pairing_connection_destroy(PairingConnectionCtx* ctx) __INTRODUCED_IN(24);
- 
- #ifdef __cplusplus
- }
@@ -1,46 +0,0 @@
-diff --git a/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h b/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h
-index babff94..93dcf9a 100644
--- a/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h
-+++ b/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h
-@@ -45,7 +45,7 @@ typedef struct PairingServerCtx PairingServerCtx;
- // Callback containing the result of the pairing. If #PeerInfo is null,
- // then the pairing failed. Otherwise, pairing succeeded and #PeerInfo
- // contains information about the peer.
-typedef void (*pairing_server_result_cb)(const PeerInfo*, void*) __INTRODUCED_IN(30);
-+typedef void (*pairing_server_result_cb)(const PeerInfo*, void*) __INTRODUCED_IN(24);
- 
- // Starts the pairing server.
- //
-@@ -61,7 +61,7 @@ typedef void (*pairing_server_result_cb)(const PeerInfo*, void*) __INTRODUCED_IN
- // @param opaque the opaque userdata.
- // @return the port number the server is listening on. Returns 0 on failure.
- uint16_t pairing_server_start(PairingServerCtx* ctx, pairing_server_result_cb cb, void* opaque)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- // Creates a new PairingServerCtx instance.
- //
-@@ -83,7 +83,7 @@ uint16_t pairing_server_start(PairingServerCtx* ctx, pairing_server_result_cb cb
- PairingServerCtx* pairing_server_new(const uint8_t* pswd, size_t pswd_len,
-                                      const PeerInfo* peer_info, const uint8_t* x509_cert_pem,
-                                      size_t x509_size, const uint8_t* priv_key_pem,
-                                     size_t priv_size, uint16_t port) __INTRODUCED_IN(30);
-+                                     size_t priv_size, uint16_t port) __INTRODUCED_IN(24);
- 
- // Same as #pairing_server_new, except that the x509 certificate and private key
- // is generated internally.
-@@ -100,12 +100,12 @@ PairingServerCtx* pairing_server_new(const uint8_t* pswd, size_t pswd_len,
- //         for destroying the context via #pairing_server_destroy.
- PairingServerCtx* pairing_server_new_no_cert(const uint8_t* pswd, size_t pswd_len,
-                                              const PeerInfo* peer_info, uint16_t port)
-        __INTRODUCED_IN(30);
-+        __INTRODUCED_IN(24);
- 
- // Destroys the PairingServerCtx instance.
- //
- // @param ctx the PairingServerCtx instance to destroy.
-void pairing_server_destroy(PairingServerCtx* ctx) __INTRODUCED_IN(30);
-+void pairing_server_destroy(PairingServerCtx* ctx) __INTRODUCED_IN(24);
- 
- #ifdef __cplusplus
- }
@@ -1,17 +0,0 @@
-diff --git a/vendor/adb/sysdeps.h b/vendor/adb/sysdeps.h
-index 316afe7..8d5da69 100644
--- a/vendor/adb/sysdeps.h
-+++ b/vendor/adb/sysdeps.h
-@@ -514,7 +514,11 @@ static inline int adb_gethostname(char* name, size_t len) {
- }
- 
- static inline int adb_getlogin_r(char* buf, size_t bufsize) {
-    return getlogin_r(buf, bufsize);
-+    char* logname = getlogin();
-+    if (!logname) return ENXIO;
-+    if (strlen(logname) >= bufsize) return ERANGE;
-+    strcpy(buf, logname);
-+    return 0;
- }
- 
- static inline int adb_read(borrowed_fd fd, void* buf, size_t len) {
@@ -1,13 +0,0 @@
-diff --git a/vendor/base/libs/androidfw/ResourceTypes.cpp b/vendor/base/libs/androidfw/ResourceTypes.cpp
-index 2233827..bc5e9e2 100644
--- a/vendor/base/libs/androidfw/ResourceTypes.cpp
-+++ b/vendor/base/libs/androidfw/ResourceTypes.cpp
-@@ -42,7 +42,7 @@
- #include <utils/String16.h>
- #include <utils/String8.h>
- 
-#ifdef __ANDROID__
-+#if 0
- #include <binder/TextOutput.h>
- #endif
- 
@@ -1,13 +0,0 @@
-diff --git a/vendor/boringssl/crypto/CMakeLists.txt b/vendor/boringssl/crypto/CMakeLists.txt
-index cde92b5..e25871c 100644
--- a/vendor/boringssl/crypto/CMakeLists.txt
-+++ b/vendor/boringssl/crypto/CMakeLists.txt
-@@ -167,7 +167,7 @@ perlasm(test/trampoline-x86_64.${ASM_EXT} test/asm/trampoline-x86_64.pl)
- 
- add_custom_command(
-   OUTPUT err_data.c
-  COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
-+  COMMAND GOOS=linux GOARCH=amd64 ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
-   DEPENDS
-   err/err_data_generate.go
-   err/asn1.errordata
@@ -1,22 +0,0 @@
-diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp
-index d8e171b..31b34a5 100644
--- a/vendor/core/fs_mgr/liblp/utility.cpp
-+++ b/vendor/core/fs_mgr/liblp/utility.cpp
-@@ -34,7 +34,7 @@
- #include <ext4_utils/ext4_utils.h>
- #include <openssl/sha.h>
- 
-#ifdef __ANDROID__
-+#if 0
- #include <cutils/android_get_control_file.h>
- #endif
- 
-@@ -208,7 +208,7 @@ bool SetBlockReadonly(int fd, bool readonly) {
- }
- 
- base::unique_fd GetControlFileOrOpen(std::string_view path, int flags) {
-#if defined(__ANDROID__)
-+#if 0
-     int fd = android_get_control_file(path.data());
-     if (fd >= 0) {
-         int newfd = TEMP_FAILURE_RETRY(dup(fd));
@@ -1,13 +0,0 @@
-diff --git a/vendor/core/init/reboot.cpp b/vendor/core/init/reboot.cpp
-index 464746d..dadf811 100644
--- a/vendor/core/init/reboot.cpp
-+++ b/vendor/core/init/reboot.cpp
-@@ -246,7 +246,7 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* block_dev_partitions
-         if (dump) {
-             LOG(INFO) << "mount entry " << mentry->mnt_fsname << ":" << mentry->mnt_dir << " opts "
-                       << mentry->mnt_opts << " type " << mentry->mnt_type;
-        } else if (MountEntry::IsBlockDevice(*mentry) && hasmntopt(mentry, "rw")) {
-+        } else if (MountEntry::IsBlockDevice(*mentry) && 0) {
-             std::string mount_dir(mentry->mnt_dir);
-             // These are R/O partitions changed to R/W after adb remount.
-             // Do not umount them as shutdown critical services may rely on them.
@@ -1,13 +0,0 @@
-diff --git a/vendor/core/libcutils/properties.cpp b/vendor/core/libcutils/properties.cpp
-index 03f0496..11c4786 100644
--- a/vendor/core/libcutils/properties.cpp
-+++ b/vendor/core/libcutils/properties.cpp
-@@ -91,7 +91,7 @@ int property_get(const char* key, char* value, const char* default_value) {
-     return len;
- }
- 
-#if __has_include(<sys/system_properties.h>)
-+#if 0
- 
- #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
- #include <sys/_system_properties.h>
@@ -1,13 +0,0 @@
-diff --git a/vendor/e2fsprogs/lib/ext2fs/ismounted.c b/vendor/e2fsprogs/lib/ext2fs/ismounted.c
-index 6cd497d..dcdd4fd 100644
--- a/vendor/e2fsprogs/lib/ext2fs/ismounted.c
-+++ b/vendor/e2fsprogs/lib/ext2fs/ismounted.c
-@@ -196,7 +196,7 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file,
- #endif /* __GNU__ */
- 	*mount_flags = EXT2_MF_MOUNTED;
- 
-#ifdef MNTOPT_RO
-+#if 0
- 	/* Check to see if the ro option is set */
- 	if (hasmntopt(mnt, MNTOPT_RO))
- 		*mount_flags |= EXT2_MF_READONLY;
@@ -1,13 +0,0 @@
-diff --git a/vendor/f2fs-tools/lib/libf2fs.c b/vendor/f2fs-tools/lib/libf2fs.c
-index 55fa391..cf2716c 100644
--- a/vendor/f2fs-tools/lib/libf2fs.c
-+++ b/vendor/f2fs-tools/lib/libf2fs.c
-@@ -714,7 +714,7 @@ static int is_mounted(const char *mpt, const char *device)
- 
- 	while ((mnt = getmntent(file)) != NULL) {
- 		if (!strcmp(device, mnt->mnt_fsname)) {
-#ifdef MNTOPT_RO
-+#if 0
- 			if (hasmntopt(mnt, MNTOPT_RO))
- 				c.ro = 1;
- #endif
@@ -1,12 +0,0 @@
-diff --git a/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h b/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h
-index 6fd38ee..bb62fd4 100644
--- a/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h
-+++ b/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h
-@@ -23,6 +23,7 @@
- #include <android-base/logging.h>
- #include <android-base/off64_t.h>
- 
-+#undef __ANDROID__
- #ifdef __ANDROID__
- #include <linux/incrementalfs.h>
- #endif
@@ -1,22 +0,0 @@
-diff --git a/vendor/libbase/include/android-base/unique_fd.h b/vendor/libbase/include/android-base/unique_fd.h
-index 9ceb5db..bf6f5cc 100644
--- a/vendor/libbase/include/android-base/unique_fd.h
-+++ b/vendor/libbase/include/android-base/unique_fd.h
-@@ -46,7 +46,7 @@
- // unique_fd is also known as ScopedFd/ScopedFD/scoped_fd; mentioned here to help
- // you find this class if you're searching for one of those names.
- 
-#if defined(__BIONIC__)
-+#if 0
- #include <android/fdsan.h>
- #endif
- 
-@@ -54,7 +54,7 @@ namespace android {
- namespace base {
- 
- struct DefaultCloser {
-#if defined(__BIONIC__)
-+#if 0
-   static void Tag(int fd, void* old_addr, void* new_addr) {
-     if (android_fdsan_exchange_owner_tag) {
-       uint64_t old_tag = android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_UNIQUE_FD,
@@ -1,53 +0,0 @@
-diff --git a/vendor/libbase/properties.cpp b/vendor/libbase/properties.cpp
-index 8190987..6d48ab8 100644
--- a/vendor/libbase/properties.cpp
-+++ b/vendor/libbase/properties.cpp
-@@ -16,7 +16,7 @@
- 
- #include "android-base/properties.h"
- 
-#if defined(__BIONIC__)
-+#if 0
- #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
- #include <sys/system_properties.h>
- #include <sys/_system_properties.h>
-@@ -32,11 +32,9 @@
- #include <android-base/parseint.h>
- #include <android-base/strings.h>
- 
-#if !defined(__BIONIC__)
-
- #define PROP_VALUE_MAX 92
- 
-static std::map<std::string, std::string>& g_properties = *new std::map<std::string, std::string>;
-+static std::map<std::string, std::string> g_properties;
- 
- int __system_property_set(const char* key, const char* value) {
-   if (key == nullptr || *key == '\0') return -1;
-@@ -63,8 +61,6 @@ int __system_property_get(const char* key, char* value) {
-   return strlen(value);
- }
- 
-#endif
-
- namespace android {
- namespace base {
- 
-@@ -108,7 +104,7 @@ template uint64_t GetUintProperty(const std::string&, uint64_t, uint64_t);
- 
- std::string GetProperty(const std::string& key, const std::string& default_value) {
-   std::string property_value;
-#if defined(__BIONIC__)
-+#if 0
-   const prop_info* pi = __system_property_find(key.c_str());
-   if (pi == nullptr) return default_value;
- 
-@@ -134,7 +130,7 @@ bool SetProperty(const std::string& key, const std::string& value) {
-   return (__system_property_set(key.c_str(), value.c_str()) == 0);
- }
- 
-#if defined(__BIONIC__)
-+#if 0
- 
- struct WaitForPropertyData {
-   bool done;
@@ -1,42 +0,0 @@
-diff --git a/vendor/libziparchive/zip_archive.cc b/vendor/libziparchive/zip_archive.cc
-index fe1baa1..21d2627 100644
--- a/vendor/libziparchive/zip_archive.cc
-+++ b/vendor/libziparchive/zip_archive.cc
-@@ -39,7 +39,9 @@
- #define lseek64 lseek
- #endif
- 
-#if defined(__BIONIC__)
-+#undef __ANDROID__
-+
-+#if 0
- #include <android/fdsan.h>
- #endif
- 
-@@ -88,7 +90,7 @@ static constexpr uint64_t kMaxFileLength = 256 * static_cast<uint64_t>(1u << 30u
-  * of the string length into the hash table entry.
-  */
- 
-#if defined(__BIONIC__)
-+#if 0
- uint64_t GetOwnerTag(const ZipArchive* archive) {
-   return android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_ZIPARCHIVE,
-                                         reinterpret_cast<uint64_t>(archive));
-@@ -102,7 +104,7 @@ ZipArchive::ZipArchive(MappedZipFile&& map, bool assume_ownership)
-       central_directory(),
-       directory_map(),
-       num_entries(0) {
-#if defined(__BIONIC__)
-+#if 0
-   if (assume_ownership) {
-     CHECK(mapped_zip.HasFd());
-     android_fdsan_exchange_owner_tag(mapped_zip.GetFileDescriptor(), 0, GetOwnerTag(this));
-@@ -120,7 +122,7 @@ ZipArchive::ZipArchive(const void* address, size_t length)
- 
- ZipArchive::~ZipArchive() {
-   if (close_file && mapped_zip.GetFileDescriptor() >= 0) {
-#if defined(__BIONIC__)
-+#if 0
-     android_fdsan_close_with_tag(mapped_zip.GetFileDescriptor(), GetOwnerTag(this));
- #else
-     close(mapped_zip.GetFileDescriptor());
@@ -1,112 +0,0 @@
-diff --git a/vendor/logging/liblog/include/android/log.h b/vendor/logging/liblog/include/android/log.h
-index 12de595..6742aa9 100644
--- a/vendor/logging/liblog/include/android/log.h
-+++ b/vendor/logging/liblog/include/android/log.h
-@@ -229,7 +229,7 @@ typedef void (*__android_aborter_function)(const char* abort_message);
-  *
-  * Available since API level 30.
-  */
-void __android_log_write_log_message(struct __android_log_message* log_message) __INTRODUCED_IN(30);
-+void __android_log_write_log_message(struct __android_log_message* log_message) __INTRODUCED_IN(24);
- 
- /**
-  * Sets a user defined logger function.  All log messages sent to liblog will be set to the
-@@ -241,7 +241,7 @@ void __android_log_write_log_message(struct __android_log_message* log_message)
-  *
-  * Available since API level 30.
-  */
-void __android_log_set_logger(__android_logger_function logger) __INTRODUCED_IN(30);
-+void __android_log_set_logger(__android_logger_function logger) __INTRODUCED_IN(24);
- 
- /**
-  * Writes the log message to logd.  This is an __android_logger_function and can be provided to
-@@ -251,7 +251,7 @@ void __android_log_set_logger(__android_logger_function logger) __INTRODUCED_IN(
-  *
-  * Available since API level 30.
-  */
-void __android_log_logd_logger(const struct __android_log_message* log_message) __INTRODUCED_IN(30);
-+void __android_log_logd_logger(const struct __android_log_message* log_message) __INTRODUCED_IN(24);
- 
- /**
-  * Writes the log message to stderr.  This is an __android_logger_function and can be provided to
-@@ -262,7 +262,7 @@ void __android_log_logd_logger(const struct __android_log_message* log_message)
-  * Available since API level 30.
-  */
- void __android_log_stderr_logger(const struct __android_log_message* log_message)
-    __INTRODUCED_IN(30);
-+    __INTRODUCED_IN(24);
- 
- /**
-  * Sets a user defined aborter function that is called for __android_log_assert() failures.  This
-@@ -273,7 +273,7 @@ void __android_log_stderr_logger(const struct __android_log_message* log_message
-  *
-  * Available since API level 30.
-  */
-void __android_log_set_aborter(__android_aborter_function aborter) __INTRODUCED_IN(30);
-+void __android_log_set_aborter(__android_aborter_function aborter) __INTRODUCED_IN(24);
- 
- /**
-  * Calls the stored aborter function.  This allows for other logging libraries to use the same
-@@ -284,7 +284,7 @@ void __android_log_set_aborter(__android_aborter_function aborter) __INTRODUCED_
-  *
-  * Available since API level 30.
-  */
-void __android_log_call_aborter(const char* abort_message) __INTRODUCED_IN(30);
-+void __android_log_call_aborter(const char* abort_message) __INTRODUCED_IN(24);
- 
- /**
-  * Sets android_set_abort_message() on device then aborts().  This is the default aborter.
-@@ -295,7 +295,7 @@ void __android_log_call_aborter(const char* abort_message) __INTRODUCED_IN(30);
-  * Available since API level 30.
-  */
- void __android_log_default_aborter(const char* abort_message) __attribute__((noreturn))
-__INTRODUCED_IN(30);
-+__INTRODUCED_IN(24);
- 
- /**
-  * Use the per-tag properties "log.tag.<tagname>" along with the minimum priority from
-@@ -314,7 +314,7 @@ __INTRODUCED_IN(30);
-  *
-  * Available since API level 30.
-  */
-int __android_log_is_loggable(int prio, const char* tag, int default_prio) __INTRODUCED_IN(30);
-+int __android_log_is_loggable(int prio, const char* tag, int default_prio) __INTRODUCED_IN(24);
- 
- /**
-  * Use the per-tag properties "log.tag.<tagname>" along with the minimum priority from
-@@ -335,7 +335,7 @@ int __android_log_is_loggable(int prio, const char* tag, int default_prio) __INT
-  * Available since API level 30.
-  */
- int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int default_prio)
-    __INTRODUCED_IN(30);
-+    __INTRODUCED_IN(24);
- 
- /**
-  * Sets the minimum priority that will be logged for this process.
-@@ -346,7 +346,7 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int def
-  *
-  * Available since API level 30.
-  */
-int32_t __android_log_set_minimum_priority(int32_t priority) __INTRODUCED_IN(30);
-+int32_t __android_log_set_minimum_priority(int32_t priority) __INTRODUCED_IN(24);
- 
- /**
-  * Gets the minimum priority that will be logged for this process.  If none has been set by a
-@@ -357,7 +357,7 @@ int32_t __android_log_set_minimum_priority(int32_t priority) __INTRODUCED_IN(30)
-  *
-  * Available since API level 30.
-  */
-int32_t __android_log_get_minimum_priority(void) __INTRODUCED_IN(30);
-+int32_t __android_log_get_minimum_priority(void) __INTRODUCED_IN(24);
- 
- /**
-  * Sets the default tag if no tag is provided when writing a log message.  Defaults to
-@@ -368,7 +368,7 @@ int32_t __android_log_get_minimum_priority(void) __INTRODUCED_IN(30);
-  *
-  * Available since API level 30.
-  */
-void __android_log_set_default_tag(const char* tag) __INTRODUCED_IN(30);
-+void __android_log_set_default_tag(const char* tag) __INTRODUCED_IN(24);
- 
- #ifdef __cplusplus
- }
@@ -1,13 +0,0 @@
-diff --git a/vendor/logging/liblog/logger_write.cpp b/vendor/logging/liblog/logger_write.cpp
-index a0153f8..8863f29 100644
--- a/vendor/logging/liblog/logger_write.cpp
-+++ b/vendor/logging/liblog/logger_write.cpp
-@@ -39,6 +39,8 @@
- #include "logger.h"
- #include "uio.h"
- 
-+#undef __ANDROID__
-+
- #ifdef __ANDROID__
- #include "logd_writer.h"
- #include "pmsg_writer.h"
@@ -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
- 
@@ -3,7 +3,6 @@ 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"
@@ -73,12 +72,7 @@ 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
@@ -101,19 +95,11 @@ 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() {
-	install -m700 $TERMUX_PKG_HOSTBUILD_DIR/gen_test_char \
-		$TERMUX_PKG_BUILDDIR/server/gen_test_char
+	# thanks to @JetBalsa
+	gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c -o $TERMUX_PKG_BUILDDIR/server/gen_test_char
 	touch -d "1 hour" $TERMUX_PKG_BUILDDIR/server/gen_test_char
 }

@@ -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
-}
@@ -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"
@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Apache Portable Runtime Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.7.0
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_SRCURL=https://dlcdn.apache.org/apr/apr-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea
+TERMUX_PKG_REVISION=4
+TERMUX_PKG_SRCURL=https://ftp.acc.umu.se/mirror/apache.org/apr/apr-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=48e9dbf45ae3fdc7b491259ffb6ccf7d63049ffacbc1c0977cced095e4c2d5a2
 TERMUX_PKG_DEPENDS="libuuid"
 TERMUX_PKG_BREAKS="apr-dev"
 TERMUX_PKG_REPLACES="apr-dev"
@@ -22,3 +22,7 @@ apr_cv_tcp_nodelay_with_cork=yes
 ac_cv_sizeof_struct_iovec=$(( TERMUX_ARCH_BITS==32 ? 8 : 16 ))
 ac_cv_search_crypt="
 TERMUX_PKG_RM_AFTER_INSTALL="lib/apr.exp"
+
+termux_step_post_make_install() {
+	sed -i "s%NM=\".*%NM=\"${TERMUX_HOST_PLATFORM}-nm -B\"%g" $TERMUX_PREFIX/share/apr-1/build/libtool
+}
@@ -1,45 +0,0 @@
-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>
@@ -2,17 +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=1
 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_SUGGESTS="gnupg, x11-repo"
+TERMUX_PKG_REPLACES="apt-transport-https, libapt-pkg"
+TERMUX_PKG_RECOMMENDS="game-repo, science-repo"
+TERMUX_PKG_SUGGESTS="gnupg, unstable-repo, x11-repo"
 TERMUX_PKG_ESSENTIAL=true

 TERMUX_PKG_CONFFILES="
@@ -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
@@ -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 )
@@ -1,43 +0,0 @@
-diff -uNr atomvm/src/CMakeLists.txt atomvm.mod/src/CMakeLists.txt
--- atomvm/src/CMakeLists.txt	2019-06-13 13:50:54.000000000 +0300
-+++ atomvm.mod/src/CMakeLists.txt	2019-07-02 20:56:59.790369109 +0300
-@@ -10,13 +10,14 @@
- 
- if((${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") OR
-    (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR
-+   (${CMAKE_SYSTEM_NAME} STREQUAL "Android") OR
-    (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"))
-     add_subdirectory(platforms/generic_unix)
- else()
-     message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
- endif()
- 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-+if((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR (${CMAKE_SYSTEM_NAME} STREQUAL "Android"))
-     include(CheckFunctionExists)
-     include(CheckLibraryExists)
-     check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
-diff -uNr atomvm/src/libAtomVM/CMakeLists.txt atomvm.mod/src/libAtomVM/CMakeLists.txt
--- atomvm/src/libAtomVM/CMakeLists.txt	2019-06-13 13:50:54.000000000 +0300
-+++ atomvm.mod/src/libAtomVM/CMakeLists.txt	2019-07-02 20:57:46.597379691 +0300
-@@ -63,7 +63,7 @@
-     term.c
-     valueshashtable.c
- )
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-+if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Android" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-     find_package(ZLIB)
-     if (ZLIB_FOUND)
-         add_definitions(-DWITH_ZLIB)
-diff -uNr atomvm/tests/CMakeLists.txt atomvm.mod/tests/CMakeLists.txt
--- atomvm/tests/CMakeLists.txt	2019-06-13 13:50:54.000000000 +0300
-+++ atomvm.mod/tests/CMakeLists.txt	2019-07-02 20:55:37.143095702 +0300
-@@ -13,7 +13,7 @@
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR} ../src/libAtomVM/)
- 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-+if((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") OR (${CMAKE_SYSTEM_NAME} STREQUAL "Android"))
-     include(CheckFunctionExists)
-     include(CheckLibraryExists)
-     check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
@@ -1,29 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://github.com/bettio/AtomVM
-TERMUX_PKG_DESCRIPTION="The minimal Erlang VM implementation"
-TERMUX_PKG_LICENSE="LGPL-2.1"
-TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-_COMMIT=82624fbf68ad8a0c8815456adbd33de98e4901ea
-TERMUX_PKG_VERSION=0.git${_COMMIT:0:8}
-TERMUX_PKG_REVISION=7
-TERMUX_PKG_SRCURL=https://github.com/bettio/AtomVM/archive/${_COMMIT}.tar.gz
-TERMUX_PKG_SHA256=b141812be3fe157766464b8fcedc13f40b36bc9346b3e039ac736c5d30359729
-TERMUX_PKG_DEPENDS="zlib"
-TERMUX_PKG_HOSTBUILD=true
-
-termux_step_host_build() {
-	termux_setup_cmake
-	cmake "$TERMUX_PKG_SRCDIR"
-	make -j $TERMUX_MAKE_PROCESSES
-}
-
-termux_step_post_configure() {
-	# We need the "PackBEAM" compiled for host.
-	export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/tools/packbeam
-}
-
-termux_step_make_install() {
-	install -Dm700 "$TERMUX_PKG_BUILDDIR"/src/AtomVM \
-		"$TERMUX_PREFIX"/bin/AtomVM
-	install -Dm700 "$TERMUX_PKG_BUILDDIR"/tools/packbeam/PackBEAM \
-		"$TERMUX_PREFIX"/bin/PackBEAM
-}
@@ -1,51 +0,0 @@
-diff -uNr atomvm/CMakeModules/BuildElixir.cmake atomvm.mod/CMakeModules/BuildElixir.cmake
--- atomvm/CMakeModules/BuildElixir.cmake	2019-06-13 13:50:54.000000000 +0300
-+++ atomvm.mod/CMakeModules/BuildElixir.cmake	2019-07-02 18:26:59.146026706 +0300
-@@ -24,7 +24,7 @@
-     add_custom_target(
-         ${avm_name} ALL
-         DEPENDS ${avm_name}_beams PackBEAM
-        COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${avm_name}.avm ${BEAMS}
-+        COMMAND PackBEAM -a ${avm_name}.avm ${BEAMS}
-         COMMENT "Packing archive ${avm_name}.avm"
-         VERBATIM
-     )
-@@ -55,7 +55,7 @@
- 
-     add_custom_target(
-         ${avm_name} ALL
-        COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
-+        COMMAND PackBEAM ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
-         COMMENT "Packing runnable ${avm_name}.avm"
-         VERBATIM
-     )
-diff -uNr atomvm/CMakeModules/BuildErlang.cmake atomvm.mod/CMakeModules/BuildErlang.cmake
--- atomvm/CMakeModules/BuildErlang.cmake	2019-06-13 13:50:54.000000000 +0300
-+++ atomvm.mod/CMakeModules/BuildErlang.cmake	2019-07-02 18:26:27.599082112 +0300
-@@ -25,7 +25,7 @@
-         ${avm_name} ALL
-         DEPENDS ${avm_name}_beams PackBEAM
-         #DEPENDS ${BEAMS}
-        COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${avm_name}.avm ${BEAMS}
-+        COMMAND PackBEAM -a ${avm_name}.avm ${BEAMS}
-         COMMENT "Packing archive ${avm_name}.avm"
-         VERBATIM
-     )
-@@ -56,7 +56,7 @@
- 
-     add_custom_target(
-         ${avm_name} ALL
-        COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${avm_name}.avm ${main}.beam ${ARCHIVES}
-+        COMMAND PackBEAM ${avm_name}.avm ${main}.beam ${ARCHIVES}
-         COMMENT "Packing runnable ${avm_name}.avm"
-         VERBATIM
-     )
-@@ -77,7 +77,7 @@
-     add_custom_target(
-         ${test_avm_name} ALL
-         COMMAND erlc -I ${CMAKE_SOURCE_DIR}/libs/include ${CMAKE_CURRENT_SOURCE_DIR}/tests.erl
-        COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${ARCHIVES}
-+        COMMAND PackBEAM ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${ARCHIVES}
-         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tests.erl
-         COMMENT "Packing runnable ${test_avm_name}.avm"
-         VERBATIM
@@ -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"
@@ -1,20 +0,0 @@
-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
-}
@@ -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)
- 
@@ -1,143 +0,0 @@
-diff -uNr bftpd/bftpd.conf bftpd.mod/bftpd.conf
--- bftpd/bftpd.conf	2019-07-28 20:07:32.000000000 +0300
-+++ bftpd.mod/bftpd.conf	2020-07-24 17:49:21.832372999 +0300
-@@ -9,7 +9,7 @@
-   DENY_LOGIN="no" 
- 
-   #The port number where the daemon should listen (only for daemon mode)
-  PORT="21"
-+  PORT="8021"
- 
-   #You can force bftpd to use a specific port range in passive mode.
-   #Passive mode means that the client will open data connections
-@@ -34,26 +34,6 @@
-   #The password for the administration commands, encrypted (man mkpasswd).
-   ADMIN_PASS="x"
- 
-  #With this option, you can put your entire FTP environment into a chroot
-  #jail. Apart from security, this offers you the possibility of having
-  #virtual users that don't exist in the system.
-  #Additionally, you can make some kind of 'file pool' by creating a directory
-  #with files which you can symlink from the users' homes (this means setting
-  #DO_CHROOT=no in order for the users to be able to access that dir.
-  #Note that you need the following files in your initial chroot directory:
-  #/etc/passwd, /etc/shadow, /etc/group
-  #On GNU systems, you will also need the NSS libraries in /lib.
-  #INITIAL_CHROOT="/ftp"
-
-  #The bftpdutmp file enables you to record user logins and logouts in
-  #bftpd, which is useful for the administration interface (which is not
-  #finished yet). You also need the file to be able to restrict the number
-  #of users simultaneously logged on, and so on.
-  #Note that the directory in which the file resides must already exist.
-  #Set the option to "" if you do not want that. This is discouraged for normal
-  #use, but can be helpful if you want to create a boot floppy or something.
-  PATH_BFTPDUTMP="/var/run/bftpd/bftpdutmp"
-
-   #This option controls the buffer size while transferring files.
-   #If you are on a very fast network (fast meaning 100 Mbit/s or more),
-   #you should set this to 64000 or something like that.
-@@ -66,7 +46,6 @@
-   # can slow transfer speeds.
-   XFER_BUFSIZE="2048"
- 
-
-   # This variable controls whether the transfer buffer (see above option)
-   # should change size as more (or less) clients connect to the server.
-   # Setting this option to "yes" will put more work on your CPU, but
-@@ -75,8 +54,6 @@
-   # your bandwidth to spike.
-   CHANGE_BUFSIZE="no"
- 
-
-
-   # This option allows you to add a delay (in microseconds) to
-   # the time between when one piece of data was sent
-   # and when the next will be sent. This is to aid in
-@@ -130,7 +107,7 @@
-   # be saved.
-   # Each day gets its own log file, to make it easier to rotate logs.
-   # Please note, this directory must be created manually.
-  # BANDWIDTH="/var/log/bftpd"
-+  # BANDWIDTH="@TERMUX_PREFIX@/var/log/bftpd"
- 
-   #ROOTDIR specifies the root directory of the client. It defaults to %h
-   #(user's home directory). %u is replaced by the user name.
-@@ -141,7 +118,7 @@
- 
-   #Name of the log file. Say "syslog" to log into syslog.
-   #Say "" for no logging.
-  LOGFILE="/var/log/bftpd.log"
-+  LOGFILE="@TERMUX_PREFIX@/var/log/bftpd.log"
- 
-   #Use %v for version, %h for the server FQDN and %i for the server IP address.
-   # Note: If you use the "%h" option and you do an inital CHROOT, then
-@@ -152,7 +129,8 @@
-   #The server automatically chdirs to the directory given here after login.
-   AUTO_CHDIR="/"
- 
-  #Authentication type, values: PAM, PASSWD
-+  #Authentication type, values: PASSWD
-+  # PAM is not supported in Termux.
-   AUTH="PASSWD"
- 
-   # The FILE_AUTH varible over-rides the AUTH value. If the FILE_AUTH
-@@ -175,7 +153,7 @@
-   # where normal user accounts cannot be created.
-   # Under no circumstances should anyone except root be
-   # able to read the FILE_AUTH password file.
-  #FILE_AUTH="/etc/ftpdpassword"
-+  #FILE_AUTH="@TERMUX_PREFIX@/etc/ftpdpassword"
- 
- 
-   #Enable this if you want the client's IP address to be resolved to a host
-@@ -185,7 +163,7 @@
-   RESOLVE_CLIENT_IP="no"
- 
-   #Path to the message of the day, seen by all users before login.
-  MOTD_GLOBAL="/etc/ftpmotd"
-+  MOTD_GLOBAL="@TERMUX_PREFIX@/etc/ftpmotd"
- 
-   #Path to the message of the day, seen after login, relative to the root
-   #path of the user (see ROOTDIR).
-@@ -201,9 +179,6 @@
-   #want to have a security hole!
-   DO_CHROOT="yes"
-   
-  #Enable this to log each login to wtmp.
-  LOG_WTMP="yes"
-
-   #If you want bftpd to bind itself to one specific network interface, enter
-   #its IP address here. Else enter 'any'. This option only works in standalone
-   #mode.
-@@ -221,11 +196,7 @@
-   #Path to the ftpusers file. It can contain user names that are denied.
-   #If it does not exist, every user can log in. If you don't want this,
-   #just put a nonexistent filename here.
-  PATH_FTPUSERS="/etc/ftpusers"
-
-  #Enable this if you want to deny any user who has a shell which is not in
-  #/etc/shells.
-  AUTH_ETCSHELLS="no"
-+  PATH_FTPUSERS="@TERMUX_PREFIX@/etc/ftpusers"
- 
-   #With the option ALLOWCOMMAND_XXXX, you can disable the command XXXX.
-   #For example, if you don't want any user to delete files, you can do
-@@ -286,7 +257,7 @@
-   # NOTE: Be careful when using this option and the DO_CHROOT option.
-   # The location of the root directory can change when using DO_CHROOT.
-   # The current working directory (cwd) is passed to the script you run.
-  # PRE_WRITE_SCRIPT="/bin/true"
-+  # PRE_WRITE_SCRIPT="@TERMUX_PREFIX@/bin/true"
- 
-   # This option is enabled when the server should run
-   # a script after writing to the file system. This should
-@@ -295,7 +266,7 @@
-   # NOTE: Be careful when using this option and the DO_CHROOT option.
-   # The location of the root directory can change when using DO_CHROOT.
-   # The current working directory (cwd) is passed to the script you run.
-  # POST_WRITE_SCRIPT="/bin/false"
-+  # POST_WRITE_SCRIPT="@TERMUX_PREFIX@/bin/false"
- 
-   # The GNU C library makes some assumptions about the local time zone
-   # when run in a chroot environment. The Bftpd server tries to work
@@ -1,17 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://bftpd.sourceforge.net/
-TERMUX_PKG_DESCRIPTION="Small, easy-to-configure FTP server"
-TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
-TERMUX_PKG_VERSION=5.7
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=https://kumisystems.dl.sourceforge.net/project/bftpd/bftpd/bftpd-${TERMUX_PKG_VERSION}/bftpd-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=a543ce62a8092a7b5065146875cc9878534b09dc4a853f2c2b56e2de397a6f4b
-TERMUX_PKG_DEPENDS="libcrypt"
-TERMUX_PKG_BUILD_IN_SRC=true
-
-TERMUX_PKG_CONFFILES="etc/bftpd.conf"
-TERMUX_PKG_RM_AFTER_INSTALL="var/log/bftpd.log"
-
-termux_step_pre_configure() {
-	CFLAGS+=" -fcommon"
-}
@@ -1,37 +0,0 @@
-diff -uNr bftpd/Makefile.in bftpd.mod/Makefile.in
--- bftpd/Makefile.in	2020-01-10 02:14:00.000000000 +0200
-+++ bftpd.mod/Makefile.in	2020-01-19 17:40:15.359393866 +0200
-@@ -2,7 +2,7 @@
- CC?=@CC@
- INSTALL=@INSTALL@
- prefix=@prefix@
-CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
-+CFLAGS=@CFLAGS@ @CPPFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
- LIBS=@LIBS@
- mandir=@mandir@
- sbindir=@sbindir@
-@@ -15,7 +15,7 @@
- SRCS=bftpdutmp.c commands.c commands_admin.c cwd.c dirlist.c list.c login.c logging.c main.c mystring.c options.c md5.c
- 
- OBJS2LINK=$(OBJS) $(PAX)
-LDFLAGS=
-+LDFLAGS=@LDFLAGS@
- 
- all: bftpd
- 
-@@ -38,12 +38,12 @@
- 
- install: all
- 	mkdir -p $(DESTDIR)/$(prefix)/sbin
-	$(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin
-+	$(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
- 	mkdir -p $(DESTDIR)/$(mandir)/man8
-	$(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
-+	$(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
- 	mkdir -p $(DESTDIR)/$(prefix)/etc
- 	[ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \
-		$(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc
-+		$(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(prefix)/etc
- 	mkdir -p $(DESTDIR)/$(prefix)/var/log
- 	touch $(DESTDIR)/$(prefix)/var/log/bftpd.log
- 	chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log
@@ -1,64 +0,0 @@
-diff -uNr bftpd/options.c bftpd.mod/options.c
--- bftpd/options.c	2017-09-30 03:18:31.000000000 +0300
-+++ bftpd.mod/options.c	2020-01-19 17:33:04.566591884 +0200
-@@ -13,7 +13,7 @@
- 
- struct global config_global;
- struct group_of_users *config_groups;
-struct user *config_users;
-+struct bftpd_user *config_users;
- 
- /*
- Returns NULL on error. May return
-@@ -183,7 +183,7 @@
- 	FILE *configfile;
- 	char *str;
-     struct group_of_users *grp = NULL;
-    struct user *usr = NULL;
-+    struct bftpd_user *usr = NULL;
-     config_global.options = NULL;
-     config_global.directories = NULL;
- 	if (!configpath)
-@@ -209,9 +209,9 @@
-                 create_options(configfile, &(config_global.options), &(config_global.directories));
-             } else if (strstr(str, "user ") == str) {
-                 if (usr) {
-                    usr = usr->next = calloc(1, sizeof(struct user));
-+                    usr = usr->next = calloc(1, sizeof(struct bftpd_user));
-                 } else {
-                    config_users = usr = calloc(1, sizeof(struct user));
-+                    config_users = usr = calloc(1, sizeof(struct bftpd_user));
-                 }
-                 /* avoid memory errors */
-                 if (! usr)
-@@ -349,7 +349,7 @@
- char *getoption_user(char *name)
- {
-     char *result;
-    struct user *usr;
-+    struct bftpd_user *usr;
-     if ((usr = config_users)) {
-         do {
-             if (!strcmp(user, usr->name)) {
-diff -uNr bftpd/options.h bftpd.mod/options.h
--- bftpd/options.h	2012-11-08 20:33:35.000000000 +0200
-+++ bftpd.mod/options.h	2020-01-19 17:32:28.686276802 +0200
-@@ -48,15 +48,15 @@
-     struct directory *directories;
-     struct group_of_users *next;
- };
-struct user {
-+struct bftpd_user {
-     char *name;
-     struct bftpd_option *options;
-     struct directory *directories;
-    struct user *next;
-+    struct bftpd_user *next;
- };
- 
- extern struct group_of_users *config_groups;
-extern struct user *config_users;
-+extern struct bftpd_user *config_users;
- 
- void expand_groups();
- void config_init();
@@ -1,12 +0,0 @@
-diff -u -r ../ExtUtils-LibBuilder-0.08.orig/t/01-simple.t ./t/01-simple.t
--- ../ExtUtils-LibBuilder-0.08.orig/t/01-simple.t	2020-03-19 18:35:24.423661248 +0100
-+++ ./t/01-simple.t	2020-03-19 18:37:50.234669799 +0100
-@@ -59,7 +59,7 @@
- } elsif ($^O =~ /darwin/i) {
-     $ENV{DYLD_LIBRARY_PATH} = ".";
- }
-elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix)/i) {
-+elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix|android)/i) {
-     $ENV{LD_LIBRARY_PATH} = ".";
-     if ($^O =~ /irix/) {
-         # trying my luck
@@ -1,12 +0,0 @@
-diff -u -r ../Text-BibTeX-0.88.orig/inc/MyBuilder.pm ./inc/MyBuilder.pm
--- ../Text-BibTeX-0.88.orig/inc/MyBuilder.pm	2020-03-19 21:34:48.034256281 +0100
-+++ ./inc/MyBuilder.pm	2020-03-19 21:35:23.929258386 +0100
-@@ -378,7 +378,7 @@
-     if ($^O =~ /darwin/i) {
-         $ENV{DYLD_LIBRARY_PATH} = catdir($self->blib, "usrlib");
-     }
-    elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix|gnu)/i) {
-+    elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix|gnu|android)/i) {
-         $ENV{LD_LIBRARY_PATH} = catdir($self->blib, "usrlib");
-     }
-     elsif ($^O =~ /aix/i) {
@@ -1,39 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://biblatex-biber.sourceforge.net
-TERMUX_PKG_DESCRIPTION="A Unicode-capable BibTeX replacement for biblatex users"
-TERMUX_PKG_LICENSE="Artistic-License-2.0"
-TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=2.16
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SKIP_SRC_EXTRACT=true
-TERMUX_PKG_PLATFORM_INDEPENDENT=true
-TERMUX_PKG_DEPENDS="perl, libxslt, libxml2 (>> 2.9.10-3), openssl-tool, make, clang, pkg-config"
-
-EXTUTILS_LIBBUILDER_VERSION=0.08
-TEXT_BIBTEX_VERSION=0.88
-
-termux_step_make_install() {
-	mkdir -p $TERMUX_PREFIX/opt/biber
-	sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \
-		-e "s|@TEXT_BIBTEX_VERSION@|${TEXT_BIBTEX_VERSION}|g" \
-		-e "s|@EXTUTILS_LIBBUILDER_VERSION@|${EXTUTILS_LIBBUILDER_VERSION}|g" \
-		-e "s|@BIBER_VERSION@|${TERMUX_PKG_VERSION}|g" \
-		"$TERMUX_PKG_BUILDER_DIR"/installer.sh \
-		> $TERMUX_PREFIX/bin/termux-install-biber
-	chmod 700 $TERMUX_PREFIX/bin/termux-install-biber
-	install -m600 "$TERMUX_PKG_BUILDER_DIR"/ExtUtils-LibBuilder.diff $TERMUX_PREFIX/opt/biber/
-	install -m600 "$TERMUX_PKG_BUILDER_DIR"/Text-BibTeX.diff $TERMUX_PREFIX/opt/biber/
-	# Uninstalling all dependencies on uninstall would be annoying, so
-	# lets leave that for the user to deal with..
-}
-
-termux_step_create_debscripts() {
-	{
-		echo "#!$TERMUX_PREFIX/bin/sh"
-		echo "echo ''"
-		echo "echo '[*] You can now run the biber installer by running'"
-		echo "echo ''"
-		echo "echo '      termux-install-biber'"
-		echo "echo ''"
-		echo "echo '    The installation will take a while.'"
-	} > ./postinst
-}
@@ -1,70 +0,0 @@
-#!@TERMUX_PREFIX@/bin/bash
-set -e
-# unset variables that the user might have set to force installation to $PREFIX
-unset PERL_LOCAL_LIB_ROOT
-unset PERL5LIB
-unset PERL_MM_OPT
-unset PERL_MB_OPT
-
-export PREFIX=@TERMUX_PREFIX@
-export TMPDIR=@TERMUX_PREFIX@/tmp
-export EXTUTILS_LIBBUILDER_VERSION=@EXTUTILS_LIBBUILDER_VERSION@
-export TEXT_BIBTEX_VERSION=@TEXT_BIBTEX_VERSION@
-export BIBER_VERSION=@BIBER_VERSION@
-
-# Lock terminal to prevent sending text input and special key
-# combinations that may break installation process.
-stty -echo -icanon time 0 min 0 intr undef quit undef susp undef
-
-# Use trap to unlock terminal at exit.
-trap 'while read -r; do true; done; stty sane;' EXIT
-
-echo "[*] Installing cpanm..."
-
-cpan install App::cpanminus
-export PATH="$PATH:$HOME/perl5/bin"
-
-echo "[*] Downloading and patching troublesome dependencies..."
-
-cd $TMPDIR
-if [ ! -f ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}.tar.gz ]; then
-	curl --fail --retry 3 --location --output "$TMPDIR/ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}.tar.gz" \
-             "https://cpan.metacpan.org/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}.tar.gz"
-else
-	rm -rf ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}
-fi
-tar -xf ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}.tar.gz
-cd ExtUtils-LibBuilder-${EXTUTILS_LIBBUILDER_VERSION}
-patch -Np1 -i $PREFIX/opt/biber/ExtUtils-LibBuilder.diff
-cpanm .
-
-cd ..
-
-if [ ! -f Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz ]; then
-	curl --fail --retry 3 --location --output "$TMPDIR/Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz" \
-             "https://cpan.metacpan.org/authors/id/A/AM/AMBS/Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz"
-else
-	rm -rf Text-BibTeX-${TEXT_BIBTEX_VERSION}
-fi
-tar -xf Text-BibTeX-${TEXT_BIBTEX_VERSION}.tar.gz && cd Text-BibTeX-${TEXT_BIBTEX_VERSION}
-patch -Np1 -i $PREFIX/opt/biber/Text-BibTeX.diff
-cpanm .
-
-cd ..
-
-echo "[*] Installing biber and its dependencies (may take long time)..."
-
-if [ ! -f biber-${BIBER_VERSION}.tar.gz ]; then
-	curl --fail --retry 3 --location --output "biber-${BIBER_VERSION}.tar.gz" \
-             "https://github.com/plk/biber/archive/v${BIBER_VERSION}.tar.gz"
-else
-	rm -rf biber-${BIBER_VERSION}
-fi
-tar -xf biber-${BIBER_VERSION}.tar.gz && cd biber-${BIBER_VERSION}
-cpanm --notest .
-
-cd ..
-
-echo "[*] biber installation finished."
-
-exit 0
@@ -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+"
@@ -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=4
+TERMUX_PKG_REVISION=3
 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,14 +26,6 @@ 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() {
@@ -1,13 +0,0 @@
-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 {
@@ -3,7 +3,6 @@ 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"
@@ -1,50 +0,0 @@
--- ../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
-}
@@ -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=2
+TERMUX_PKG_REVISION=1
 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_SERVICE_SCRIPT=("bitcoind" 'exec bitcoind 2>&1')
+TERMUX_PKG_CONFFILES="var/service/bitcoind/run var/service/bitcoind/log/run"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_BLACKLISTED_ARCHES="arm"

@@ -25,3 +25,14 @@ 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
+}
@@ -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
-}
@@ -1,12 +0,0 @@
-diff -uNr boinc-client_release-7.16-7.16.16/_autosetup boinc-client_release-7.16-7.16.16.mod/_autosetup
--- boinc-client_release-7.16-7.16.16/_autosetup	2021-02-01 07:38:58.000000000 +0800
-+++ boinc-client_release-7.16-7.16.16.mod/_autosetup	2021-10-23 10:32:01.471359652 +0800
-@@ -19,7 +19,7 @@
- check_version()
- {
-     dir=`pwd`
-    cd /tmp
-+    cd "${TMPDIR:-/tmp}"
-     foundit=
-     ## get current version of $1
-     desired=`echo $2 | awk -F. '{print $1*100+$2}'`
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open-source software for volunteer computing"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=7.16.16
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/BOINC/boinc/archive/client_release/${TERMUX_PKG_VERSION:0:4}/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0d5656a9f8ed1048936a5764270848b892d63f27bdb863d0ace447f1eaae6002
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libcurl, openssl, zlib"
@@ -18,9 +18,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 TERMUX_PKG_CONFFILES="etc/boinc-client.conf"

 termux_step_pre_configure() {
-	# for benchmark purposes
-	CFLAGS="${CFLAGS/-Oz/-Os}"
-	CXXFLAGS="${CXXFLAGS/-Oz/-Os}"
+	CFLAGS="${CFLAGS/-Oz/-O2}"
+	CXXFLAGS="${CXXFLAGS/-Oz/-O2}"
 	LDFLAGS+=" -landroid-shmem"
 	./_autosetup
 }
@@ -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>
@@ -2,9 +2,10 @@ 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.2
+TERMUX_PKG_REVISION=1
 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=a7054a8cce28a6dee6f6eb1be262309128bbca8d572ca73154907997fd97d7ed
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+\.\d+\.\d+"
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://c-ares.haxx.se
 TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name resolves)"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.18.1
+TERMUX_PKG_VERSION=1.17.2
 TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/cares-${TERMUX_PKG_VERSION//./_}.tar.gz
-TERMUX_PKG_SHA256=414872549eec4e221b576693fdc9c9bce44ff794d0f1f06f2515b56a7f6ec9c9
+TERMUX_PKG_SHA256=444b7dbf33cb6e8a764d069e3485cbaaa28386d60eace6988275c3cb9534d300
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+.\d+.\d+"
 TERMUX_PKG_BREAKS="c-ares-dev"
@@ -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.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"
@@ -2,10 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://curl.se/docs/caextract.html
 TERMUX_PKG_DESCRIPTION="Common CA certificates"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1:2021-10-26
-TERMUX_PKG_SRCURL=https://curl.se/ca/cacert-${TERMUX_PKG_VERSION:2}.pem
+TERMUX_PKG_VERSION=20211001
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://curl.se/ca/cacert.pem
 # If the checksum has changed, it may be time to update the package version:
-TERMUX_PKG_SHA256=ae31ecb3c6e9ff3154cb7a55f017090448f88482f0e94ac927c0c67a1f33b9cf
+TERMUX_PKG_SHA256=f524fc21859b776e18df01a87880efa198112214e13494275dbcbd9bcb71d976
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

--- a/Show More
+++ b/Show More