Merge branch 'master' into master

Author: robertkirkman

.github/workflows/docker_image.yml

@@ -33,29 +33,52 @@ jobs:
     steps:
     - name: Clone repository
       uses: actions/checkout@v6
+
+    # Skip building the Docker image on scheduled runs if the last successful
+    # image build (the one tagged "latest") is less than IMAGE_MIN_INTERVAL_DAYS old.
+    - name: Optionally skip building image
+      if: github.event_name == 'schedule'
+      id: skip-build
+      env:
+        IMAGE_MIN_INTERVAL_DAYS: 30
+      run: |
+        LAST_TIMESTAMP=$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+         -H "Accept: application/vnd.github+json" \
+         "https://api.github.com/users/termux/packages/container/package-builder/versions" |
+          jq --raw-output 'map(select(.metadata.container.tags | contains(["latest"])))[0].created_at')
+        LAST_UNIX_TIME=$(date -d "$LAST_TIMESTAMP" +%s)
+        CURRENT_UNIX_TIME=$(date +%s)
+        if (( "$CURRENT_UNIX_TIME" - "$LAST_UNIX_TIME" < $IMAGE_MIN_INTERVAL_DAYS*24*60*60 )); then
+          echo "Skipping building Docker image: last successful build was done on $LAST_TIMESTAMP (< $IMAGE_MIN_INTERVAL_DAYS days)"
+          echo "skip-build=true" >> "$GITHUB_OUTPUT"
+        fi
+
     - name: Build
+      if: ${{ steps.skip-build.outputs.skip-build != 'true' }}
       run: |
         docker build --tag termux/package-builder:latest scripts/
         docker tag termux/package-builder:latest ghcr.io/termux/package-builder:latest
     - name: Build (CGCT)
+      if: ${{ steps.skip-build.outputs.skip-build != 'true' }}
       run: |
         docker build --tag termux/package-builder-cgct:latest --file scripts/Dockerfile.cgct scripts/
         docker tag termux/package-builder-cgct:latest ghcr.io/termux/package-builder-cgct:latest
     - name: Login to GHCR
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
+      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages' && steps.skip-build.outputs.skip-build != 'true'
+
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Login to Docker Hub
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
+      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages' && steps.skip-build.outputs.skip-build != 'true'
       uses: docker/login-action@v3
       with:
         username: grimler
         password: ${{ secrets.DOCKER_TOKEN }}
     - name: Push
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages'
+      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'termux/termux-packages' && steps.skip-build.outputs.skip-build != 'true'
       run: |
         # ghcr.io seem to be unstable sometimes. It may suddenly drop connection
         # during docker push when some layers are already uploaded. The workaround

packages/awscli/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://aws.amazon.com/cli
 TERMUX_PKG_DESCRIPTION="Universal Command Line Interface for Amazon Web Services"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="2.33.23"
+TERMUX_PKG_VERSION="2.33.24"
 TERMUX_PKG_SRCURL="https://github.com/aws/aws-cli/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
-TERMUX_PKG_SHA256=6124e117f30c2640a43afad6c184cb09008c3fe49855ed072a8c6a7a151653bf
+TERMUX_PKG_SHA256=2a86eb7c28abb063d006ca5cd44c9416c2cad34bec882437bc4aa669feaf9aec
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+"
 TERMUX_PKG_DEPENDS="libandroid-posix-semaphore, libandroid-support, libbz2, libexpat, libffi, liblzma, libsqlite, mandoc, openssl, readline, zlib"

packages/flyctl/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://fly.io
 TERMUX_PKG_DESCRIPTION="Command line tools for fly.io services"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="Yaksh Bariya <thunder-coding@termux.dev>"
-TERMUX_PKG_VERSION="0.4.12"
+TERMUX_PKG_VERSION="0.4.13"
 TERMUX_PKG_SRCURL=https://github.com/superfly/flyctl/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=5e759a9bb6b16bc5b2dd932a2c5920ca087129dce640e0d7363f348eb16cba14
+TERMUX_PKG_SHA256=289df7c61c5a80f3a58b03f74a3cc345a9b0ae4a037de79cfe47b73d07e8fdf0
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXCLUDED_ARCHES="i686, arm"

packages/glab-cli/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/gitlab-org/cli
 TERMUX_PKG_DESCRIPTION="A GitLab CLI tool bringing GitLab to your command line"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.85.2"
+TERMUX_PKG_VERSION="1.85.3"
 TERMUX_PKG_SRCURL=https://gitlab.com/gitlab-org/cli/-/archive/v${TERMUX_PKG_VERSION}/cli-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=b9c2029265472e386fdcf9049b7cdaebce514de440d1391813d7679d52026aaa
+TERMUX_PKG_SHA256=ed78b8c90790dc971b62d2608193947b365937b351eab77f99c064ae9b315a18
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="GLAB_VERSION=${TERMUX_PKG_VERSION}"

packages/libcap-ng/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
 TERMUX_PKG_DESCRIPTION="Library making programming with POSIX capabilities easier than traditional libcap"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="2:0.9"
+TERMUX_PKG_VERSION="2:0.9.1"
 TERMUX_PKG_SRCURL=https://github.com/stevegrubb/libcap-ng/archive/refs/tags/v${TERMUX_PKG_VERSION:2}.tar.gz
-TERMUX_PKG_SHA256=d7463da4b50924a385e306f585bb05dbe58e212ba846f8593c3b2bd31c6cb46b
+TERMUX_PKG_SHA256=52418b8940f83dcc00dcd01d187e67c3399ff65f3fa558442e3a21b415cc46c0
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --without-python

packages/libzxing-cpp/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/zxing-cpp/zxing-cpp
 TERMUX_PKG_DESCRIPTION="An open-source, multi-format 1D/2D barcode image processing library implemented in C++"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="3.0.1"
+TERMUX_PKG_VERSION="3.0.2"
 TERMUX_PKG_SRCURL="https://github.com/zxing-cpp/zxing-cpp/releases/download/v${TERMUX_PKG_VERSION}/zxing-cpp-${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_SHA256=6499792c44b6c297654565539abf67f02e0baa7c35aade6299e5cc722e0a897f
+TERMUX_PKG_SHA256=e957f13e2ad4e31badb3d9af3f6ba8999a3ca3c9cc4d6bafc98032f9cce1a090
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

packages/rclone/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://rclone.org/
 TERMUX_PKG_DESCRIPTION="rsync for cloud storage"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.73.0"
+TERMUX_PKG_VERSION="1.73.1"
 TERMUX_PKG_SRCURL=https://github.com/rclone/rclone/releases/download/v${TERMUX_PKG_VERSION}/rclone-v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=ce1d062234c4ec3f22cdfd17e24bd13be3942ed877da700caa00ed158f542c1f
+TERMUX_PKG_SHA256=1f92b371acf7a41359154296939345f44509e492f8a5adf115da6ee6bf00d905
 TERMUX_PKG_AUTO_UPDATE=true
 
 termux_step_make_install() {

packages/stunnel/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/
 TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="5.76"
+TERMUX_PKG_VERSION="5.77"
 TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=cda37eb4d0fb1e129718ed27ad77b5735e899394ce040bb2be28bbb937fd79e1
+TERMUX_PKG_SHA256=ec026f4fae4e0d25b940cc7a9451d925e359e7fd59e9edad20baea66ce45f263
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips"

packages/teleport-tsh/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/gravitational/teleport
 TERMUX_PKG_DESCRIPTION="Secure Access for Developers that doesn't get in the way"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="18.6.8"
+TERMUX_PKG_VERSION="18.7.0"
 TERMUX_PKG_SRCURL=https://github.com/gravitational/teleport/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=510572ab5bbb2018d478c0c192fe98d4ae81b4e0ca243c9dc2521db2ba5013f9
+TERMUX_PKG_SHA256=a57250671a1879498c629a0f6c06774c62423acf40f193bef438cb0384e75c93
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true

scripts/Dockerfile

@@ -31,7 +31,9 @@ RUN apt-get update && \
 	# Removed unused parts to make a smaller Docker image:
 	apt-get remove -yq --autoremove lsb-release software-properties-common && \
 	apt-get clean && \
-	rm -rf /var/lib/apt/lists/*
+	rm -rf /var/lib/apt/lists/* && \
+	su - builder -c "rm ~/lib/*.zip" && \
+	su - builder -c "rm -r ~/.android/cache/"
 
 # Switch User
 USER builder:builder