commit f620749ca029e88384b67d240c5a7999840cdc12
parent f0bd03a76a4d5b8f79039e98bd33ff074b3f8cc4
Author: ccx <ccx@te2000.cz>
Date: Sat, 13 Apr 2024 19:30:34 +0000
Use safelink in container inbox handling
Diffstat:
10 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -45,3 +45,5 @@ f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 2577 https://de
5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c 555754 https://download.savannah.nongnu.org/releases/acl/acl-2.3.2.tar.gz
f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb 189200 https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.69.tar.xz
39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87 492539 https://download.savannah.nongnu.org/releases/attr/attr-2.5.2.tar.gz
+55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33 432376 https://libbsd.freedesktop.org/releases/libbsd-0.11.8.tar.xz
+1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332 271228 https://archive.hadrons.org/software/libmd/libmd-1.1.0.tar.xz
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
-#+system-config.ff88046233b341bd0219fe24ea22512e2ec477abee044c27345dca1f3d1b8860
-#+system-config-rc.2ca809836808be21b6ba7198d0d363d416581eff967c4d97e119327ab08f7563
+#+system-config.0d7709cdb806a2bf93e44a21d9b3fdd0125ca2858ac48dae134c1d1ea9a06712
+#+system-config-rc.9c64236a510b6429edc0a4600bab519f7febcba35ce5e3f1820272aee8cf63d7
#+system-config-scripts.67e57dfdf150bbd6e0b01d5ca3fa89f0547997a8adb2c12f7e4d67602acb161a
-#+system-config-init.527c957e0c16bca5ed21d47ca4b7048e7fe48aab6f336bbc120545b66c893233
+#+system-config-init.65ad7b7612ca6804d834a72520268fe6caf8d27c350c834b31c321d2fe713542
#+system-config-zsh.7500a7c1af8c349cd87493d5f6e2fe5c31148b42d11103154ecca654e6326ba5
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
@@ -27,7 +27,7 @@
#+confz.208d2a701777a5703ca126f9fee4220610a9fb2b5241c5850d66a92bc0e682b2
#+containers.f505d6ed0c843d085f79b90ed638dcb7473fe4602cfcba4f453c2a3f6eaa7421
#+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697
-#+logincaps.bc2dddd37f74632c5dea6eb1300838321b4c29fa4177e6bc368eca8c1bd4bc06
+#+logincaps.2aa5206d6b16cf5d9630c8f74710e42c494ddf1c48b8c3ce3754fed66812e1bd
#+snaprep.4f1281cfb76562b94e47b6c021584d870be9c2900bd8d52db40848f58b5f7812
#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c
#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb
diff --git a/packages/logincaps b/packages/logincaps
@@ -4,7 +4,8 @@
#+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c
#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
-#@git:c7740ea2debf35723b5728ebbd78d2cab0296cdf:logincaps
+#+safelink.2d92de9b612ee28903b199a7635db564e24f5ee31a0008bfa0cb16972bd46284
+#@git:d95bcf921a3a10186fdc1aaf79e86ec29134a8c9:logincaps
: ${JOBS:=1}
prefix=/versions/$pthbs_package
@@ -43,6 +44,10 @@ cd login
sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\""
cp -a login "$pkgdir/command/"
+safelink_executable=$(command which safelink)
+safelink_executable=$(realpath "$safelink_executable")
+sed -i "s|^safelink_executable=.*|'safelink_executable='$safelink_executable'|" "$pkgdir/command/link-to-container-inbox"
+
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
BEGIN {
diff --git a/packages/mdev-scripts b/packages/mdev-scripts
@@ -2,7 +2,7 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c
#+pthbs-banginstall.0190099d7db974b8ac922bc571bb572989f6a7e1018400f466173a158a98224c
-#@git:6f990f8e9d46667a1a128d49d822968830d36c99:mdev-scripts
+#@git:b929dc1b6953f2926cbb99eae433d0a1ec0b4ebc:mdev-scripts
def_prefix() {
prefix=/versions/$pthbs_package
diff --git a/packages/mdevd.environment b/packages/mdevd.environment
@@ -1,5 +1,5 @@
#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22
-#+mdev-scripts.e86280970355f094dc03cebef4497513dfddaecc6873b683b99e54172673c6f4
+#+mdev-scripts.309c255116529a5765b684b3ea34c9447c64fa14e5cefd0fd85dcd6b16aa81b2
#+mdevd.784288d5ae7ddbed20396021e0a8be1518d386381d1141c5d3ec8b1796b6463b
\ No newline at end of file
diff --git a/packages/system-config b/packages/system-config
@@ -13,7 +13,7 @@
#+s6.601377d341f6ee04ca2bdcdaad42df0e04456f07206dd56ba36556bd13956a22
#+zsh.2ff36a2aed3e11c13386bad0938fa166a6824f8b03b238a97b2922bca3678b2c
#+system-config-scripts.67e57dfdf150bbd6e0b01d5ca3fa89f0547997a8adb2c12f7e4d67602acb161a
-#+logincaps.bc2dddd37f74632c5dea6eb1300838321b4c29fa4177e6bc368eca8c1bd4bc06
+#+logincaps.2aa5206d6b16cf5d9630c8f74710e42c494ddf1c48b8c3ce3754fed66812e1bd
#@git:4843829dc4242a50d22bb08b7f12764cb5f7c057:system-config
def_prefix() {
@@ -53,7 +53,7 @@ chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
'pthbs_path_containers=/versions/env.9a280f8ef6882aca2e2a50ce9fbdcbb6d08f28971fd0afd6ce1be997e5243203' \
- 'pthbs_path_mdevd=/versions/env.5a309bfe5a7cc001ff57983ce6ab94bac975e0f178880621a11c89e7efe5d135' \
+ 'pthbs_path_mdevd=/versions/env.2520c81d8057b01a4e46848ee7f7c00096441b5a1b213327694f4aa88bb59b0e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
sort -u build/execfile | while IFS= read exename; do
diff --git a/packages/system-config-init b/packages/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.4c31c00a77c0b995e5d5fc4b802707b47e39e5b930a0ca22141802682d9ce592
#+s6-linux-init.3c55d2440534aba76b2ed07fe4b33f82b8eb20372f5f0ebc9f539ebe6ebb8847
#+execline.c07cc6461a1750bbf91bc8da1bb6c44487b0c2d3e73512fb691f4b5a63160449
-#+system-config-rc.2ca809836808be21b6ba7198d0d363d416581eff967c4d97e119327ab08f7563
+#+system-config-rc.9c64236a510b6429edc0a4600bab519f7febcba35ce5e3f1820272aee8cf63d7
-s6rcdb=/versions/system-config-rc.2ca809836808be21b6ba7198d0d363d416581eff967c4d97e119327ab08f7563/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.9c64236a510b6429edc0a4600bab519f7febcba35ce5e3f1820272aee8cf63d7/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/system-config-rc b/packages/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded
#+s6-rc.8de8b5eb1d1b72185b4693b874cb5477b49997800e95ab5a3035fb957e588147
#+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697
-#+system-config.ff88046233b341bd0219fe24ea22512e2ec477abee044c27345dca1f3d1b8860
+#+system-config.0d7709cdb806a2bf93e44a21d9b3fdd0125ca2858ac48dae134c1d1ea9a06712
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.ff88046233b341bd0219fe24ea22512e2ec477abee044c27345dca1f3d1b8860/config/s6-rc-source
+src=/versions/system-config.0d7709cdb806a2bf93e44a21d9b3fdd0125ca2858ac48dae134c1d1ea9a06712/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -22,7 +22,7 @@
#+confz.208d2a701777a5703ca126f9fee4220610a9fb2b5241c5850d66a92bc0e682b2
#+containers.f505d6ed0c843d085f79b90ed638dcb7473fe4602cfcba4f453c2a3f6eaa7421
#+fileset.a274be52a358efbef7f42628a36ff98464608ab67d3bd4382323d60f9b854697
-#+logincaps.bc2dddd37f74632c5dea6eb1300838321b4c29fa4177e6bc368eca8c1bd4bc06
+#+logincaps.2aa5206d6b16cf5d9630c8f74710e42c494ddf1c48b8c3ce3754fed66812e1bd
#+snaprep.4f1281cfb76562b94e47b6c021584d870be9c2900bd8d52db40848f58b5f7812
#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c
#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb
diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps
@@ -2,6 +2,7 @@
{%- block extra_deps %}
#+{{pkg_install_name("execline")}}
#+{{pkg_install_name("musl-cross-make")}}
+#+{{pkg_install_name("safelink")}}
{%- endblock %}
{%- block extra_script %}
@@ -20,6 +21,10 @@ cd login
sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\""
cp -a login "$pkgdir/command/"
+safelink_executable=$(command which safelink)
+safelink_executable=$(realpath "$safelink_executable")
+sed -i "s|^safelink_executable=.*|'safelink_executable='$safelink_executable'|" "$pkgdir/command/link-to-container-inbox"
+
{%- endblock %}
{% block genlinks_begin %}
x["./command/zshaskpass_lock"]=1
