libcln: bump revision

I got the following error trying to use imagemagick:
```
~ $ magick
CANNOT LINK EXECUTABLE "magick": library "libzstd.so.1" not found
```
Installing zstd fixes the issue.

.github/workflows/packages.yml

@@ -71,14 +71,14 @@ jobs:
             # This file does not belong to a package, so ignore it
             continue
           fi
-          if [[ $file =~ ^packages/([a-z0-9-]*)/([a-z0-9-]*).subpackage.sh$ ]]; then
+          if [[ $file =~ ^packages/([a-z0-9+-]*)/([a-z0-9+-]*).subpackage.sh$ ]]; then
             # A subpackage was modified, check if it was deleted or just updated
             pkg=${BASH_REMATCH[1]}
             subpkg=${BASH_REMATCH[2]}
             if [ ! -f "packages/${pkg}/${subpkg}.subpackage.sh" ]; then
               echo "$subpkg" >> ./deleted_packages.txt
             fi
-          elif [[ $file =~ ^packages/([a-z0-9-]*)/.*$ ]]; then
+          elif [[ $file =~ ^packages/([a-z0-9+-]*)/.*$ ]]; then
             # package, check if it was deleted or updated
             pkg=${BASH_REMATCH[1]}
             if [ ! -d "packages/${pkg}" ]; then
@@ -163,12 +163,15 @@ jobs:
         # Function for deleting temporary directory with uploaded files from
         # the server.
         aptly_delete_dir() {
-          echo "[*] Deleting uploads temporary directory."
+          echo "[$(date +%H:%M:%S)] Deleting uploads temporary directory..."
 
           curl_response=$(
             curl \
               --silent \
+              --retry 2 \
+              --retry-delay 3 \
               --user "${{ secrets.APTLY_API_AUTH }}" \
+              --user-agent "Termux-Packages/1.0 (https://github.com/termux/termux-packages)" \
               --request DELETE \
               --write-out "|%{http_code}" \
               https://packages.termux.org/aptly-api/files/${REPOSITORY_NAME}-${{ github.sha }}
@@ -177,7 +180,7 @@ jobs:
           http_status_code=$(echo "$curl_response" | cut -d'|' -f2)
 
           if [ "$http_status_code" != "200" ]; then
-            echo "[!] Server returned $http_status_code code while deleting temporary directory."
+            echo "[$(date +%H:%M:%S)] Warning: server returned $http_status_code code while deleting temporary directory."
           fi
         }
 
@@ -188,22 +191,30 @@ jobs:
           curl_response=$(
             curl \
               --silent \
+              --retry 2 \
+              --retry-delay 3 \
               --user "${{ secrets.APTLY_API_AUTH }}" \
+              --user-agent "Termux-Packages/1.0 (https://github.com/termux/termux-packages)" \
               --request POST \
               --form file=@${filename} \
               --write-out "|%{http_code}" \
-              https://packages.termux.org/aptly-api/files/${REPOSITORY_NAME}-${{ github.sha }}
+              https://packages.termux.org/aptly-api/files/${REPOSITORY_NAME}-${{ github.sha }} || true
           )
 
           http_status_code=$(echo "$curl_response" | cut -d'|' -f2)
 
           if [ "$http_status_code" = "200" ]; then
-            echo "[*] Uploaded: $(echo "$curl_response" | cut -d'|' -f1 | jq -r '.[]' | cut -d'/' -f2)"
+            echo "[$(date +%H:%M:%S)] Uploaded: $(echo "$curl_response" | cut -d'|' -f1 | jq -r '.[]' | cut -d'/' -f2)"
+          elif [ "$http_status_code" = "000" ]; then
+            echo "[$(date +%H:%M:%S)]: Failed to upload '$filename'. Server/proxy dropped connection during upload."
+            echo "[$(date +%H:%M:%S)]: Aborting any further uploads."
+            aptly_delete_dir
+            exit 1
           else
             # Manually cleaning up the temporary directory to reclaim disk space.
             # Don't rely on scheduled server-side scripts.
-            echo "[!] Failed to upload '$filename'. Server returned $http_status_code code."
-            echo "[!] Aborting any further uploads."
+            echo "[$(date +%H:%M:%S)] Error: failed to upload '$filename'. Server returned $http_status_code code."
+            echo "[$(date +%H:%M:%S)] Aborting any further uploads."
             aptly_delete_dir
             exit 1
           fi
@@ -214,51 +225,62 @@ jobs:
 
         # Publishing repository changes.
         if [ "$uploaded_files" = "true" ]; then
-          echo "[*] Adding packages to repository '$REPOSITORY_NAME'..."
-
+          echo "[$(date +%H:%M:%S)] Adding packages to repository '$REPOSITORY_NAME'..."
+          http_status_code=""
           curl_response=$(
             curl \
               --silent \
+              --retry 2 \
+              --retry-delay 3 \
               --user "${{ secrets.APTLY_API_AUTH }}" \
+              --user-agent "Termux-Packages/1.0 (https://github.com/termux/termux-packages)" \
               --request POST \
               --write-out "|%{http_code}" \
-              https://packages.termux.org/aptly-api/repos/${REPOSITORY_NAME}/file/${REPOSITORY_NAME}-${{ github.sha }} || true
+              https://packages-cf.termux.org/aptly-api/repos/${REPOSITORY_NAME}/file/${REPOSITORY_NAME}-${{ github.sha }} || true
           )
-
           http_status_code=$(echo "$curl_response" | cut -d'|' -f2)
 
           if [ "$http_status_code" = "200" ]; then
             warnings=$(echo "$curl_response" | cut -d'|' -f1 | jq '.Report.Warnings' | jq -r '.[]')
             if [ -n "$warnings" ]; then
-              echo "[!] WARNINGS (NON-CRITICAL):"
+              echo "[$(date +%H:%M:%S)] APTLY WARNINGS (NON-CRITICAL):"
               echo
               echo "$warnings"
               echo
             fi
+          else
+            echo "[$(date +%H:%M:%S)] Error: got http_status_code == '$http_status_code', packages may not appear in repository."
           fi
+
           # Usually temporary directory is deleted automatically, but in certain cases it is left.
           aptly_delete_dir
 
           # Final part to make changes appear in web root.
-          echo "[*] Publishing repository changes..."
-          set +e
-          curl \
-            --silent \
-            --user "${{ secrets.APTLY_API_AUTH }}" \
-            --header 'Content-Type: application/json' \
-            --request PUT \
-            --data '{"Signing": {"Passphrase": "${{ secrets.GPG_PASSPHRASE }}"}}' \
-            https://packages.termux.org/aptly-api/publish/${REPOSITORY_NAME}/${REPOSITORY_DISTRIBUTION}
-          exit_code=$?
-          echo
+          echo "[$(date +%H:%M:%S)] Publishing repository changes..."
+          http_status_code=""
+          curl_response=$(
+            curl \
+              --silent \
+              --retry 2 \
+              --retry-delay 3 \
+              --user "${{ secrets.APTLY_API_AUTH }}" \
+              --user-agent "Termux-Packages/1.0 (https://github.com/termux/termux-packages)" \
+              --header 'Content-Type: application/json' \
+              --request PUT \
+              --data '{"Signing": {"Passphrase": "${{ secrets.GPG_PASSPHRASE }}"}}' \
+              --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)
 
-          if [ "$exit_code" = 0 ]; then
-            echo "[*] Repository updated successfully."
-          elif [ "$exit_code" = 52 ]; then
-            echo "[!] Repository update takes more time than expected, server returned empty response."
-            echo "[!] This is expected if large amount of data has been submitted."
+          if [ "$http_status_code" = "200" ]; then
+            echo "[$(date +%H:%M:%S)] Repository has been updated successfully."
+          elif [ "$http_status_code" = "000" ]; then
+            echo "[$(date +%H:%M:%S)] Error: server/proxy has dropped connection."
+            # Ignore - nothing can be done with that unless we change proxy.
+            #exit 1
           else
-            echo "[!] curl exited with error code $exit_status."
-            exit "$exit_code"
+            echo "[$(date +%H:%M:%S)] Error: got http_status_code == '$http_status_code'"
+            exit 1
           fi
         fi

CODEOWNERS

@@ -0,0 +1,196 @@
+# Default assignment: frequent contributors from @termux.
+* @buttaface @Grimler91 @landfillbaby @xeffyr
+
+# GitHub Actions.
+/.github/workflows/ @xeffyr
+
+# Build system.
+/build-all.sh @Grimler91 @xeffyr
+/build-package.sh @Grimler91 @xeffyr
+/clean.sh @Grimler91 @xeffyr
+/scripts/ @Grimler91 @xeffyr
+
+# Repository utilities.
+/scripts/bin/ @xeffyr
+
+# Packages owned by @buttaface
+/packages/kak-lsp/ @buttaface
+/packages/libdispatch/ @buttaface
+/packages/libllvm/ @buttaface
+/packages/llbuild/ @buttaface
+/packages/swift/ @buttaface
+
+# Packages owned by @DLC01
+/packages/exhale/ @DLC01
+/packages/fdkaac/ @DLC01
+/packages/libfdk-aac/ @DLC01
+
+# Packages owned by @Grimler91
+/packages/chezmoi/ @Grimler91
+/packages/docopt/ @Grimler91
+/packages/game-repo/ @Grimler91
+/packages/libprotobuf-c/ @Grimler91
+/packages/libqrencode/ @Grimler91
+/packages/mpdscribble/ @Grimler91
+/packages/pass-otp/ @Grimler91
+/packages/root-repo/ @Grimler91
+/packages/runit/ @Grimler91
+/packages/science-repo/ @Grimler91
+/packages/smalltalk/ @Grimler91
+/packages/teckit/ @Grimler91
+/packages/termux-services/ @Grimler91
+/packages/texlive-bin/ @Grimler91
+
+# Packages owned by @ian4hu
+/packages/php-apcu/ @ian4hu
+/packages/php-imagick/ @ian4hu
+/packages/php-psr/ @ian4hu
+/packages/php-zephir-parser/ @ian4hu
+/packages/re2c/ @ian4hu
+
+# Packages owned by @kcubeterm
+/packages/brook/ @kcubeterm
+/packages/delve/ @kcubeterm
+/packages/duf/ @kcubeterm
+/packages/fzy/ @kcubeterm
+/packages/gh/ @kcubeterm
+/packages/gping/ @kcubeterm
+/packages/hors/ @kcubeterm
+/packages/k9s/ @kcubeterm
+/packages/lazygit/ @kcubeterm
+/packages/libtorrent/ @kcubeterm
+/packages/lsd/ @kcubeterm
+/packages/pup/ @kcubeterm
+/packages/ripgrep-all/ @kcubeterm
+/packages/rush/ @kcubeterm
+/packages/rustscan/ @kcubeterm
+/packages/shc/ @kcubeterm
+/packages/shell2http/ @kcubeterm
+/packages/shiori/ @kcubeterm
+/packages/youtubedr/ @kcubeterm
+
+# Packages owned by @librehat
+/packages/flatbuffers/ @librehat
+/packages/mimetic/ @librehat
+
+# Packages owned by @msoose
+/packages/dns2tcp/ @msoose
+/packages/proxmark3/ @msoose
+/packages/proxmark3-git/ @msoose
+/packages/recode/ @msoose
+
+# Packages owned by @michalbednarski
+/packages/proot/ @michalbednarski
+/packages/termux-am/ @michalbednarski
+
+# Packages owned by @MrAdityaAlok
+/packages/helix/ @MrAdityaAlok
+/packages/libdvbcsa/ @MrAdityaAlok
+/packages/lua-language-server/ @MrAdityaAlok
+/packages/tvheadend/ @MrAdityaAlok
+
+# Packages owned by @Neo-Oli
+/packages/cava/ @Neo-Oli
+/packages/colordiff/ @Neo-Oli
+/packages/ed/ @Neo-Oli
+/packages/libmesode/ @Neo-Oli
+/packages/libotr/ @Neo-Oli
+/packages/libsignal-protocol-c/ @Neo-Oli
+/packages/nyancat/ @Neo-Oli
+/packages/par2/ @Neo-Oli
+/packages/profanity/ @Neo-Oli
+/packages/tsocks/ @Neo-Oli
+/packages/tty-clock/ @Neo-Oli
+
+# Packages owned by @suhan-paradkar
+/packages/libsecret/ @suhan-paradkar
+/packages/mailutils/ @suhan-paradkar
+
+# Packages owned by @thunder-coding
+/packages/flyctl/ @thunder-coding
+/packages/git-sizer/ @thunder-coding
+/packages/gn/ @thunder-coding
+/packages/lychee/ @thunder-coding
+/packages/nodejs/ @thunder-coding
+/packages/nodejs-lts/ @thunder-coding
+/packages/silicon/ @thunder-coding
+/packages/slides/ @thunder-coding
+
+# Packages owned by @xeffyr
+/packages/at/ @xeffyr
+/packages/beanshell/ @xeffyr
+/packages/btfs/ @xeffyr
+/packages/build-essential/ @xeffyr
+/packages/clamav/ @xeffyr
+/packages/codecrypt/ @xeffyr
+/packages/cryptopp/ @xeffyr
+/packages/dbus/ @xeffyr
+/packages/distcc/ @xeffyr
+/packages/e2fsprogs/ @xeffyr
+/packages/exiftool/ @xeffyr
+/packages/fakeroot/ @xeffyr
+/packages/fdroidcl/ @xeffyr
+/packages/geoip2-database/ @xeffyr
+/packages/geth/ @xeffyr
+/packages/gitea/ @xeffyr
+/packages/go-findimagedupes/ @xeffyr
+/packages/gopass/ @xeffyr
+/packages/haproxy/ @xeffyr
+/packages/ipfs/ @xeffyr
+/packages/kubectl/ @xeffyr
+/packages/libice/ @xeffyr
+/packages/libmcrypt/ @xeffyr
+/packages/libmhash/ @xeffyr
+/packages/libseccomp/ @xeffyr
+/packages/libsixel/ @xeffyr
+/packages/libsm/ @xeffyr
+/packages/libx11/ @xeffyr
+/packages/libxau/ @xeffyr
+/packages/libxcb/ @xeffyr
+/packages/libxcursor/ @xeffyr
+/packages/libxdmcp/ @xeffyr
+/packages/libxext/ @xeffyr
+/packages/libxfixes/ @xeffyr
+/packages/libxft/ @xeffyr
+/packages/libxi/ @xeffyr
+/packages/libxrandr/ @xeffyr
+/packages/libxrender/ @xeffyr
+/packages/libxss/ @xeffyr
+/packages/libxtst/ @xeffyr
+/packages/libxt/ @xeffyr
+/packages/lua-lpeg/ @xeffyr
+/packages/openldap/ @xeffyr
+/packages/proot-distro/ @xeffyr
+/packages/qemu-system-x86-64-headless/ @xeffyr
+/packages/restic-server/ @xeffyr
+/packages/seccure/ @xeffyr
+/packages/shtool/ @xeffyr
+/packages/srelay/ @xeffyr
+/packages/ssss/ @xeffyr
+/packages/steghide/ @xeffyr
+/packages/termux-auth/ @xeffyr
+/packages/tk/ @xeffyr
+/packages/ttf-dejavu/ @xeffyr
+/packages/unstable-repo/ @xeffyr
+/packages/virustotal-cli/ @xeffyr
+/packages/vis/ @xeffyr
+/packages/x11-repo/ @xeffyr
+/packages/xcb-proto/ @xeffyr
+/packages/xorgproto/ @xeffyr
+/packages/xorg-util-macros/ @xeffyr
+/packages/xtrans/ @xeffyr
+
+# Packages owned by @Yonle
+/packages/chafa/ @Yonle
+/packages/fluidsynth/ @Yonle
+
+# Misc
+/packages/blogc/ @rafaelmartins
+/packages/cfengine/ @craigcomstock
+/packages/composer/ @PuneetGopinath
+/packages/emscripten/ @truboxl
+/packages/germanium/ @ravener
+/packages/gotop/ @medzikuser
+/packages/rust/ @kcotugno
+/packages/squashfs-tools-ng/ @WMCB-Tech
+/packages/xmake/ @waruqi

CONTRIBUTING.md

@@ -16,6 +16,10 @@ Developer's wiki is available at https://github.com/termux/termux-packages/wiki.
   statements like "solve it quickly", "urgently need solution" and so on. Be
   patient.
 
+  Avoid digging and commenting in old, already closed issues. Read them carefully
+  \- likely they already give solution. If it didn't worked, only then open a new
+  one. Note that we will lock down issues that are really outdated.
+
   You may report only issues happening within our official packages. Do not
   submit issues happening in third-party software - we will ignore them.
 
@@ -208,9 +212,21 @@ More about `build.sh` variables you can read on [developer's wiki](https://githu
 You can check which packages are out-of-date by visiting Termux page on
 [Repology](https://repology.org/projects/?inrepo=termux&outdated=1).
 
-Most of packages can be updated by just modifying variables `TERMUX_PKG_VERSION`
-and `TERMUX_PKG_SHA256`, which represent the package version and checksum for
-source code archive respectively.
+### General package update procedure
+
+Usually to update packages you need to just modify few variables and commit
+the changes.
+
+1. Assign the new version value to `TERMUX_PKG_VERSION`. Be careful to not
+   remove the epoch (numbered prefix, e.g `1:`, `2:`) accidentally.
+2. If there is `TERMUX_PKG_REVISION` variable set, remove it. Revision
+   should be set only for subsequent package builds within the same version.
+3. Download the source code archive and compute SHA-256 checksum:
+   ```
+   cd ./packages/${YOUR_PACKAGE}
+   (source build.sh 2>/dev/null; curl -LO "$TERMUX_PKG_SRCURL")
+   ```
+4. Assign the new checksum value to `TERMUX_PKG_SHA256`.
 
 ### Dealing with patch errors
 

build-package.sh

@@ -405,7 +405,7 @@ for ((i=0; i<${#PACKAGE_LIST[@]}; i++)); do
 				env TERMUX_ARCH="$arch" TERMUX_BUILD_IGNORE_LOCK=true ./build-package.sh \
 					${TERMUX_FORCE_BUILD+-f} ${TERMUX_INSTALL_DEPS+-i} ${TERMUX_IS_DISABLED+-D} \
 					${TERMUX_DEBUG_BUILD+-d} ${TERMUX_OUTPUT_DIR+-o $TERMUX_OUTPUT_DIR} \
-					--format ${TERMUX_PACKAGE_FORMAT} "${PACKAGE_LIST[i]}"
+					--format ${TERMUX_PACKAGE_FORMAT:=debian} "${PACKAGE_LIST[i]}"
 			done
 			exit
 		fi

disabled-packages/ghc/always-use-pic-on-android-for-dynexec.patch

@@ -0,0 +1,17 @@
+--- ghc-8.10.1/compiler/main/DynFlags.hs.orig	2020-06-13 08:56:50.595808526 +0100
++++ ghc-8.10.1/compiler/main/DynFlags.hs	2020-06-13 08:57:24.770000253 +0100
+@@ -4624,6 +4624,14 @@
+ default_PIC platform =
+   case (platformOS platform, platformArch platform) of
+     (OSDarwin, ArchX86_64) -> [Opt_PIC]
++    (OSLinux, ArchARM{}) -> [Opt_PIC]
++    (OSLinux, ArchARM64) -> [Opt_PIC]
++    (OSLinux, ArchX86) -> [Opt_PIC]
++    (OSLinux, ArchX86_64) -> [Opt_PIC]
++    (OSUnknown, ArchARM{}) -> [Opt_PIC]
++    (OSUnknown, ArchARM64) -> [Opt_PIC]
++    (OSUnknown, ArchX86) -> [Opt_PIC]
++    (OSUnknown, ArchX86_64) -> [Opt_PIC]
+     (OSOpenBSD, ArchX86_64) -> [Opt_PIC] -- Due to PIE support in
+                                          -- OpenBSD since 5.3 release
+                                          -- (1 May 2013) we need to

disabled-packages/ghc/always_link_m.patch

@@ -0,0 +1,30 @@
+diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
+index b3312b0..b0e3d90 100644
+--- a/compiler/main/SysTools.hs
++++ b/compiler/main/SysTools.hs
+@@ -414,11 +414,7 @@ linkDynLib dflags0 o_files dep_packages
+ -- math-y things are used (which we assume to include all programs). See #14022.
+ libmLinkOpts :: [Option]
+ libmLinkOpts =
+-#if defined(HAVE_LIBM)
+   [Option "-lm"]
+-#else
+-  []
+-#endif
+ 
+ getPkgFrameworkOpts :: DynFlags -> Platform -> [InstalledUnitId] -> IO [String]
+ getPkgFrameworkOpts dflags platform dep_packages
+diff --git a/rts/package.conf.in b/rts/package.conf.in
+index e4cb159..7a234cd 100644
+--- a/rts/package.conf.in
++++ b/rts/package.conf.in
+@@ -26,9 +26,7 @@ library-dirs:           TOP"/rts/dist/build" FFI_LIB_DIR LIBDW_LIB_DIR
+ hs-libraries:   "HSrts" FFI_LIB
+ 
+ extra-libraries:
+-#if defined(HAVE_LIBM)
+                                 "m"             /* for ldexp() */
+-#endif
+ #if defined(HAVE_LIBRT)
+                               , "rt"
+ #endif

disabled-packages/ghc/build.sh

@@ -0,0 +1,154 @@
+# Build failure with recent NDK.
+
+TERMUX_PKG_HOMEPAGE=https://www.haskell.org/ghc/
+TERMUX_PKG_DESCRIPTION="The Glasgow Haskell Compilation system"
+TERMUX_PKG_LICENSE="BSD 2-Clause, BSD 3-Clause, LGPL-2.1"
+TERMUX_PKG_VERSION=8.10.1
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL=http://downloads.haskell.org/~ghc/${TERMUX_PKG_VERSION}/ghc-${TERMUX_PKG_VERSION}-src.tar.xz
+TERMUX_PKG_SHA256=4e3b07f83a266b3198310f19f71e371ebce97c769b14f0d688f4cbf2a2a1edf5
+TERMUX_PKG_DEPENDS="binutils, clang, iconv, libffi, llvm, ncurses"
+TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_NO_STATICSPLIT=true
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-ld-override --build=x86_64-unknown-linux --host=x86_64-unknown-linux"
+TERMUX_PKG_BLACKLISTED_ARCHES="arm"
+
+DYNAMIC_GHC_PROGRAMS=NO
+
+termux_step_pre_configure() {
+	termux_setup_ghc
+
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=${TERMUX_HOST_PLATFORM}"
+
+	# After stage 0, cabal passes a host string to the libraries' configure scripts that isn't valid.
+	# We set one ourselves anyway, so this simply isn't needed.
+	sed -i 's/maybeHostFlag = i/maybeHostFlag = [] -- i/' libraries/Cabal/Cabal/Distribution/Simple.hs
+
+	# Android will only run PIE executables, so --no-pie, like GHC suggests, is out. GHC relies on relocations.
+	# Combine PIE and -Wl,-r together, and the linker will tell you those flags are mutually exclusive.
+	# This poses a problem as we need both. If you let the compiler handle it, then apparently all's well.
+	sed -i 's/"-Wl,-r"/"-r"/' compiler/main/DriverPipeline.hs
+
+	cp mk/build.mk.sample mk/build.mk
+	cat >> mk/build.mk <<-EOF
+	SRC_HC_OPTS     += -optc-Wno-unused-label -optc-Wno-unused-but-set-variable
+	SRC_HC_OPTS     += -optc-Wno-unused-variable -optc-Wno-unused-function
+	SRC_HC_OPTS     += -optc-Wno-unused-command-line-argument -optc-Wno-unknown-warning-option
+	GhcStage2HcOpts += -optl-Wl,--enable-new-dtags
+	INTEGER_LIBRARY = integer-simple
+	SplitSections   = YES
+	BuildFlavour         = quick-cross
+	HADDOCK_DOCS         = NO
+	BUILD_SPHINX_HTML    = NO
+	BUILD_SPHINX_PS      = NO
+	BUILD_SPHINX_PDF     = NO
+	DYNAMIC_GHC_PROGRAMS = $DYNAMIC_GHC_PROGRAMS
+	GhcLibWays = v
+	BUILD_MAN = NO
+	#STRIP_CMD = $STRIP
+	EOF
+	# If choosing to build a GHC dynamically linked to its libs, then
+	# $TERMUX_PREFIX/lib automatically gets added to the rpath that's generated
+	if [ "$DYNAMIC_GHC_PROGRAMS" != "YES" ]; then
+		echo "GhcStage2HcOpts += -optl-Wl,-rpath=$TERMUX_PREFIX/lib" >> mk/build.mk
+	fi
+
+# So... this is fun. If these options are initially passed to the configure script,
+# then building stage 0 breaks, because it's meant to run on the host with the
+# host's libs. But of course, we need to link to Termux's libffi etc. and use the
+# cross-compiler when building something to run on Android in the later stages
+patch -Np1 <<EOF
+--- a/rules/build-package-data.mk.orig	2020-06-09 23:44:52.013029077 +0000
++++ b/rules/build-package-data.mk	2020-06-09 23:45:10.589149807 +0000
+@@ -108,6 +108,15 @@
+ \$1_\$2_CONFIGURE_OPTS += --configure-option=--host=\$(TargetPlatformFull)
+ endif
+ 
++ifneq "\$3" "0"
++\$1_\$2_CONFIGURE_OPTS += --configure-option=--host=$TERMUX_HOST_PLATFORM --configure-option=CXX=$CXX --configure-option=LD=$LD --configure-option=AR=$AR
++\$1_\$2_CONFIGURE_OPTS += --configure-option=AS=$AS --configure-option=CC=$CC --configure-option=RANLIB=$RANLIB --configure-option=READELF=$READELF
++\$1_\$2_CONFIGURE_OPTS += --configure-option=OBJCOPY=$OBJCOPY --configure-option=OBJDUMP=$OBJDUMP --configure-option=--with-system-libffi
++\$1_\$2_CONFIGURE_OPTS += --configure-option=--with-ffi-includes=$TERMUX_PREFIX/include --configure-option=--with-ffi-libraries=$TERMUX_PREFIX/lib
++\$1_\$2_CONFIGURE_OPTS += --configure-option=--with-iconv-includes=$TERMUX_PREFIX/include --configure-option=--with-iconv-libraries=$TERMUX_PREFIX/lib
++\$1_\$2_CONFIGURE_OPTS += --configure-option=--with-curses-includes=$TERMUX_PREFIX/include/ncursesw --configure-option=--with-curses-libraries=$TERMUX_PREFIX/lib
++endif
++
+ ifeq "\$3" "0"
+ \$1_\$2_CONFIGURE_OPTS += \$\$(BOOT_PKG_CONSTRAINTS)
+ endif
+EOF
+
+	unset AR
+	unset AS
+	unset CC
+	export CFLAGS=""
+	unset CPP
+	export CPPFLAGS=""
+	unset CXXFLAGS
+	unset CXX
+	export LDFLAGS=""
+	unset LD
+	unset PKG_CONFIG
+	unset RANLIB
+	unset READELF
+	unset OBJCOPY
+	unset OBJDUMP
+
+	autoreconf
+}
+
+termux_step_post_make_install() {
+	# We may build GHC with `llc-9` etc., but only `llc` is present in Termux
+	sed -i 's/"LLVM llc command", "llc.*"/"LLVM llc command", "llc"/' "$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/settings"
+	sed -i 's/"LLVM opt command", "opt.*"/"LLVM opt command", "opt"/' "$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/settings"
+
+	if [ "$DYNAMIC_GHC_PROGRAMS" = "YES" ]; then
+		# Hack to turn the binaries' rpath from something relative to the build environment
+		# into something that matches Termux's FHS. patchelf needs to be installed on the host.
+		while IFS= read -r -d '' bin; do
+			local curr_rpath="$(patchelf --print-rpath "$bin" 2>/dev/null)"
+			if [ -n "$curr_rpath" ]; then
+				local paths_to_prepend=()
+				local new_rpath=()
+
+				IFS=':' read -ra paths <<< "$curr_rpath"
+				for i in "${!paths[@]}"; do
+					# Prioritise non-Haskell library paths
+					if [[ ${paths[$i]} != *ghc-$TERMUX_PKG_VERSION* ]]; then
+						paths_to_prepend+=("${paths[$i]}")
+						continue
+					fi
+					local fixed_path="${paths[$i]/\/dist-install\/build}"
+					if [ "$fixed_path" != "${paths[$i]}" ]; then
+						# Naïvely correct the path to a Haskell library
+						fixed_path="${fixed_path##*/}"
+						fixed_path=$(echo "$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/$fixed_path-"[[:digit:]]*)
+						new_rpath+=("$fixed_path")
+					else
+						# This may be the path to RTS, which does not have a version number in the folder name
+						# and nor is it apparently expected to be found in dist-install
+						fixed_path="${paths[$i]/\/dist\/build}"
+						if [ "$fixed_path" != "${paths[$i]}" ]; then
+							new_rpath+=("$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/${fixed_path##*/}")
+						else
+							new_rpath+=("$fixed_path")
+						fi
+					fi
+				done
+				# Make sure the standard Termux library path is the first entry
+				[[ ! " ${paths_to_prepend[@]} " =~ " $TERMUX_PREFIX/lib " ]] && paths_to_prepend=("$TERMUX_PREFIX/lib" "${paths_to_prepend[@]}")
+				# This isn't in the original rpath at all, but is needed
+				paths_to_prepend+=("$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/ghc-$TERMUX_PKG_VERSION")
+				local OIFS="$IFS"
+				local IFS=':'
+				printf -v new_rpath "%s:%s" "${paths_to_prepend[*]}" "${new_rpath[*]}"
+				IFS="$OIFS"
+				patchelf --set-rpath "$new_rpath" "$bin"
+			fi
+		done < <(find "$TERMUX_PREFIX/lib/ghc-$TERMUX_PKG_VERSION/bin/" -type f -print0)
+	fi
+}
+
+termux_step_install_license() {
+	install -Dm600 -t "$TERMUX_PREFIX/share/doc/ghc" "$TERMUX_PKG_SRCDIR/LICENSE"
+}

disabled-packages/ghc/undefined_symbols.patch

@@ -0,0 +1,24 @@
+--- ghc-8.10.1/rts/Trace.c	2020-03-24 04:53:17.000000000 +0000
++++ ghc-8.10.1.new/rts/Trace.c	2020-06-12 13:33:14.775373605 +0100
+@@ -12,6 +12,10 @@
+ // internal headers
+ #include "Trace.h"
+ 
++int TRACE_sched;
++int TRACE_gc;
++int TRACE_spark_sampled;
++
+ #if defined(TRACING)
+ 
+ #include "GetTime.h"
+@@ -28,10 +32,7 @@
+ #endif
+ 
+ // events
+-int TRACE_sched;
+-int TRACE_gc;
+ int TRACE_nonmoving_gc;
+-int TRACE_spark_sampled;
+ int TRACE_spark_full;
+ int TRACE_user;
+ int TRACE_cap;

disabled-packages/ghc/use-stage1-binaries-for-install.patch

@@ -0,0 +1,28 @@
+Description: Use the stage1 binaries for install
+ In order to be able to perform a cross-build, we need to use
+ the stage1 binaries during installation. Both ghc and ghc-pkg
+ are run during the install target and therefore must be able
+ to run on the build machine.
+ .
+Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+Last-Update: 2017-01-29
+
+Index: ghc-8.8.1+dfsg1/ghc.mk
+===================================================================
+--- ghc-8.8.1+dfsg1.orig/ghc.mk
++++ ghc-8.8.1+dfsg1/ghc.mk
+@@ -963,8 +963,12 @@
+ # Install packages in the right order, so that ghc-pkg doesn't complain.
+ # Also, install ghc-pkg first.
+ ifeq "$(Windows_Host)" "NO"
+-INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
+-INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
++# Use the inplace/stage1 versions for installation,
++# since the installed versions are built for the target
++#INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
++#INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
++INSTALLED_GHC_REAL=$(CURDIR)/inplace/bin/ghc-stage1
++INSTALLED_GHC_PKG_REAL=$(CURDIR)/utils/ghc-pkg/dist/build/tmp/ghc-pkg
+ else
+ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
+ INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe

disabled-packages/libffi-updated/build.sh

@@ -1,14 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://sourceware.org/libffi/
-TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming interface to various calling conventions"
-local _COMMIT=716bfd83177689e2244c4707bd513003cff92c68
-local _DATE=20171105
-TERMUX_PKG_VERSION=3.2.1.$_DATE
-TERMUX_PKG_SHA256=454577ab2d046dbdf5697f71598247fb8d8bf2d378817d5d5b8bc5dceaf822ac
-TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/archive/${_COMMIT}.zip
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory --enable-symvers=no"
-TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
-
-termux_step_pre_configure() {
-	cd $TERMUX_PKG_SRCDIR
-	./autogen.sh
-}

disabled-packages/mono/complex.h

@@ -115,4 +115,4 @@ float complex	ctanhf(float complex);
 #pragma GCC visibility pop
 __END_DECLS
 
-#endif /* _COMPLEX_H */
+#endif /* _COMPLEX_H */

disabled-packages/mono/math_private.h

@@ -761,4 +761,4 @@ long double __kernel_sinl(long double, long double, int);
 long double __kernel_cosl(long double, long double);
 long double __kernel_tanl(long double, long double, int);
 
-#endif /* !_MATH_PRIVATE_H_ */
+#endif /* !_MATH_PRIVATE_H_ */

disabled-packages/roc/build.sh

@@ -0,0 +1,38 @@
+## * Requires pulseaudio build and source directory.
+## * Uses scons build system which is not good at cross-compiling.
+
+TERMUX_PKG_HOMEPAGE=https://roc-project.github.io
+TERMUX_PKG_DESCRIPTION="Roc real-time streaming over the network"
+TERMUX_PKG_LICENSE="LGPL-2.0, MPL-2.0"
+TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
+TERMUX_PKG_VERSION=0.1.1
+TERMUX_PKG_REVISION=3
+TERMUX_PKG_SRCURL=https://github.com/roc-project/roc/archive/v$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=2aa63061b586a5f16cfcb0bfe304015a6effdcb373513cb62e76283bde7dd104
+TERMUX_PKG_DEPENDS="libltdl, libopenfec, libuv, pulseaudio"
+TERMUX_PKG_BREAKS="roc-dev"
+TERMUX_PKG_REPLACES="roc-dev"
+TERMUX_PKG_BUILD_IN_SRC=true
+
+termux_step_make() {
+	SCONS_CONFIGURE_ARGS=""
+	SCONS_CONFIGURE_ARGS+=" --prefix=$TERMUX_PREFIX"
+	SCONS_CONFIGURE_ARGS+=" --host=$TERMUX_HOST_PLATFORM"
+	SCONS_CONFIGURE_ARGS+=" --compiler=clang"
+	SCONS_CONFIGURE_ARGS+=" --disable-tools"
+	SCONS_CONFIGURE_ARGS+=" --disable-tests"
+	SCONS_CONFIGURE_ARGS+=" --disable-examples"
+	SCONS_CONFIGURE_ARGS+=" --disable-doc"
+	SCONS_CONFIGURE_ARGS+=" --disable-sox"
+	#SCONS_CONFIGURE_ARGS+=" --disable-openfec"
+	SCONS_CONFIGURE_ARGS+=" --enable-pulseaudio-modules"
+	SCONS_CONFIGURE_ARGS+=" --with-openfec-includes=$TERMUX_PREFIX/include/openfec"
+	SCONS_CONFIGURE_ARGS+=" --with-pulseaudio=$TERMUX_TOPDIR/pulseaudio/src"
+	SCONS_CONFIGURE_ARGS+=" --with-pulseaudio-build-dir=$TERMUX_TOPDIR/pulseaudio/build"
+
+	scons $SCONS_CONFIGURE_ARGS
+}
+
+termux_step_make_install() {
+	scons $SCONS_CONFIGURE_ARGS install
+}

disabled-packages/rustc-nightly/build.sh

@@ -0,0 +1,111 @@
+TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org
+TERMUX_PKG_DESCRIPTION="Rust compiler and utilities (nightly version)"
+TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm"
+TERMUX_PKG_LICENSE="MIT"
+TERMUX_PKG_MAINTAINER="@its-pointless"
+TERMUX_PKG_VERSION=1.52.0
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/2021-02-24/rustc-nightly-src.tar.xz
+TERMUX_PKG_SHA256=80536b0050fc83cdffedf617bac0fd23dc60081adc00648b90404e1a14baba18
+TERMUX_PKG_KEEP_SHARE_DOC=true
+
+termux_step_configure () {
+	termux_setup_cmake
+	termux_setup_rust
+	
+	# nightlys don't build with stable
+	rustup install beta-2021-02-14-x86_64-unknown-linux-gnu
+	rustup target add $CARGO_TARGET_NAME
+	export  PATH=$HOME/.rustup/toolchains/beta-2021-02-14-x86_64-unknown-linux-gnu/bin:$PATH
+	export	RUST_BACKTRACE=1
+	mkdir -p $TERMUX_PREFIX/opt/rust-nightly
+	RUST_PREFIX=$TERMUX_PREFIX/opt/rust-nightly
+	export PATH=$TERMUX_PKG_TMPDIR/bin:$PATH
+		sed $TERMUX_PKG_BUILDER_DIR/config.toml \
+			-e "s|@RUST_PREFIX@|$RUST_PREFIX|g" \
+			-e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
+			-e "s|@TERMUX_HOST_PLATFORM@|$TERMUX_HOST_PLATFORM|g" \
+			-e "s|@RUST_TARGET_TRIPLE@|$CARGO_TARGET_NAME|g" \
+			-e "s|@CARGO@|$(which cargo)|g" \
+			-e "s|@RUSTC@|$(which rustc)|g" > $TERMUX_PKG_BUILDDIR/config.toml
+
+	export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu
+	export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_INCLUDE_DIR=/usr/include
+	export PKG_CONFIG_ALLOW_CROSS=1
+	# for backtrace-sys
+	export CC_x86_64_unknown_linux_gnu=gcc
+	export CFLAGS_x86_64_unknown_linux_gnu="-O2"
+	# it won't link with it in TERMUX_PREFIX/lib without breaking other things.
+	cp $PREFIX/lib/libLLVM-11.1.0.so $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/
+	unset CC CXX CPP LD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS PKG_CONFIG AR RANLIB
+	if [ $TERMUX_ARCH = "x86_64" ]; then
+		cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/x86_64-linux-android/$TERMUX_PKG_API_LEVEL/libc.so $TERMUX_PREFIX/lib/
+		cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/x86_64-linux-android/$TERMUX_PKG_API_LEVEL/libdl.so $TERMUX_PREFIX/lib/
+		mv $TERMUX_PREFIX/lib/libtinfo.so.6 $TERMUX_PREFIX/lib/libtinfo.so.6.tmp
+	fi
+}
+
+termux_step_make_install () {
+	if [ ! -f "/usr/bin/llvm-dwp" ]; then
+		# errr yeah this needs to be here for docker stuff
+		sudo ln -s /usr/bin/llvm-dwp-10 /usr/bin/llvm-dwp
+	fi
+	if [ $TERMUX_ARCH = "x86_64" ]; then
+		mv $TERMUX_PREFIX ${TERMUX_PREFIX}a
+		../src/x.py dist cargo  --host x86_64-unknown-linux-gnu
+		../src/x.py dist rls  --host x86_64-unknown-linux-gnu
+		../src/x.py dist rust-analyzer  --host x86_64-unknown-linux-gnu
+		../src/x.py dist rustfmt  --host x86_64-unknown-linux-gnu
+		../src/x.py dist miri --host x86_64-unknown-linux-gnu
+		mv ${TERMUX_PREFIX}a ${TERMUX_PREFIX}
+	fi
+        ../src/x.py build --host $CARGO_TARGET_NAME --target $CARGO_TARGET_NAME --target wasm32-unknown-unknown || bash
+	../src/x.py dist --host $CARGO_TARGET_NAME --target $CARGO_TARGET_NAME --target wasm32-unknown-unknown || bash
+	mkdir $TERMUX_PKG_BUILDDIR/install
+	# miri-nightly not working.
+	for tar in rustc-nightly miri-nightly rustc-dev-nightly rust-docs-nightly rust-std-nightly rust-analysis-nightly cargo-nightly rls-nightly rustc-dev-nightly rustfmt-nightly clippy-nightly; do
+		tar -xf $TERMUX_PKG_BUILDDIR/build/dist/$tar-$CARGO_TARGET_NAME.tar.gz -C $TERMUX_PKG_BUILDDIR/install
+		# uninstall previous version
+		$TERMUX_PKG_BUILDDIR/install/$tar-$CARGO_TARGET_NAME/install.sh --uninstall --prefix=$RUST_PREFIX || true
+		$TERMUX_PKG_BUILDDIR/install/$tar-$CARGO_TARGET_NAME/install.sh --prefix=$RUST_PREFIX
+	done
+
+	tar -xf $TERMUX_PKG_BUILDDIR/build/dist/rust-src-nightly.tar.gz -C $TERMUX_PKG_BUILDDIR/install
+	$TERMUX_PKG_BUILDDIR/install/rust-src-nightly/install.sh --uninstall --prefix=$RUST_PREFIX || true
+	$TERMUX_PKG_BUILDDIR/install/rust-src-nightly/install.sh --prefix=$RUST_PREFIX
+	WASM=wasm32-unknown-unknown
+	for tar in rust-std-nightly rust-analysis-nightly; do
+		tar -xf $TERMUX_PKG_BUILDDIR/build/dist/$tar-$WASM.tar.gz -C $TERMUX_PKG_BUILDDIR/install
+		# uninstall previous version
+		$TERMUX_PKG_BUILDDIR/install/$tar-$WASM/install.sh --uninstall --prefix=$RUST_PREFIX || true
+		$TERMUX_PKG_BUILDDIR/install/$tar-$WASM/install.sh --prefix=$RUST_PREFIX
+	done
+	if [ $TERMUX_ARCH = "x86_64" ]; then
+		rm -f $TERMUX_PREFIX/lib/libc.so  $TERMUX_PREFIX/lib/libdl.so
+		mv $TERMUX_PREFIX/lib/libtinfo.so.6.tmp $TERMUX_PREFIX/lib/libtinfo.so.6
+	fi
+	
+}
+
+termux_step_post_massage () {
+	rm $TERMUX_PKG_MASSAGEDIR/$RUST_PREFIX/lib/rustlib/{components,rust-installer-version,install.log,uninstall.sh}
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/profile.d
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	echo "#!$TERMUX_PREFIX/bin/sh" > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/profile.d/rust-nightly.sh
+	echo "export PATH=$RUST_PREFIX/bin:\$PATH" >> $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/etc/profile.d/rust-nightly.sh
+	cd $TERMUX_PKG_MASSAGEDIR/$RUST_PREFIX/lib
+	ln -sf rustlib/$CARGO_TARGET_NAME/lib/lib*.so .
+	cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib
+	ln -sf ../opt/rust-nightly/lib/lib*.so .
+	ln -sf $TERMUX_PREFIX/bin/lld $TERMUX_PKG_MASSAGEDIR$RUST_PREFIX/bin/rust-lld
+	rm -f ../bin/llvm-dwp
+	if [ $TERMUX_ARCH = "x86_64" ]; then
+		rm -f $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/libtinfo.so.6
+	fi
+	rm	$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libLLVM-11.1.0.so
+}
+termux_step_create_debscripts () {
+	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
+	echo "echo 'source \$PREFIX/etc/profile.d/rust-nightly.sh to use nightly'" >> postinst
+	echo "echo 'or export RUSTC=\$PREFIX/opt/rust-nightly/bin/rustc'" >> postinst
+}

disabled-packages/rustc-nightly/config.toml

@@ -0,0 +1,48 @@
+[build]
+build = "x86_64-unknown-linux-gnu"
+host = [ "@RUST_TARGET_TRIPLE@" ]
+target = [ '@RUST_TARGET_TRIPLE@', 'wasm32-unknown-unknown' ]
+#python = "python2.7"
+#full-bootstrap = false
+extended = true
+rustc = '@RUSTC@'
+cargo = '@CARGO@'
+#configure-args = ['--target=wasm32-unknown-unknown', '--set', 'llvm.experimental-targets=WebAssembly']
+#tools = ["rls", "rustfmt", "analysis"]
+local-rebuild = false
+
+[install]
+prefix = "@RUST_PREFIX@"
+
+[llvm]
+experimental-targets = 'WebAssembly'
+link-shared = true
+
+[rust]
+#backtrace = false
+#default-linker = "clang"
+#default-ar = "ar"
+channel = "nightly"
+rpath = true
+optimize-tests = false
+codegen-tests = false
+#lld = false
+deny-warnings = false
+backtrace-on-ice = true
+
+[target.wasm32-unknown-unknown]
+#linker = @TERMUX_PREFIX@/bin/wasm-ld
+#crt-static = true
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config-10"
+
+[target.@RUST_TARGET_TRIPLE@]
+cc = "@TERMUX_HOST_PLATFORM@-clang"
+cxx = "@TERMUX_HOST_PLATFORM@-clang++"
+llvm-config = "@TERMUX_PREFIX@/bin/llvm-config"
+
+#jemalloc = "/path/to/jemalloc/libjemalloc_pic.a"
+#android-ndk = "/path/to/ndk"
+[dist]
+missing-tools = true

disabled-packages/rustc-nightly/miri-nightly.subpackage.sh

@@ -0,0 +1,4 @@
+TERMUX_SUBPKG_DESCRIPTION="An interpreter for Rust's mid-level intermediate representation"
+TERMUX_SUBPKG_INCLUDE="opt/rust-nightly/bin/cargo-miri opt/rust-nightly/bin/miri opt/rust-nightlyshare/doc/miri"
+TERMUX_SUBPKG_DEPENDS="rustc-nightly"
+

disabled-packages/rustc-nightly/os-tmpdir.patch

@@ -0,0 +1,11 @@
+--- ../rustc-1.29.2-src/src/libstd/sys/unix/os.rs	2018-10-19 14:12:31.000000000 -0700
++++ ./library/std/src/sys/unix/os.rs	2018-10-19 14:11:20.000000000 -0700
+@@ -488,7 +488,7 @@
+ pub fn temp_dir() -> PathBuf {
+     ::env::var_os("TMPDIR").map(PathBuf::from).unwrap_or_else(|| {
+         if cfg!(target_os = "android") {
+-            PathBuf::from("/data/local/tmp")
++            PathBuf::from("@TERMUX_PREFIX@/tmp")
+         } else {
+             PathBuf::from("/tmp")
+         }

disabled-packages/rustc-nightly/rust-nightly-wasm32-unknown-unknown.subpackage.sh

@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_DESCRIPTION="rust std for wasm32-unknown-unknown target"
+TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true
+TERMUX_SUBPKG_INCLUDE="opt/rust-nightly/lib/rustlib/wasm32-unknown-unknown"

disabled-packages/rustc-nightly/rust-rls-nightly.subpackage.sh

@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_DESCRIPTION="server that provides IDEs, editors, and other tools with information about Rust programs"
+TERMUX_SUBPKG_INCLUDE="opt/rust-nightly/bin/rls opt/rust-nightly/share/doc/rls"
+TERMUX_PKG_DEPENDS="rustc-nightly"

disabled-packages/rustc-nightly/rust-src-nightly.subpackage.sh

@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_DESCRIPTION="rust src"
+TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true
+TERMUX_SUBPKG_INCLUDE="opt/rust-nightly/lib/rustlib/src"

disabled-packages/rustc-nightly/rustc-dev-nightly.subpackage.sh

@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_DESCRIPTION="developer compiler libs"
+INCLUDED=$(sed 's/^...../opt\/rust-nightly\//' $TERMUX_PKG_BUILDDIR/install/rustc-dev-nightly-$CARGO_TARGET_NAME/rustc-dev/manifest.in | grep -v '\.so$' )
+TERMUX_SUBPKG_INCLUDE="$INCLUDED"

disabled-packages/rustc-nightly/rustfmt-nightly.subpackage.sh

@@ -0,0 +1,4 @@
+TERMUX_SUBPKG_DESCRIPTION="A tool for formatting Rust code according to style guidelines"
+TERMUX_SUBPKG_INCLUDE="opt/rust-nightly/bin/cargo-fmt opt/rust-nightly/bin/rustfmt opt/rust-nightlyshare/doc/rustfmt"
+TERMUX_SUBPKG_DEPENDS="rustc-nightly"
+

disabled-packages/rustc-nightly/src-librustc_llvm-build.rs.patch

@@ -0,0 +1,12 @@
+diff -u -r ../rustc-1.34.1-src/src/librustc_llvm/build.rs ./src/librustc_llvm/build.rs
+--- ../rustc-1.34.1-src/src/librustc_llvm/build.rs	2019-04-24 21:07:08.000000000 +0000
++++ ./compiler/rustc_llvm/build.rs	2019-05-05 20:56:34.090330174 +0000
+@@ -244,6 +244,8 @@
+         "c++"
+     } else if target.contains("darwin") {
+         "c++"
++    } else if target.contains("android") {
++        "c++_shared"
+     } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
+         // NetBSD uses a separate library when relocation is required
+         "stdc++_pic"

disabled-packages/rustc-nightly/use-rustc-nightly

@@ -0,0 +1,2 @@
+#!/data/data/com.termux/files/usr/bin/sh
+export PATH=/data/data/com.termux/files/usr/opt/rustc-nightly/bin:$PATH

disabled-packages/vlang/Makefile.patch

@@ -0,0 +1,28 @@
+diff -uNr v-0.2.2/Makefile v-0.2.2.mod/Makefile
+--- v-0.2.2/Makefile	2021-01-22 09:39:44.000000000 +0000
++++ v-0.2.2.mod/Makefile	2021-05-06 11:58:25.054252805 +0000
+@@ -82,23 +82,16 @@
+ 	$(V) self
+ endif
+ else
+-	$(CC) $(CFLAGS) -g -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm -lpthread $(LDFLAGS)
++	$(CC) $(CFLAGS) -g -std=gnu99 -w -o $(V) $(VC)/$(VCFILE) -lm $(LDFLAGS)
+ ifdef ANDROID
+ 	chmod 755 v
+ endif
+ 
+-ifdef prod
+-	$(V) -prod self
+-else
+-	$(V) self
+-endif
+-
+ ifndef ANDROID
+ 	$(MAKE) modules
+ endif
+ endif
+ 	@echo "V has been successfully built"
+-	@$(V) -version
+ 
+ #clean: clean_tmp
+ #git clean -xf

disabled-packages/vlang/build.sh

@@ -0,0 +1,19 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/vlang/v
+TERMUX_PKG_DESCRIPTION="Simple, fast, safe, compiled language for developing maintainable software"
+TERMUX_PKG_LICENSE="MIT"
+TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
+TERMUX_PKG_VERSION=0.2.2
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/vlang/v/archive/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=9152eec96d2eeb575782cf138cb837f315e48c173878857441d98ba679e3a9bf
+TERMUX_PKG_DEPENDS="clang"
+TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_EXTRA_MAKE_ARGS="ANDROID=1"
+
+termux_step_make_install() {
+	install -Dm700 v "$TERMUX_PREFIX"/libexec/vlang/v
+	ln -sfr "$TERMUX_PREFIX"/libexec/vlang/v "$TERMUX_PREFIX"/bin/v
+	rm -rf "$TERMUX_PREFIX"/libexec/vlang/vlib
+	cp -a cmd vlib "$TERMUX_PREFIX"/libexec/vlang/
+}
+

ndk-patches/linux-fcntl.h.patch

@@ -1,16 +0,0 @@
-diff -uNr sysroot.orig/usr/include/linux/fcntl.h sysroot/usr/include/linux/fcntl.h
---- sysroot.orig/usr/include/linux/fcntl.h	2019-02-12 16:12:24.000000000 +0000
-+++ sysroot/usr/include/linux/fcntl.h	2019-03-20 13:22:32.823142545 +0000
-@@ -51,6 +51,12 @@
- #define DN_ATTRIB 0x00000020
- #define DN_MULTISHOT 0x80000000
- #define AT_FDCWD - 100
-+/* Termux patch: This flag is not supported on Android 6.0+, and should not
-+   be needed since there are not setuid binaries. Define AT_EACCESS to 0 to
-+   avoid packages defining their own AT_EACCESS (which e.g. coreutil does)
-+   since that will only result in errors. See:
-+   https://android.googlesource.com/platform/bionic/+/3577825%5E!/      */
-+#define AT_EACCESS 0
- #define AT_SYMLINK_NOFOLLOW 0x100
- #define AT_REMOVEDIR 0x200
- #define AT_SYMLINK_FOLLOW 0x400

ndk-patches/paths.h.patch

@@ -1,5 +1,5 @@
---- ./usr/include/paths.h.orig	2020-07-10 21:50:03.778299300 +0000
-+++ ./usr/include/paths.h	2020-07-10 21:51:03.127602196 +0000
+--- ./usr/include/paths.h.orig	2021-08-16 11:55:04.492150066 +0200
++++ ./usr/include/paths.h	2021-08-16 11:55:42.498804733 +0200
 @@ -40,14 +40,14 @@
  
  #ifndef _PATH_BSHELL
@@ -12,7 +12,7 @@
  #define _PATH_CONSOLE "/dev/console"
  
  /** Default shell search path. */
--#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
+-#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system_ext/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
 +#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin"
  
  /** Path to the directory containing device files. */

ndk-patches/redefine-TCSAFLUSH.patch

@@ -9,3 +9,13 @@ diff -u -r /home/builder/lib/android-ndk/sysroot/usr/include/asm-generic/termbit
 +/* TCSAFLUSH is patched to be TCSANOW in Termux to work around Android SELinux rule */
 +#define TCSAFLUSH 0
  #endif
+--- ./usr/include/bits/termios_inlines.h.orig	2021-08-16 17:05:16.001067630 +0200
++++ ./usr/include/bits/termios_inlines.h	2021-08-16 17:05:05.851074187 +0200
+@@ -117,7 +117,6 @@
+   switch (optional_actions) {
+     case TCSANOW: cmd = TCSETS; break;
+     case TCSADRAIN: cmd = TCSETSW; break;
+-    case TCSAFLUSH: cmd = TCSETSF; break;
+     default: errno = EINVAL; return -1;
+   }
+   return ioctl(fd, cmd, s);

ndk-patches/stdio.h.patch

@@ -1,7 +1,6 @@
-diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
---- ./usr.old/include/stdio.h	2019-05-22 12:49:28.000000000 +0300
-+++ ./usr/include/stdio.h	2019-12-13 21:50:02.765565736 +0200
-@@ -44,11 +44,12 @@
+--- ./usr/include/stdio.h.orig	2021-08-16 11:48:44.308954400 +0200
++++ ./usr/include/stdio.h	2021-08-16 11:50:00.438924014 +0200
+@@ -44,6 +44,9 @@
  #include <stdarg.h>
  #include <stddef.h>
  
@@ -10,16 +9,11 @@ diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
 +
  #include <bits/seek_constants.h>
  
--#if __ANDROID_API__ < __ANDROID_API_N__
- #include <bits/struct_file.h>
--#endif
- 
- __BEGIN_DECLS
- 
+ #if __ANDROID_API__ < 24
 @@ -165,7 +166,7 @@
      __printflike(2, 0) __warnattr_strict("vsprintf is often misused; please use vsnprintf");
  char* tmpnam(char* __s)
-     __warnattr("tempnam is unsafe, use mkstemp or tmpfile instead");
+     __warnattr("tmpnam is unsafe, use mkstemp or tmpfile instead");
 -#define P_tmpdir "/tmp/" /* deprecated */
 +#define P_tmpdir "@TERMUX_PREFIX@/tmp/" /* deprecated */
  char* tempnam(const char* __dir, const char* __prefix)

ndk-patches/stdlib.h.patch

@@ -1,6 +1,5 @@
-diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h
---- sysroot.orig/usr/include/stdlib.h	2019-02-12 16:12:24.000000000 +0000
-+++ sysroot/usr/include/stdlib.h	2019-03-20 13:23:48.870108924 +0000
+--- ./usr/include/stdlib.h.orig	2021-08-16 11:50:47.432239182 +0200
++++ ./usr/include/stdlib.h	2021-08-16 11:51:31.102222894 +0200
 @@ -33,6 +33,7 @@
  #include <bits/wait.h>
  #include <malloc.h>
@@ -12,7 +11,7 @@ diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h
 @@ -224,8 +225,7 @@
  size_t wcstombs(char* __dst, const wchar_t* __src, size_t __n);
  
- #if __ANDROID_API__ >= __ANDROID_API_L__
+ #if __ANDROID_API__ >= 21
 -size_t __ctype_get_mb_cur_max(void) __INTRODUCED_IN(21);
 -#define MB_CUR_MAX __ctype_get_mb_cur_max()
 +#define MB_CUR_MAX 4

ndk-patches/sys-cdefs.h.patch

@@ -1,6 +1,6 @@
---- ./usr/include/sys/cdefs.h.orig	2020-01-18 00:06:05.760188085 +0000
-+++ ./usr/include/sys/cdefs.h	2020-01-18 00:09:52.363968728 +0000
-@@ -358,3 +358,6 @@
+--- ./usr/include/sys/cdefs.h.orig	2021-08-16 11:52:08.128876161 +0200
++++ ./usr/include/sys/cdefs.h	2021-08-16 11:52:08.555542676 +0200
+@@ -372,3 +372,6 @@
  #if __has_include(<android/ndk-version.h>)
  #include <android/ndk-version.h>
  #endif

ndk-patches/unistd.h.patch

@@ -1,6 +1,6 @@
---- sysroot/usr/include/unistd.h	2018-04-30 19:24:22.000000000 +0000
-+++ usr/include/unistd.h	2018-08-16 10:42:51.158596753 +0000
-@@ -377,4 +377,72 @@
+--- ./usr/include/unistd.h.orig	2021-08-16 11:52:08.095542840 +0200
++++ ./usr/include/unistd.h	2021-08-16 11:52:08.565542673 +0200
+@@ -375,6 +375,74 @@
  #undef _UNISTD_H_
  #endif
  
@@ -73,3 +73,5 @@
 +#endif
 +
  __END_DECLS
+ 
+ #include <android/legacy_unistd_inlines.h>

ndk-patches/utmp.h.patch

@@ -1,6 +1,6 @@
---- sysroot/usr/include/utmp.h	2021-05-07 05:45:33.518467959 +0000
-+++ usr/include/utmp.h	2021-05-07 05:46:25.195022662 +0000
-@@ -32,9 +32,9 @@
+--- ./usr/include/utmp.h.orig	2021-08-16 11:52:08.095542840 +0200
++++ ./usr/include/utmp.h	2021-08-16 11:52:08.565542673 +0200
+@@ -37,9 +37,9 @@
  #include <sys/types.h>
  #include <time.h>
  

packages/aapt/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 _TAG_VERSION=7.1.2
 _TAG_REVISION=33
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=13
+TERMUX_PKG_REVISION=15
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_DEPENDS="libc++, libexpat, libpng, libzopfli, zlib"
@@ -102,7 +102,7 @@ termux_step_make_install() {
 		socket_network_client_unix.c \
 		sockets_unix.o \
 		str_parms.c"
-	$CC $LDFLAGS \
+	$CC $CPPFLAGS $LDFLAGS \
 		-Dchar16_t=uint16_t \
 		-std=c11 \
 		-isystem $AOSP_INCLUDE_DIR \
@@ -114,8 +114,6 @@ termux_step_make_install() {
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-cutils.so
 
-
-
 	# Build libutil:
 	local LIBUTILS_TARFILE=$TERMUX_PKG_CACHEDIR/libutils_${_TAGNAME}.tar.gz
 	test ! -f $LIBUTILS_TARFILE && termux_download \

packages/alpine/build.sh

@@ -1,10 +1,10 @@
-TERMUX_PKG_HOMEPAGE=https://repo.or.cz/alpine.git
+TERMUX_PKG_HOMEPAGE=http://alpine.x10host.com/
 TERMUX_PKG_DESCRIPTION="Fast, easy to use email client"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.24.2
-TERMUX_PKG_SRCURL=https://repo.or.cz/alpine.git/snapshot/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=8e4654bce91837e053adf9d5b512f8c54234f527148a238f60ad49598581fb61
+TERMUX_PKG_VERSION=2.25
+TERMUX_PKG_SRCURL=http://alpine.x10host.com/alpine/release/src/alpine-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_SHA256=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
 TERMUX_PKG_DEPENDS="libcrypt, ncurses, openssl-tool"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-debug

packages/android-tools/build.sh

@@ -2,10 +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.0p1
-TERMUX_PKG_REVISION=2
+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=51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6
+TERMUX_PKG_SHA256=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, libusb, pcre2, googletest, libprotobuf, brotli, zstd, liblz4"
 

packages/android-tools/fix-ndk.patch

@@ -1,74 +1,7 @@
-diff -uNr android-tools-31.0.0p1/vendor/CMakeLists.adb.txt android-tools-31.0.0p1.mod/vendor/CMakeLists.adb.txt
---- android-tools-31.0.0p1/vendor/CMakeLists.adb.txt	2021-03-22 17:48:01.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/CMakeLists.adb.txt	2021-05-03 17:56:53.036722882 +0000
-@@ -192,7 +192,6 @@
- 	brotlidec
- 	brotlienc
- 	lz4
--	pthread
- 	usb-1.0
- 	z
- 	zstd)
-diff -uNr android-tools-31.0.0p1/vendor/CMakeLists.fastboot.txt android-tools-31.0.0p1.mod/vendor/CMakeLists.fastboot.txt
---- android-tools-31.0.0p1/vendor/CMakeLists.fastboot.txt	2021-03-22 17:48:01.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/CMakeLists.fastboot.txt	2021-05-03 17:56:53.036722882 +0000
-@@ -133,4 +133,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.0p1/vendor/CMakeLists.mke2fs.txt android-tools-31.0.0p1.mod/vendor/CMakeLists.mke2fs.txt
---- android-tools-31.0.0p1/vendor/CMakeLists.mke2fs.txt	2020-03-06 13:43:50.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/CMakeLists.mke2fs.txt	2021-05-03 17:56:53.036722882 +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.0p1/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h android-tools-31.0.0p1.mod/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h
---- android-tools-31.0.0p1/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/adb/pairing_auth/include/adb/pairing/pairing_auth.h	2021-05-03 17:56:53.036722882 +0000
-@@ -26,7 +26,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
-+#if 1
- 
- /**
-  * PairingAuthCtx is a wrapper around the SPAKE2 protocol + cipher initialization
-diff -uNr android-tools-31.0.0p1/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h android-tools-31.0.0p1.mod/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h
---- android-tools-31.0.0p1/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/adb/pairing_connection/include/adb/pairing/pairing_connection.h	2021-05-03 17:56:53.036722882 +0000
-@@ -37,7 +37,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
-+#if 1
- 
- const uint32_t kMaxPeerInfoSize = 8192;
- struct PeerInfo {
-diff -uNr android-tools-31.0.0p1/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h android-tools-31.0.0p1.mod/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h
---- android-tools-31.0.0p1/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/adb/pairing_connection/include/adb/pairing/pairing_server.h	2021-05-03 17:56:53.036722882 +0000
-@@ -33,7 +33,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--#if !defined(__ANDROID__) || __ANDROID_API__ >= 30
-+#if 1
- 
- // PairingServerCtx is a wrapper around the #PairingConnectionCtx APIs,
- // which handles multiple client connections.
-diff -uNr android-tools-31.0.0p1/vendor/adb/sysdeps.h android-tools-31.0.0p1.mod/vendor/adb/sysdeps.h
---- android-tools-31.0.0p1/vendor/adb/sysdeps.h	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/adb/sysdeps.h	2021-05-03 17:56:53.036722882 +0000
-@@ -482,7 +482,11 @@
+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) {
@@ -81,10 +14,10 @@ diff -uNr android-tools-31.0.0p1/vendor/adb/sysdeps.h android-tools-31.0.0p1.mod
  }
  
  static inline int adb_read(borrowed_fd fd, void* buf, size_t len) {
-diff -uNr android-tools-31.0.0p1/vendor/base/libs/androidfw/ResourceTypes.cpp android-tools-31.0.0p1.mod/vendor/base/libs/androidfw/ResourceTypes.cpp
---- android-tools-31.0.0p1/vendor/base/libs/androidfw/ResourceTypes.cpp	2020-11-12 18:02:26.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/base/libs/androidfw/ResourceTypes.cpp	2021-05-03 17:56:53.036722882 +0000
-@@ -41,7 +41,7 @@
+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>
  
@@ -93,9 +26,9 @@ diff -uNr android-tools-31.0.0p1/vendor/base/libs/androidfw/ResourceTypes.cpp an
  #include <binder/TextOutput.h>
  #endif
  
-diff -uNr android-tools-31.0.0p1/vendor/boringssl/crypto/CMakeLists.txt android-tools-31.0.0p1.mod/vendor/boringssl/crypto/CMakeLists.txt
---- android-tools-31.0.0p1/vendor/boringssl/crypto/CMakeLists.txt	2021-03-22 17:48:14.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/boringssl/crypto/CMakeLists.txt	2021-05-03 17:56:53.036722882 +0000
+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(
@@ -105,9 +38,40 @@ diff -uNr android-tools-31.0.0p1/vendor/boringssl/crypto/CMakeLists.txt android-
    DEPENDS
    err/err_data_generate.go
    err/asn1.errordata
-diff -uNr android-tools-31.0.0p1/vendor/core/fs_mgr/liblp/utility.cpp android-tools-31.0.0p1.mod/vendor/core/fs_mgr/liblp/utility.cpp
---- android-tools-31.0.0p1/vendor/core/fs_mgr/liblp/utility.cpp	2020-12-20 20:06:59.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/core/fs_mgr/liblp/utility.cpp	2021-05-03 17:56:53.040722882 +0000
+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>
@@ -126,10 +90,10 @@ diff -uNr android-tools-31.0.0p1/vendor/core/fs_mgr/liblp/utility.cpp android-to
      int fd = android_get_control_file(path.data());
      if (fd >= 0) {
          int newfd = TEMP_FAILURE_RETRY(dup(fd));
-diff -uNr android-tools-31.0.0p1/vendor/core/init/reboot.cpp android-tools-31.0.0p1.mod/vendor/core/init/reboot.cpp
---- android-tools-31.0.0p1/vendor/core/init/reboot.cpp	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/core/init/reboot.cpp	2021-05-03 17:56:53.040722882 +0000
-@@ -247,7 +247,7 @@
+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;
@@ -138,9 +102,9 @@ diff -uNr android-tools-31.0.0p1/vendor/core/init/reboot.cpp android-tools-31.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.0p1/vendor/core/libcutils/properties.cpp android-tools-31.0.0p1.mod/vendor/core/libcutils/properties.cpp
---- android-tools-31.0.0p1/vendor/core/libcutils/properties.cpp	2020-12-20 20:06:59.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/core/libcutils/properties.cpp	2021-05-03 17:56:53.040722882 +0000
+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;
  }
@@ -150,9 +114,9 @@ diff -uNr android-tools-31.0.0p1/vendor/core/libcutils/properties.cpp android-to
  
  #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
  #include <sys/_system_properties.h>
-diff -uNr android-tools-31.0.0p1/vendor/e2fsprogs/lib/ext2fs/ismounted.c android-tools-31.0.0p1.mod/vendor/e2fsprogs/lib/ext2fs/ismounted.c
---- android-tools-31.0.0p1/vendor/e2fsprogs/lib/ext2fs/ismounted.c	2019-08-21 17:14:14.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/e2fsprogs/lib/ext2fs/ismounted.c	2021-05-03 17:56:53.044722882 +0000
+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;
@@ -162,9 +126,9 @@ diff -uNr android-tools-31.0.0p1/vendor/e2fsprogs/lib/ext2fs/ismounted.c android
  	/* 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.0p1/vendor/f2fs-tools/lib/libf2fs.c android-tools-31.0.0p1.mod/vendor/f2fs-tools/lib/libf2fs.c
---- android-tools-31.0.0p1/vendor/f2fs-tools/lib/libf2fs.c	2020-12-20 12:53:55.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/f2fs-tools/lib/libf2fs.c	2021-05-03 17:56:53.044722882 +0000
+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) {
@@ -174,9 +138,27 @@ diff -uNr android-tools-31.0.0p1/vendor/f2fs-tools/lib/libf2fs.c android-tools-3
  			if (hasmntopt(mnt, MNTOPT_RO))
  				c.ro = 1;
  #endif
-diff -uNr android-tools-31.0.0p1/vendor/libbase/include/android-base/unique_fd.h android-tools-31.0.0p1.mod/vendor/libbase/include/android-base/unique_fd.h
---- android-tools-31.0.0p1/vendor/libbase/include/android-base/unique_fd.h	2020-11-12 18:02:33.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/libbase/include/android-base/unique_fd.h	2021-05-03 17:56:53.044722882 +0000
+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.
@@ -195,10 +177,10 @@ diff -uNr android-tools-31.0.0p1/vendor/libbase/include/android-base/unique_fd.h
    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.0p1/vendor/libbase/logging.cpp android-tools-31.0.0p1.mod/vendor/libbase/logging.cpp
---- android-tools-31.0.0p1/vendor/libbase/logging.cpp	2021-04-14 15:24:51.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/libbase/logging.cpp	2021-05-03 17:56:53.044722882 +0000
-@@ -65,11 +65,17 @@
+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 {
  
@@ -217,9 +199,9 @@ diff -uNr android-tools-31.0.0p1/vendor/libbase/logging.cpp android-tools-31.0.0
  #elif defined(_WIN32)
    static bool first = true;
    static char progname[MAX_PATH] = {};
-diff -uNr android-tools-31.0.0p1/vendor/libbase/properties.cpp android-tools-31.0.0p1.mod/vendor/libbase/properties.cpp
---- android-tools-31.0.0p1/vendor/libbase/properties.cpp	2020-11-12 18:02:33.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/libbase/properties.cpp	2021-05-03 17:56:53.044722882 +0000
+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"
@@ -265,9 +247,9 @@ diff -uNr android-tools-31.0.0p1/vendor/libbase/properties.cpp android-tools-31.
  
  struct WaitForPropertyData {
    bool done;
-diff -uNr android-tools-31.0.0p1/vendor/libziparchive/zip_archive.cc android-tools-31.0.0p1.mod/vendor/libziparchive/zip_archive.cc
---- android-tools-31.0.0p1/vendor/libziparchive/zip_archive.cc	2020-11-12 18:02:33.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/libziparchive/zip_archive.cc	2021-05-03 17:56:53.044722882 +0000
+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
@@ -306,9 +288,9 @@ diff -uNr android-tools-31.0.0p1/vendor/libziparchive/zip_archive.cc android-too
      android_fdsan_close_with_tag(mapped_zip.GetFileDescriptor(), GetOwnerTag(this));
  #else
      close(mapped_zip.GetFileDescriptor());
-diff -uNr android-tools-31.0.0p1/vendor/logging/liblog/logger_write.cpp android-tools-31.0.0p1.mod/vendor/logging/liblog/logger_write.cpp
---- android-tools-31.0.0p1/vendor/logging/liblog/logger_write.cpp	2021-04-14 15:24:52.000000000 +0000
-+++ android-tools-31.0.0p1.mod/vendor/logging/liblog/logger_write.cpp	2021-05-03 17:56:53.044722882 +0000
+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"
@@ -349,4 +331,4 @@ diff -uNr android-tools-31.0.0p1/vendor/logging/liblog/logger_write.cpp android-
 -
  // 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.
+ // call. We use a pointer to avoid exit time destructors.

packages/angle-grinder/build.sh

@@ -2,7 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rcoh/angle-grinder
 TERMUX_PKG_DESCRIPTION="Slice and dice logs on the command line"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.17.0
+TERMUX_PKG_VERSION=0.18.0
 TERMUX_PKG_SRCURL="https://github.com/rcoh/angle-grinder/archive/v$TERMUX_PKG_VERSION.tar.gz"
-TERMUX_PKG_SHA256=5a2054ba9eb5fcee1fef2d5fbbf1735e71bc563fc7b273890097f63297e64bf4
+TERMUX_PKG_SHA256=7a282d9eff88bb2e224b02d80b887de92286e451abf8a193248d30136d08f4e0
+TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true

packages/ant/build.sh

@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://ant.apache.org/
 TERMUX_PKG_DESCRIPTION="Java based build tool like make"
-TERMUX_PKG_VERSION=1.10.11
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-${TERMUX_PKG_VERSION}-bin.tar.bz2
-TERMUX_PKG_SHA256=ffc6c9eb2d153db76e18df70fa145744ddd0d754339df5a797a47603cfeaa8a6
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=1.10.12
+TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-${TERMUX_PKG_VERSION}-bin.tar.bz2
+TERMUX_PKG_SHA256=276ea73f267a5b1a58f02e2eb5ef594a9b2885e33afb05ef995251d4d18377a6
 TERMUX_PKG_DEPENDS="openjdk-17"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -18,5 +17,5 @@ termux_step_make_install() {
 	rm -rf $TERMUX_PREFIX/opt/ant
 	mkdir -p $TERMUX_PREFIX/opt/ant
 	cp -r ./* $TERMUX_PREFIX/opt/ant
-	ln -sfr $TERMUX_PREFIX/opt/ant/bin/ant $PREFIX/bin/ant
+	ln -sfr $TERMUX_PREFIX/opt/ant/bin/ant $TERMUX_PREFIX/bin/ant
 }

packages/apache2/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
 TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1:2.4.50
+TERMUX_PKG_VERSION=1:2.4.51
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION:2}.tar.bz2
-TERMUX_PKG_SHA256=6a2817c070c606682eb53ed963511407d3c3d7a379cdf855971467b00fb3890f
+TERMUX_PKG_SHA256=20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4
 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib"
 TERMUX_PKG_BREAKS="apache2-dev"
 TERMUX_PKG_REPLACES="apache2-dev"

packages/apt/build.sh

@@ -2,9 +2,10 @@ 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.9
+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=28597fe803a652f55f618dd7a44bd2fb2712dbd91c258dfa5981cb75356291e3
+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"

packages/aria2/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Download utility supporting HTTP/HTTPS, FTP, BitTorrent
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.36.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/aria2/aria2/releases/download/release-${TERMUX_PKG_VERSION}/aria2-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5
 TERMUX_PKG_AUTO_UPDATE=true

packages/asciidoc/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Text document format for short documents, articles, book
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=9.1.1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/asciidoc/asciidoc-py3/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=914dfc1542c30bd47faa0aaaae0985cb57d0ca584015729ccd1b94d90da3a616
 TERMUX_PKG_AUTO_UPDATE=true

packages/asciinema/asciinema-__main__.py.patch

@@ -5,7 +5,7 @@ diff -u -r ../asciinema-2.0.2/asciinema/__main__.py ./asciinema/__main__.py
  
  
  def main():
--    if locale.nl_langinfo(locale.CODESET).upper() not in ['US-ASCII', 'UTF-8']:
+-    if locale.nl_langinfo(locale.CODESET).upper() not in ['US-ASCII', 'UTF-8', 'UTF8']:
 -        print("asciinema needs an ASCII or UTF-8 character encoding to run. Check the output of `locale` command.")
 -        sys.exit(1)
 -

packages/asciinema/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://asciinema.org/
 TERMUX_PKG_DESCRIPTION="Record and share your terminal sessions, the right way"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.0.2
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_VERSION=2.1.0
 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=2578a1b5611e5375771ef6582a6533ef8d40cdbed1ba1c87786fd23af625ab68
+TERMUX_PKG_SHA256=f4f4a04ab891dd513c99f72527c83fa9e634e858f2744a17e80258b90a6bf409
 TERMUX_PKG_AUTO_UPDATE=true
 # ncurses-utils for tput which asciinema uses:
 TERMUX_PKG_DEPENDS="python, ncurses-utils"
@@ -13,7 +12,7 @@ TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_HAS_DEBUG=false
 
-_PYTHON_VERSION=3.9
+_PYTHON_VERSION=3.10
 
 TERMUX_PKG_RM_AFTER_INSTALL="
 lib/python${_PYTHON_VERSION}/site-packages/easy-install.pth

packages/aspell/build.sh

@@ -3,5 +3,8 @@ TERMUX_PKG_DESCRIPTION="A free and open source spell checker designed to replace
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.60.8
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/aspell/aspell-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2
+# To use the same compiled dictionaries on every platform:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-32-bit-hash-fun"

packages/assimp/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library to import various well-known 3D model formats in
 TERMUX_PKG_LICENSE="BSD"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=5.0.1
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/assimp/assimp/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
 TERMUX_PKG_AUTO_UPDATE=true

packages/atomicparsley/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Read, parse and set metadata of MPEG-4 and 3gp files"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1:20210715.151551.e7ad03a
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/wez/atomicparsley/archive/${TERMUX_PKG_VERSION:2}.tar.gz
 TERMUX_PKG_SHA256=546dcb5f3b625aff4f6bf22d27a0a636d15854fd729402a6933d31f3d0417e0d
 TERMUX_PKG_AUTO_UPDATE=true

packages/bgrep/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://debugmo.de/2009/04/bgrep-a-binary-grep/
 TERMUX_PKG_DESCRIPTION="Binary string grep tool"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/rsharo/bgrep/archive/bgrep-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ba5ddae672e84bf2d8ce91429a4ce8a5e3a154ee7e64d1016420f7dc7481ec0a
 TERMUX_PKG_AUTO_UPDATE=true

packages/binutils/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.37
-TERMUX_PKG_REVISION=1
+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"

packages/binutils/gold-ffsll.c.patch

@@ -0,0 +1,23 @@
+--- ./gold/ffsll.c.orig	2020-12-25 18:14:59.949086305 +0000
++++ ./gold/ffsll.c	2020-12-25 19:16:32.733522188 +0000
+@@ -29,20 +29,3 @@
+ /* This file implements ffsll for systems which don't have it.  We use
+    ffsll if possible because gcc supports it as a builtin which will
+    use a machine instruction if there is one.  */
+-
+-int
+-ffsll (long long arg)
+-{
+-  unsigned long long i;
+-  int ret;
+-
+-  if (arg == 0)
+-    ret = 0;
+-  else
+-    {
+-      ret = 1;
+-      for (i = (unsigned long long) arg; (i & 1) == 0; i >>= 1)
+-	++ret;
+-    }
+-  return ret;
+-}

packages/blackbox/build.sh

@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/StackExchange/blackbox
 TERMUX_PKG_DESCRIPTION="Safely store secrets in Git/Mercurial/Subversion"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.0.0
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/StackExchange/blackbox/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=0a8fee39dc46436472528ea3a5743c42ebefc068519545fe6fca57041f42deae
 TERMUX_PKG_DEPENDS="gnupg"

packages/boinc/build.sh

@@ -3,6 +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=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"

packages/boost/build.sh

@@ -2,15 +2,16 @@ TERMUX_PKG_HOMEPAGE=https://boost.org
 TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
 TERMUX_PKG_LICENSE="BSL-1.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.75.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=1.77.0
+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=953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb
+TERMUX_PKG_SHA256=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python"
 TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev"
 TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2), boost-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBOOST_FILESYSTEM_DISABLE_STATX=ON"
 
 termux_step_pre_configure() {
 	# Certain packages are not safe to build on device because their
@@ -28,7 +29,7 @@ termux_step_make_install() {
 
 	CC= CXX= LDFLAGS= CXXFLAGS= ./bootstrap.sh
 	echo "using clang : $TERMUX_ARCH : $CXX : <linkflags>-L$TERMUX_PREFIX/lib ; " >> project-config.jam
-	echo "using python : 3.9 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.9 : $TERMUX_PREFIX/lib ;" >> project-config.jam
+	echo "using python : 3.10 : $TERMUX_PREFIX/bin/python3 : $TERMUX_PREFIX/include/python3.10 : $TERMUX_PREFIX/lib ;" >> project-config.jam
 
 	if [ "$TERMUX_ARCH" = arm ] || [ "$TERMUX_ARCH" = aarch64 ]; then
 		BOOSTARCH=arm

packages/boost/no-statx.patch

@@ -1,12 +0,0 @@
-diff -uNr boost_1_75_0/libs/filesystem/build/Jamfile.v2 boost_1_75_0.mod/libs/filesystem/build/Jamfile.v2
---- boost_1_75_0/libs/filesystem/build/Jamfile.v2	2020-12-03 07:01:22.000000000 +0200
-+++ boost_1_75_0.mod/libs/filesystem/build/Jamfile.v2	2021-02-08 14:38:18.980601879 +0200
-@@ -53,8 +53,6 @@
-       [ check-target-builds ../config//has_stat_st_birthtim "has stat::st_birthtim" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIM ]
-       [ check-target-builds ../config//has_stat_st_birthtimensec "has stat::st_birthtimensec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMENSEC ]
-       [ check-target-builds ../config//has_stat_st_birthtimespec "has stat::st_birthtimespec" : <define>BOOST_FILESYSTEM_HAS_STAT_ST_BIRTHTIMESPEC ]
--      [ check-target-builds ../config//has_statx "has statx" : <define>BOOST_FILESYSTEM_HAS_STATX ]
--      [ check-target-builds ../config//has_statx_syscall "has statx syscall" : <define>BOOST_FILESYSTEM_HAS_STATX_SYSCALL ]
-       <conditional>@select-windows-crypto-api
-     : source-location ../src
-     : usage-requirements # pass these requirement to dependents (i.e. users)

packages/borgbackup/build.sh

@@ -3,14 +3,14 @@ TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.1.17
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7ab924fc017b24929bedceba0dcce16d56f9868bf9b5050d2aae2eb080671674
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, zstd"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-_PYTHON_VERSION=3.9
+_PYTHON_VERSION=3.10
 
 TERMUX_PKG_RM_AFTER_INSTALL="
 lib/python${_PYTHON_VERSION}/site-packages/easy-install.pth

packages/borgbackup/use-distutils.patch

@@ -83,14 +83,6 @@ index 87e93d25..5ca79af2 100644
  }
  
  ext_modules = []
-@@ -882,7 +875,6 @@ def run(self):
-         'Programming Language :: Python :: 3.7',
-         'Programming Language :: Python :: 3.8',
-         'Programming Language :: Python :: 3.9',
--        'Programming Language :: Python :: 3.10',
-         'Topic :: Security :: Cryptography',
-         'Topic :: System :: Archiving :: Backup',
-     ],
 diff --git a/src/borg/__init__.py b/src/borg/__init__.py
 index 9f13c7d6..47adb1b6 100644
 --- a/src/borg/__init__.py

packages/busybox/0000-use-clang.patch

@@ -1,7 +1,6 @@
-diff -uNr busybox-1.31.1/Makefile busybox-1.31.1.mod/Makefile
---- busybox-1.31.1/Makefile	2019-10-25 11:44:52.000000000 +0300
-+++ busybox-1.31.1.mod/Makefile	2019-11-11 22:19:06.004778909 +0200
-@@ -289,7 +289,7 @@
+--- ./Makefile.orig	2021-08-19 16:48:15.223628163 +0200
++++ ./Makefile	2021-08-19 16:47:29.456942514 +0200
+@@ -289,14 +289,14 @@
  # Make variables (CC, etc...)
  
  AS		= $(CROSS_COMPILE)as
@@ -9,4 +8,16 @@ diff -uNr busybox-1.31.1/Makefile busybox-1.31.1.mod/Makefile
 +CC		= $(CROSS_COMPILE)clang
  LD		= $(CC) -nostdlib
  CPP		= $(CC) -E
- AR		= $(CROSS_COMPILE)ar
+-AR		= $(CROSS_COMPILE)ar
+-NM		= $(CROSS_COMPILE)nm
+-STRIP		= $(CROSS_COMPILE)strip
+-OBJCOPY		= $(CROSS_COMPILE)objcopy
+-OBJDUMP		= $(CROSS_COMPILE)objdump
++AR		= llvm-ar
++NM		= llvm-nm
++STRIP		= llvm-strip
++OBJCOPY		= llvm-objcopy
++OBJDUMP		= llvm-objdump
+ PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
+ AWK		= awk
+ GENKSYMS	= scripts/genksyms/genksyms

packages/busybox/0004-Makefile.flags.patch

@@ -1,6 +1,6 @@
---- ../Makefile.flags.orig	2020-07-20 19:17:12.263392471 +0000
-+++ ./Makefile.flags	2020-07-20 19:17:22.988106865 +0000
-@@ -150,9 +150,9 @@
+--- ./Makefile.flags.orig	2021-01-01 11:52:27.000000000 +0100
++++ ./Makefile.flags	2021-08-19 16:49:06.743647568 +0200
+@@ -151,9 +151,9 @@
  # fall back to using a temp file:
  CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
  ifeq ($(CRYPT_AVAILABLE),y)

packages/busybox/0008-networking-ftpd-no-chroot.patch

@@ -1,7 +1,6 @@
-diff -uNr busybox-1.31.1/networking/ftpd.c busybox-1.31.1.mod/networking/ftpd.c
---- busybox-1.31.1/networking/ftpd.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/networking/ftpd.c	2019-11-11 22:26:50.216912741 +0200
-@@ -1301,8 +1301,11 @@
+--- ./networking/ftpd.c.orig	2021-08-19 16:49:06.730314230 +0200
++++ ./networking/ftpd.c	2021-08-19 16:49:06.753647572 +0200
+@@ -1302,8 +1302,11 @@
  		G.root_fd = xopen("/", O_RDONLY | O_DIRECTORY);
  		close_on_exec_on(G.root_fd);
  #endif

packages/busybox/0009-networking-httpd-default-port.patch

@@ -1,7 +1,6 @@
-diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.c
---- busybox-1.31.1/networking/httpd.c	2019-11-11 21:31:58.406733857 +0200
-+++ busybox-1.31.1.mod/networking/httpd.c	2019-11-11 22:29:16.534250966 +0200
-@@ -232,7 +232,7 @@
+--- ./networking/httpd.c.orig	2021-08-19 16:49:06.730314230 +0200
++++ ./networking/httpd.c	2021-08-19 16:49:06.756980906 +0200
+@@ -270,7 +270,7 @@
  //usage:     "\n	-i		Inetd mode"
  //usage:     "\n	-f		Don't daemonize"
  //usage:     "\n	-v[v]		Verbose"
@@ -10,8 +9,8 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.
  //usage:	IF_FEATURE_HTTPD_SETUID(
  //usage:     "\n	-u USER[:GRP]	Set uid/gid after binding to port")
  //usage:	IF_FEATURE_HTTPD_BASIC_AUTH(
-@@ -488,7 +488,7 @@
- 	asm volatile("":::"memory"); \
+@@ -538,7 +538,7 @@
+ 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
  	IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
  	IF_FEATURE_HTTPD_RANGES(range_start = -1;) \
 -	bind_addr_or_port = "80"; \
@@ -19,7 +18,7 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.
  	index_page = index_html; \
  	file_size = -1; \
  } while (0)
-@@ -1004,7 +1004,7 @@
+@@ -1030,7 +1030,7 @@
  	if (!errno && n && n <= 0xffff)
  		n = create_and_bind_stream_or_die(NULL, n);
  	else
@@ -28,7 +27,7 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.
  	xlisten(n, 9);
  	return n;
  }
-@@ -2209,7 +2209,7 @@
+@@ -2279,7 +2279,7 @@
  		if (proxy_entry) {
  			if (verbose > 1)
  				bb_error_msg("proxy:%s", urlcopy);

packages/busybox/0011-networking-tftp-no-chroot.patch

@@ -0,0 +1,15 @@
+--- ./networking/tftp.c.orig	2021-01-01 11:52:27.000000000 +0100
++++ ./networking/tftp.c	2021-08-19 16:49:06.763647575 +0200
+@@ -917,7 +917,12 @@
+ 		G.pw = xgetpwnam(user_opt);
+ 	}
+ 	if (argv[0]) {
++#ifdef __ANDROID__
++		// chroot may trigger seccomp and is allowed only for root anyway.
++		xchdir(argv[0]);
++#else
+ 		xchroot(argv[0]);
++#endif
+ 	}
+ 
+ 	result = recv_from_to(STDIN_FILENO,

packages/busybox/0012-networking-tftp-no-chroot.patch

@@ -1,16 +0,0 @@
-diff -uNr busybox-1.31.1/networking/tftp.c busybox-1.31.1.mod/networking/tftp.c
---- busybox-1.31.1/networking/tftp.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/networking/tftp.c	2019-11-11 22:36:27.592894669 +0200
-@@ -907,7 +907,12 @@
- 		G.pw = xgetpwnam(user_opt);
- 	}
- 	if (argv[0]) {
-+#ifdef __ANDROID__
-+		// chroot may trigger seccomp and is allowed only for root anyway.
-+		xchdir(argv[0]);
-+#else
- 		xchroot(argv[0]);
-+#endif
- 	}
- 
- 	result = recv_from_to(STDIN_FILENO,

packages/busybox/build.sh

@@ -3,15 +3,15 @@ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a singl
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.33.1
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28
 TERMUX_PKG_BUILD_IN_SRC=true
 
 TERMUX_PKG_SERVICE_SCRIPT=(
 	"telnetd" 'exec busybox telnetd -F'
-	"ftpd" 'exec busybox tcpsvd -vE 0.0.0.0 8021 busybox ftpd -w $HOME'
-	"busybox-httpd" 'exec busybox httpd -f -p 0.0.0.0:8080 -h $PREFIX/srv/www/ 2>&1'
+	"ftpd" "exec busybox tcpsvd -vE 0.0.0.0 8021 busybox ftpd -w $TERMUX_ANDROID_HOME"
+	"busybox-httpd" "exec busybox httpd -f -p 0.0.0.0:8080 -h $TERMUX_PREFIX/srv/www/ 2>&1"
 )
 
 termux_step_pre_configure() {
@@ -40,7 +40,7 @@ termux_step_configure() {
 
 termux_step_post_make_install() {
 	if $TERMUX_DEBUG_BUILD; then
-		install -Dm700 busybox_unstripped $PREFIX/bin/busybox
+		install -Dm700 busybox_unstripped $TERMUX_PREFIX/bin/busybox
 	fi
 
 	# Install busybox man page.

packages/busybox/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.33.1
-# Tue May  4 14:51:31 2021
+# Thu Aug 19 16:37:48 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -336,10 +336,10 @@ CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
+CONFIG_WHOAMI=y
 # CONFIG_WHO is not set
 # CONFIG_W is not set
 # CONFIG_USERS is not set
-CONFIG_WHOAMI=y
 CONFIG_YES=y
 
 #
@@ -510,10 +510,10 @@ CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_CRYPT=y
 # CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
 # CONFIG_ADDGROUP is not set
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
 # CONFIG_ADDUSER is not set
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=0
@@ -772,10 +772,10 @@ CONFIG_CRONTAB=y
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
 # CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASHCP is not set
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -825,13 +825,13 @@ CONFIG_STRINGS=y
 CONFIG_TIME=y
 # CONFIG_TS is not set
 CONFIG_TTYSIZE=y
+# CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 # CONFIG_UBIMKVOL is not set
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
-# CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
 

packages/ca-certificates/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Common CA certificates"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 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=f524fc21859b776e18df01a87880efa198112214e13494275dbcbd9bcb71d976
@@ -27,7 +28,7 @@ termux_step_make_install() {
 		$KEYUTIL_JAR \
 		18f1d2c82839d84949b1ad015343c509e81ef678c24db6112acc6c0761314610
 
-	local JAVA_KEYSTORE_DIR=$PREFIX/lib/jvm/openjdk-9/lib/security
+	local JAVA_KEYSTORE_DIR=$TERMUX_PREFIX/opt/openjdk-17/lib/security
 	mkdir -p $JAVA_KEYSTORE_DIR
 
 	java -jar $KEYUTIL_JAR \

packages/calc/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Arbitrary precision console calculator"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.13.0.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/lcn2/calc/releases/download/v$TERMUX_PKG_VERSION/calc-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_SHA256=6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad
 TERMUX_PKG_AUTO_UPDATE=true
@@ -14,7 +15,8 @@ termux_step_make() {
 	make USE_READLINE="-DUSE_READLINE" READLINE_EXTRAS="-lhistory -lncurses" \
 		READLINE_LIB="-L$TERMUX_PREFIX/lib -lreadline" \
 		READLINE_INCLUDE="-I$TERMUX_PREFIX/include" \
-		DEFAULT_LIB_INSTALL_PATH="$TERMUX_PREFIX/lib" CC="$CC" -j1
+		DEFAULT_LIB_INSTALL_PATH="$TERMUX_PREFIX/lib" CC="$CC" -j1 \
+		LONG_BITS=$TERMUX_ARCH_BITS
 }
 
 termux_step_make_install() {

packages/calcurse/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="calcurse is a calendar and scheduling application for th
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.7.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://calcurse.org/files/calcurse-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
 TERMUX_PKG_DEPENDS="libandroid-support, ncurses"

packages/ccls/build.sh

@@ -0,0 +1,18 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/MaskRay/ccls
+TERMUX_PKG_DESCRIPTION="C/C++/ObjC language server"
+TERMUX_PKG_LICENSE="Apache-2.0"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=0.20210330
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL=https://github.com/MaskRay/ccls/archive/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=28c228f49dfc0f23cb5d581b7de35792648f32c39f4ca35f68ff8c9cb5ce56c2
+TERMUX_PKG_DEPENDS="libllvm"
+TERMUX_PKG_BUILD_DEPENDS="rapidjson, libllvm-static"
+
+termux_step_pre_configure() {
+	touch $TERMUX_PREFIX/bin/{clang-import-test,clang-offload-wrapper}
+}
+
+termux_step_post_make_install() {
+	rm $TERMUX_PREFIX/bin/{clang-import-test,clang-offload-wrapper}
+}

packages/cfengine/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://cfengine.com/
 TERMUX_PKG_DESCRIPTION="CFEngine is a configuration management technology."
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_MAINTAINER="@cfengine"
+TERMUX_PKG_MAINTAINER="@craigcomstock"
 TERMUX_PKG_VERSION=1:3.18.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=(https://github.com/cfengine/core/archive/${TERMUX_PKG_VERSION:2}.zip
                    https://github.com/cfengine/masterfiles/archive/12b52c25e03439341aa7a6a5c7917efa06826f8d.zip
                    https://github.com/cfengine/libntech/archive/118d6e4bf5ae2611236fe3883b422d50f10da45c.zip)

packages/cgdb/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the G
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.7.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198
 TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb"

packages/check/build.sh

@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://libcheck.github.io/check
 TERMUX_PKG_DESCRIPTION="A unit testing framework for C"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.15.2
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/libcheck/check/releases/download/${TERMUX_PKG_VERSION}/check-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a
 TERMUX_PKG_AUTO_UPDATE=true

packages/chezmoi/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://chezmoi.io
 TERMUX_PKG_DESCRIPTION="Manage your dotfiles across multiple machines"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
-TERMUX_PKG_VERSION=2.6.1
+TERMUX_PKG_VERSION=2.7.3
 TERMUX_PKG_SRCURL=https://github.com/twpayne/chezmoi/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=9703edbe369a498feb82173bda6400f23b7d1624154f84aa0beccf19462f082f
+TERMUX_PKG_SHA256=a9dbaa9bd55f1c1e1c82c7ae5b7b1933f907703d5bd9976b2c14321b8c1e0d90
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make() {

packages/clamav/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
 TERMUX_PKG_VERSION=0.103.3
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9
 TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libltdl, liblzma, libxml2, openssl, pcre2, zlib"

packages/clash/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A rule-based tunnel in Go."
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="Philipp Schmitt <philipp@schmitt.co>"
 TERMUX_PKG_VERSION=1.7.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/Dreamacro/clash/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=18c2ef10df608392435a1277d3f2e256c65bec3662bf0a6c325f02be6deb4fce
 TERMUX_PKG_BUILD_IN_SRC=true

packages/clpeak/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool which profiles OpenCL devices to find their peak
 TERMUX_PKG_LICENSE="Unlicense"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.1.0
+TERMUX_PKG_REVISION=2
 _COMMIT=0777205be1d5681d5a76d46ec94588544e8462a5
 TERMUX_PKG_SRCURL=https://github.com/krrishnarraj/clpeak.git
 TERMUX_PKG_GIT_BRANCH=master

packages/clvk/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.0.20210829
+TERMUX_PKG_REVISION=1
 _COMMIT=2797e13ee3b03cbc97bc2afa3e99fc35d6a0c831
 TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git
 TERMUX_PKG_GIT_BRANCH=master

packages/cmake/build.sh

@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating version here, please update termux_setup_cmake.sh as well.
 TERMUX_PKG_VERSION=3.21.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"

packages/command-not-found/build.sh

@@ -2,6 +2,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/command-not-found
 TERMUX_PKG_DESCRIPTION="Suggest installation of packages in interactive shell sessions"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.63
+TERMUX_PKG_VERSION=1.65
 TERMUX_PKG_SRCURL=https://github.com/termux/command-not-found/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=1542113d3e831070f4a0aad790a222379a5c4a5877acc4020d3f329435c930ab
+TERMUX_PKG_SHA256=1c6a46340840c3508c60a757b8278e857fc7645807248f656bbdd11395858476

packages/coreutils/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/
 TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=8.32
-TERMUX_PKG_REVISION=8
+TERMUX_PKG_VERSION=9.0
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+TERMUX_PKG_SHA256=ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce
 TERMUX_PKG_DEPENDS="libandroid-support, libgmp, libiconv"
 TERMUX_PKG_BREAKS="chroot, busybox (<< 1.30.1-4)"
 TERMUX_PKG_REPLACES="chroot, busybox (<< 1.30.1-4)"

packages/coreutils/src-ls.c.patch

@@ -11,12 +11,3 @@ diff -uNr coreutils-8.32/src/ls.c coreutils-8.32.mod/src/ls.c
    while (true)
      {
        int oi = -1;
-@@ -3018,7 +3021,7 @@
-           if (errno != EOVERFLOW)
-             break;
-         }
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__ANDROID__)
-       else if (! found_any_entries)
-         {
-           /* If readdir finds no directory entries at all, not even "." or

packages/cppcheck/build.sh

@@ -0,0 +1,9 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/danmar/cppcheck
+TERMUX_PKG_DESCRIPTION="tool for static C/C++ code analysis"
+TERMUX_PKG_LICENSE="GPL-3.0"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=2.5
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL=https://github.com/danmar/cppcheck/archive/$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=dc27154d799935c96903dcc46653c526c6f4148a6912b77d3a50cb35dabd82e1
+TERMUX_PKG_BLACKLISTED_ARCHES="i686"

packages/cppcheck/threadexecuter.patch

@@ -0,0 +1,11 @@
+--- cli/threadexecutor.cpp.orig	2019-11-08 23:29:10.428984535 +0000
++++ ./cli/threadexecutor.cpp	2019-11-08 23:29:51.245623336 +0000
+@@ -143,7 +143,7 @@
+ 
+ bool ThreadExecutor::checkLoadAverage(size_t nchildren)
+ {
+-#if defined(__CYGWIN__) || defined(__QNX__)  // getloadavg() is unsupported on Cygwin, Qnx.
++#if defined(__CYGWIN__) || defined(__QNX__) || defined(__ANDROID__)  // getloadavg() is unsupported on Cygwin, Qnx.
+     return true;
+ #else
+     if (!nchildren || !mSettings.loadAverage) {

packages/dar/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://dar.linux.free.fr/
 TERMUX_PKG_DESCRIPTION="A full featured command-line backup tool, short for Disk ARchive"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.7.1
+TERMUX_PKG_VERSION=2.7.2
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/dar/dar/${TERMUX_PKG_VERSION}/dar-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=76dade8adbeb817ffc78bf592c8200487ab5650234cf539539a9cbc5d346beef
+TERMUX_PKG_SHA256=973fa977c19b32b1f9ecb62153c810ba8696f644eca048f214c77ad0e8eca255
 TERMUX_PKG_DEPENDS="attr, libbz2, libgcrypt, liblzma, liblzo, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 

packages/ddrescue/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU data recovery tool"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.25
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ddrescue/ddrescue-${TERMUX_PKG_VERSION}.tar.lz
 TERMUX_PKG_SHA256=ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063
 TERMUX_PKG_DEPENDS="libc++"

packages/debootstrap/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.0.124
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7700e9864b29f166b26c54153ed8c275b46f4b9a60468bb607e019a64c16cd8f
 TERMUX_PKG_DEPENDS="perl, proot, wget"

packages/debootstrap/debootstrap.patch

@@ -15,7 +15,7 @@ diff -u -r ../debootstrap-1.0.108/debootstrap ./debootstrap
  		DEBOOTSTRAP_DIR=/debootstrap
  	else
 -		DEBOOTSTRAP_DIR=/usr/share/debootstrap
-+		DEBOOTSTRAP_DIR=$PREFIX/share/debootstrap
++		DEBOOTSTRAP_DIR=@TERMUX_PREFIX@/share/debootstrap
  	fi
  fi
  
@@ -24,11 +24,11 @@ diff -u -r ../debootstrap-1.0.108/debootstrap ./debootstrap
  if in_path dpkg && \
       dpkg --print-architecture >/dev/null 2>&1; then
 -	HOST_ARCH=$(/usr/bin/dpkg --print-architecture)
-+	HOST_ARCH=$($PREFIX/bin/dpkg --print-architecture)
++	HOST_ARCH=$(@TERMUX_PREFIX@/bin/dpkg --print-architecture)
  elif in_path udpkg && \
       udpkg --print-architecture >/dev/null 2>&1; then
 -	HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
-+	HOST_ARCH=$($PREFIX/bin/udpkg --print-architecture)
++	HOST_ARCH=$(@TERMUX_PREFIX@/bin/udpkg --print-architecture)
  elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
  	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi

packages/dirb/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://dirb.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Web Directory Fuzzer."
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.22
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/dirb/files/dirb/${TERMUX_PKG_VERSION}/dirb${TERMUX_PKG_VERSION/./}.tar.gz
 TERMUX_PKG_SHA256=f3748ade231ca211a01acbec31cc6a3b576f6c56c906d73329d7dbb79f60fc2c
 TERMUX_PKG_DEPENDS="libcurl"

packages/distcc/Makefile.in.patch

@@ -0,0 +1,12 @@
+diff -uNr distcc/Makefile.in distcc.mod/Makefile.in
+--- distcc/Makefile.in	2018-07-27 08:08:55.000000000 +0300
++++ distcc.mod/Makefile.in	2019-02-05 15:54:16.980606827 +0200
+@@ -85,7 +85,7 @@
+ # directory names of possible locations for the installation to be
+ # checked.  Change the value of this variable to @bindir@ to check the
+ # installation at the location determined by 'configure'.
+-DISTCC_INSTALLATION = $(RESTRICTED_PATH)
++DISTCC_INSTALLATION = @bindir@
+ 
+ dist_files =							\
+ 	src/config.h.in						\

packages/distcc/build.sh

@@ -0,0 +1,21 @@
+TERMUX_PKG_HOMEPAGE=http://distcc.org/
+TERMUX_PKG_DESCRIPTION="Distributed C/C++ compiler."
+TERMUX_PKG_LICENSE="GPL-2.0"
+TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
+TERMUX_PKG_VERSION=3.4
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SRCURL=https://github.com/distcc/distcc/releases/download/v$TERMUX_PKG_VERSION/distcc-$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
+TERMUX_PKG_DEPENDS="libpopt"
+TERMUX_PKG_BUILD_IN_SRC=true
+
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-pump-mode
+--without-avahi
+--without-gtk
+--without-libiberty"
+
+termux_step_pre_configure() {
+	./autogen.sh
+	export LIBS="-llog"
+}

packages/distcc/src_util.c.patch

@@ -0,0 +1,13 @@
+diff -uNr distcc/src/util.c distcc.mod/src/util.c
+--- distcc/src/util.c	2018-07-27 08:08:55.000000000 +0300
++++ distcc.mod/src/util.c	2019-02-05 16:49:03.805286863 +0200
+@@ -39,6 +39,9 @@
+ #include <sys/un.h>
+ #include <sys/socket.h>
+ 
++#include <linux/in.h>
++#include <linux/in6.h>
++
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/resource.h>
+ #endif

packages/dns2tcp/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="dns2tcp is a tool for relaying TCP connections over DNS"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Marlin Sööse <marlin.soose@laro.se>"
 TERMUX_PKG_VERSION=0.5.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/alex-sector/dns2tcp/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4f6e0ed0f5a1aa079a4d377c6d2b16da8ddcffae7d1ddad1280c3e209ada410c
 TERMUX_PKG_AUTO_UPDATE=true

packages/dns2tcp/duplicate_symbol.patch

@@ -0,0 +1,11 @@
+--- ./common/includes/debug.h.orig	2021-08-19 17:33:25.204243470 +0200
++++ ./common/includes/debug.h	2021-08-19 17:33:31.160911682 +0200
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ 
+-int debug;
++int debug __attribute__((common));
+ 
+ #ifndef _WIN32
+ #define DPRINTF(level, fmt, args...)  \

packages/dnsmap/build.sh

@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/resurrecting-open-source-projects/dnsmap
 TERMUX_PKG_DESCRIPTION="Subdomain Bruteforcing Tool"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="Rabby Sheikh @xploitednoob"
+TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.36
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/resurrecting-open-source-projects/dnsmap/archive/$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=f52d6d49cbf9a60f601c919f99457f108d51ecd011c63e669d58f38d50ad853c
 TERMUX_PKG_AUTO_UPDATE=true

packages/dog/build.sh

@@ -0,0 +1,11 @@
+TERMUX_PKG_HOMEPAGE=https://dns.lookup.dog/
+TERMUX_PKG_DESCRIPTION="A command-line DNS client."
+TERMUX_PKG_LICENSE="EUPL-1.2"
+TERMUX_PKG_LICENSE_FILE="LICENCE"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=0.1.0
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SRCURL=https://github.com/ogham/dog/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=82387d38727bac7fcdb080970e84b36de80bfe7923ce83f993a77d9ac7847858
+TERMUX_PKG_DEPENDS="openssl, resolv-conf"
+TERMUX_PKG_BUILD_IN_SRC=true

packages/dog/src-resolve.rs.patch

@@ -0,0 +1,12 @@
+diff -uNr dog-0.1.0/src/resolve.rs dog-0.1.0.mod/src/resolve.rs
+--- dog-0.1.0/src/resolve.rs	2020-11-07 13:54:47.000000000 +0200
++++ dog-0.1.0.mod/src/resolve.rs	2021-10-15 19:11:54.059069719 +0300
+@@ -42,7 +42,7 @@
+     use std::io::{BufRead, BufReader};
+     use std::fs::File;
+ 
+-    let f = File::open("/etc/resolv.conf")?;
++    let f = File::open("@TERMUX_PREFIX@/etc/resolv.conf")?;
+     let reader = BufReader::new(f);
+ 
+     let mut nameservers = Vec::new();