proot, libandroid-shmem: Share SHM namespace

termux · Feb 12, 2025 · 815dd22 · 815dd22
1 parent 6bf1b55
commit 815dd22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/libandroid-shmem/build.sh b/packages/libandroid-shmem/build.sh
@@ -2,9 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-shmem
 TERMUX_PKG_DESCRIPTION="System V shared memory emulation on Android using ashmem"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.5
-TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d41e0b1def94a671152e7f7c91d2839129d845f1c58998b2e22d603bac1cd14a
+TERMUX_PKG_VERSION=0.6
+# TODO: Revert after real release of libandroid-shmem
+#TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-shmem/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SRCURL=https://github.com/michalbednarski/libandroid-shmem/archive/cdee4b0686b3c8e10b79f4e96e3dbaeacbeec5a6.tar.gz
+TERMUX_PKG_SHA256=c1b8a3263ddd767671dddb0f64b68cb958f35d0431cd0dc1952031fd287a6327
 TERMUX_PKG_BREAKS="libandroid-shmem-dev"
 TERMUX_PKG_REPLACES="libandroid-shmem-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/proot/build.sh b/packages/proot/build.sh
@@ -3,19 +3,20 @@ TERMUX_PKG_DESCRIPTION="Emulate chroot, bind mount and binfmt_misc for non-root
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Michal Bednarski @michalbednarski"
 # Just bump commit and version when needed:
-_COMMIT=60485d2646c1e09105099772da4a20deda8d020d
+_COMMIT=44d2ecf522b03c88333eab8d39f58db3a5ddb527
 TERMUX_PKG_VERSION=5.1.107
-TERMUX_PKG_REVISION=65
+TERMUX_PKG_REVISION=66
 TERMUX_PKG_SRCURL=https://github.com/termux/proot/archive/${_COMMIT}.zip
-TERMUX_PKG_SHA256=e6942f8b94fb3840faa3a500295dd4d79147266f60404df7c026703436850737
+TERMUX_PKG_SHA256=d05bb3dac1e9170c19172f1c6eb501da93a135ef5631c0428af729bda5b9afac
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_DEPENDS="libtalloc"
+TERMUX_PKG_DEPENDS="libtalloc, libandroid-shmem (>= 0.6)"
 TERMUX_PKG_SUGGESTS="proot-distro"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="-C src"
 
 # Install loader in libexec instead of extracting it every time
 export PROOT_UNBUNDLE_LOADER=$TERMUX_PREFIX/libexec/proot
+export PROOT_WITH_LIBANDROID_SHMEM=1
 
 termux_step_pre_configure() {
 	CPPFLAGS+=" -DARG_MAX=131072"