Merge remote-tracking branch 'termux/master'

Author: lfdevs

.github/actions/zram/action.yml

@@ -21,19 +21,26 @@ runs:
       shell: bash
       run: |
         set -euo pipefail
-        KERNEL_VERSION="$(uname -r | grep -o "^[0-9\\.]*")"
+        # We need to use the full kernel version instead of just the kernel version for caching the zram module as
+        # GitHub Actions seems to have two different kernels with the same version but different patch versions
+        # which are not compatible with each other.
+        # For example 6.17.0-1010-azure and 6.17.0-1030-azure
+        FULL_KERNEL_VERSION="$(uname -r)"
+        KERNEL_VERSION="$(grep -o "^[0-9\\.]*" <<< "${FULL_KERNEL_VERSION}")"
         TAR_KERNEL_VERSION="${KERNEL_VERSION%\.0}"
 
+        echo "full_kernel_version=${FULL_KERNEL_VERSION}" >> "$GITHUB_OUTPUT"
         echo "kernel_version=${KERNEL_VERSION}" >> "$GITHUB_OUTPUT"
         echo "tar_version=${TAR_KERNEL_VERSION}" >> "$GITHUB_OUTPUT"
-        echo "modules_dir=/lib/modules/$(uname -r)" >> "$GITHUB_OUTPUT"
+        echo "modules_dir=/lib/modules/${FULL_KERNEL_VERSION}" >> "$GITHUB_OUTPUT"
 
     - name: Restore cached zram kernel module
       id: cache-zram
       uses: actions/cache/restore@v5
       with:
         path: scripts/zram.ko.zst
-        key: ${{ steps.kernel-info.outputs.kernel_version }}-${{ hashFiles('scripts/linux-kernel-signing-keys.gpg') }}-${{ hashFiles('.github/actions/zram/action.yml') }}
+        # See above section where FULL_KERNEL_VERSION is declared for why we need to use full kernel version for caching the builds
+        key: ${{ steps.kernel-info.outputs.full_kernel_version }}-${{ hashFiles('scripts/linux-kernel-signing-keys.gpg') }}-${{ hashFiles('.github/actions/zram/action.yml') }}
 
     - name: Build zram kernel module
       if: steps.cache-zram.outputs.cache-hit != 'true'
@@ -69,7 +76,7 @@ runs:
     - name: Enable zram kernel module
       shell: bash
       run: |
-        set -euo pipefail
+        set -euov pipefail
         sudo cp scripts/zram.ko.zst ${{ steps.kernel-info.outputs.modules_dir }}/kernel/
         sudo depmod
         sudo modprobe zram

build-package.sh

@@ -515,15 +515,17 @@ _show_usage() {
 	echo "Build a package by creating a .deb file in the output/ folder."
 	echo
 	echo "Available options:"
-	[[ "$TERMUX_ON_DEVICE_BUILD" = "false" ]] && echo "  -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
+	[[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]] && echo "  -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
 	echo "  -c Continue previous build."
 	echo "  -C Cleanup already built packages on low disk space."
 	echo "  -d Build with debug symbols."
 	echo "  -D Build a disabled package in disabled-packages/."
 	echo "  -f Force build even if package has already been built."
 	echo "  -F Force build even if package and its dependencies have already been built."
-	[[ "$TERMUX_ON_DEVICE_BUILD" = "false" ]] && echo "  -i Download and extract dependencies instead of building them."
+	[[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]] && echo "  -i Download and extract dependencies instead of building them."
 	echo "  -I Download and extract dependencies instead of building them, keep existing $TERMUX_BASE_DIR files."
+	echo "  -j <N> Number of threads. (default or 0, N = \`nproc\` = $(nproc))"
+	echo "         Can also be passed combined, e.g. '-j12'."
 	echo "  -L The package and its dependencies will be based on the same library."
 	echo "  -q Quiet build."
 	echo "  -Q Loud build -- set -x debug output and function tracing."
@@ -584,6 +586,21 @@ while (( $# )); do
 			export TERMUX_INSTALL_DEPS=true
 			export TERMUX_PKGS__BUILD__RM_ALL_PKGS_BUILT_MARKER_AND_INSTALL_FILES=false
 		;;
+		-j|-j[0-9]*)
+			# If we got the 2 arg form discard the "-j".
+			[[ "$1" == "-j" && "${2:-}" == [0-9]* ]] && shift 1
+			# Check that -j's argument exists and is numeric.
+			[[ -n "${1/-j}" && "${1/-j}" =~ ^[0-9]+$ ]] || termux_error_exit "./build-package.sh: option '-j' only takes integers"
+
+			# Assign the requested number of threads.
+			# If the result is 0 or negative then default to `nproc`
+			TERMUX_PKG_MAKE_PROCESSES="${1/-j}"
+			if (( TERMUX_PKG_MAKE_PROCESSES < 1 )); then
+				TERMUX_PKG_MAKE_PROCESSES="$(nproc)"
+			fi
+
+			export TERMUX_PKG_MAKE_PROCESSES
+		;;
 		-L) export TERMUX_GLOBAL_LIBRARY=true;;
 		-q) export TERMUX_QUIET_BUILD=true;;
 		-Q) export PS4='+$0 \[\e[32m\]${FUNCNAME[0]:-<global scope>}${FUNCNAME[*]:+()}:$LINENO\[\e[0m\] '; set -x;;
@@ -632,7 +649,7 @@ if [[ -n "${TERMUX_PACKAGE_LIBRARY-}" ]]; then
 	esac
 fi
 
-if [[ "${TERMUX_INSTALL_DEPS-false}" = "true" || "${TERMUX_PACKAGE_LIBRARY-bionic}" = "glibc" ]]; then
+if [[ "${TERMUX_INSTALL_DEPS-false}" == "true" || "${TERMUX_PACKAGE_LIBRARY-bionic}" == "glibc" ]]; then
 	# Setup PGP keys for verifying integrity of dependencies.
 	# Keys are obtained from our keyring package.
 	gpg --list-keys 2C7F29AE97891F6419A9E2CDB0076E490B71616B > /dev/null 2>&1 || {
@@ -776,7 +793,7 @@ for (( i=0; i < ${#PACKAGE_LIST[@]}; i++ )); do
 		cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX_CLASSICAL"
 		termux_step_post_massage
 		# At the final stage (when the package is archiving) it is better to use commands from the system
-		if [[ "$TERMUX_ON_DEVICE_BUILD" = "false" ]]; then
+		if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
 			export PATH="/usr/bin:$PATH"
 		fi
 		cd "$TERMUX_PKG_MASSAGEDIR"

disabled-packages/ceu-lang/build.sh

@@ -10,8 +10,7 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=bc3417d7a2a568d33ea01097bdfab6d34bb89da4b6191c169140a21cfefa5301
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_BUILD_DEPENDS="lua53, lua53-lpeg"
-TERMUX_PKG_DEPENDS="lua53, lua53-lpeg, liblua53"
+TERMUX_PKG_DEPENDS="lua53, lua53-lpeg"
 
 termux_step_post_get_source() {
 	git fetch --unshallow

packages/clidle/build.sh disabled-packages/clidle/build.shpackages/clidle/build.sh renamed to disabled-packages/clidle/build.sh

@@ -1,16 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://www.finnie.org/software/2ping/
 TERMUX_PKG_DESCRIPTION="A bi-directional ping utility"
-TERMUX_PKG_LICENSE="GPL-2.0"
+TERMUX_PKG_LICENSE="MPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=4.5.1
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_SRCURL=https://github.com/rfinnie/2ping/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0f85dc21be1266daccfbba903819ca8935ebdbe002b1e0305bfda258af44fdcd
-TERMUX_PKG_DEPENDS="python"
+TERMUX_PKG_VERSION=4.6.1
+TERMUX_PKG_SRCURL="https://github.com/rfinnie/2ping/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
+TERMUX_PKG_SHA256=c8352b6653c3194af1f869107655df3f98ab18b560e8bce86eabac08d73c72eb
+TERMUX_PKG_DEPENDS="python, python-pip"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
+TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_post_make_install() {
-	install -Dm600 -t $TERMUX_PREFIX/share/man/man1 doc/2ping.1
+	install -Dm600 -t "$TERMUX_PREFIX/share/man/man1" doc/2ping.1
 }

packages/2ping/build.sh

@@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Very simple server for the Gemini hypertext protocol"
 TERMUX_PKG_LICENSE="MIT, Apache-2.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE-MIT, LICENSE-APACHE"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="3.3.22"
+TERMUX_PKG_VERSION="3.3.23"
 TERMUX_PKG_SRCURL=https://github.com/mbrubeck/agate/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=7fc67b7a1620cdc3d62f629dfd25e4c7eb28325f9ba6a7e95d36e633de286d0d
+TERMUX_PKG_SHA256=b88dd2f7adeecef209675fbf83962a553dbf44441cb6cf8b8b094e0f0d55286d
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 

packages/agate/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE="https://github.com/asciinema/agg"
 TERMUX_PKG_DESCRIPTION="asciinema gif generator"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.8.1"
+TERMUX_PKG_VERSION="1.9.0"
 TERMUX_PKG_SRCURL="https://github.com/asciinema/agg/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=9a2a7e6ca2748befb6a4c1c3eff437ae6029fde99ec882a951b3671aa30eacdb
+TERMUX_PKG_SHA256=8170119502ad2c1c697e5cd4d050d87c425ecee726c5f6c3c2140703bcb31bb3
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_RECOMMENDS="asciinema"
 TERMUX_PKG_BUILD_IN_SRC=true

packages/agg/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://algernon.roboticoverlords.org/
 TERMUX_PKG_DESCRIPTION="Small self-contained web server with Lua, Markdown, QUIC, Redis and PostgreSQL support"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.17.6"
+TERMUX_PKG_VERSION="1.17.9"
 TERMUX_PKG_SRCURL="https://github.com/xyproto/algernon/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=9e95d59c0d821e06b7193a115447bd16cd8bfa077538237a17bf508053ef15bb
+TERMUX_PKG_SHA256=4466f10bbbe278eb79dea571c040e16b154dacca83c736b7c3f8474f5e17f110
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make() {

packages/algernon/build.sh

@@ -1,6 +1,6 @@
 --- a/engine/config.go
 +++ b/engine/config.go
-@@ -154,7 +154,7 @@
+@@ -188,7 +188,7 @@
 
  // New creates a new server configuration based using the default values
  func New(versionString, description string) (*Config, error) {
@@ -9,16 +9,16 @@
  	ac := &Config{
  		curlSupport: true,
 
-@@ -187,7 +187,7 @@
- 		defaultLuaDataFilename: "data.lua",
+@@ -222,7 +222,7 @@
+ 		defaultLogFile: filepath.Join(tmpdir, "algernon.log"),
 
  		// List of configuration filenames to check
 -		serverConfigurationFilenames: []string{"/etc/algernon/serverconf.lua", "/etc/algernon/server.lua"},
 +		serverConfigurationFilenames: []string{"@TERMUX_PREFIX@/etc/algernon/serverconf.lua", "@TERMUX_PREFIX@/etc/algernon/server.lua"},
 
  		// Compression speed over compactness
  		cacheCompressionSpeed: true,
-@@ -218,7 +218,7 @@
+@@ -254,7 +254,7 @@
  		return nil, err
  	}
  	// Read in the mimetype information from the system. Set UTF-8 when setting Content-Type.
@@ -29,33 +29,33 @@
  	// File stat cache
 --- a/engine/flags.go
 +++ b/engine/flags.go
-@@ -206,9 +206,9 @@
+@@ -230,9 +230,9 @@
  	switch {
  	case ac.productionMode:
  		// Use system directories
 -		ac.serverDirOrFilename = "/srv/algernon"
--		ac.serverCert = "/etc/algernon/cert.pem"
--		ac.serverKey = "/etc/algernon/key.pem"
+-		ac.serve.serverCert = "/etc/algernon/cert.pem"
+-		ac.serve.serverKey = "/etc/algernon/key.pem"
 +		ac.serverDirOrFilename = "@TERMUX_PREFIX@/var/lib/algernon"
-+		ac.serverCert = "@TERMUX_PREFIX@/etc/algernon/cert.pem"
-+		ac.serverKey = "@TERMUX_PREFIX@/etc/algernon/key.pem"
++		ac.serve.serverCert = "@TERMUX_PREFIX@/etc/algernon/cert.pem"
++		ac.serve.serverKey = "@TERMUX_PREFIX@/etc/algernon/key.pem"
  		ac.cacheMode = cachemode.Production
  		ac.serverMode = true
  	case ac.devMode:
 --- a/engine/serve.go
 +++ b/engine/serve.go
-@@ -167,7 +167,7 @@
- 			// If $XDG_CONFIG_DIR is not set, use $HOME.
- 			// If $HOME is not set, use $TMPDIR.
- 			// If $TMPDIR is not set, use /tmp.
--			certStorageDir := env.StrAlt("XDG_CONFIG_DIR", "HOME", env.Str("TMPDIR", "/tmp"))
-+			certStorageDir := env.StrAlt("XDG_CONFIG_DIR", "HOME", env.Str("TMPDIR", "@TERMUX_PREFIX@/tmp"))
- 
- 			defaultEmail := env.Str("LOGNAME", "root") + "@localhost"
- 			if len(ac.certMagicDomains) > 0 {
+@@ -132,7 +132,7 @@
+ // configureCertMagic sets CertMagic package-level defaults from ac.
+ // If $XDG_CONFIG_DIR is not set, uses $HOME, then $TMPDIR, then /tmp for cert storage.
+ func (ac *Config) configureCertMagic() {
+-	certStorageDir := env.StrAlt("XDG_CONFIG_DIR", "HOME", env.Str("TMPDIR", "/tmp"))
++	certStorageDir := env.StrAlt("XDG_CONFIG_DIR", "HOME", env.Str("TMPDIR", "@TERMUX_PREFIX@/tmp"))
+ 	defaultEmail := env.StrAlt("LOGNAME", "USER", "root") + "@localhost"
+ 	if len(ac.serve.certMagicDomains) > 0 {
+ 		defaultEmail = "webmaster@" + ac.serve.certMagicDomains[0]
 --- a/vendor/github.com/caddyserver/certmagic/dnsutil.go
 +++ b/vendor/github.com/caddyserver/certmagic/dnsutil.go
-@@ -339,4 +339,4 @@
+@@ -376,4 +376,4 @@
  	fqdnSOACacheMu sync.Mutex
  )
 

packages/algernon/fix-hardcoded-paths.patch

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.alsa-project.org
 TERMUX_PKG_DESCRIPTION="The Advanced Linux Sound Architecture (ALSA) - library"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.2.15.3"
+TERMUX_PKG_VERSION="1.2.16"
 TERMUX_PKG_SRCURL="https://github.com/alsa-project/alsa-lib/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
-TERMUX_PKG_SHA256=7a3bee640f1c29fdfa3d1f922185929b546f012c27a73bbb6b424d12488c3c8e
+TERMUX_PKG_SHA256=bae5ee588685da7143c3f17c6e7d3e0ce4d139d9de8e59a5cab7c99f314ecfab
 TERMUX_PKG_DEPENDS="libandroid-sysv-semaphore, libandroid-shmem"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"