commit 845cb4b39f730be0a99c27ddf84326c48f02b786
parent 21e9b33235da5c31f8375a984e2106ada471c2ba
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Mon, 19 May 2025 11:35:09 +0000
update containers
Diffstat:
17 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -353,7 +353,7 @@ fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
-b5ff866f94410a3c89c0676cbae73be563c4ff62 sources/containers
+b7cc3cd6bc8713c16e71ef855456909c7f4af26c sources/containers
c4e1a898a31fbccb5c1ccccb5e7abe655692ed5a sources/containers
e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6 sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -15,6 +15,7 @@ easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -o "$img/seccomp-ptrace.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -o "$img/seccomp-xpra.bpf"
+easyseccomp -i default-policy.easyseccomp -d ALLOW_SETUID_SETGID -o "$img/seccomp-setuidgid.bpf"
cd "$img"
# first commands without argv0 aliases
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,8 +6,8 @@
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
-#+container-bin-image.dd44703955b3f5a5637663ce7bb17d6819d2484aaafe5e5fa0e486b035e60dc6
-#@git:c4e1a898a31fbccb5c1ccccb5e7abe655692ed5a:containers
+#+container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846
+#@git:b7cc3cd6bc8713c16e71ef855456909c7f4af26c:containers
: ${JOBS:=1}
prefix=/home/ccx/versions/$pthbs_package
@@ -58,9 +58,9 @@ for f in '/home/ccx/versions/xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.dd44703955b3f5a5637663ce7bb17d6819d2484aaafe5e5fa0e486b035e60dc6/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.dd44703955b3f5a5637663ce7bb17d6819d2484aaafe5e5fa0e486b035e60dc6/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.dd44703955b3f5a5637663ce7bb17d6819d2484aaafe5e5fa0e486b035e60dc6/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.b573521f82b7138233b02d166301750bc783c78814d9c4f772e3bb18e91a0846/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a722adcd44b43cfa5c10e733b8597dd7970b8b78cfc2584d84a6f56fa47b903
+#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a722adcd44b43cfa5c10e733b8597dd7970b8b78cfc2584d84a6f56fa47b903
+#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.f2ca6f0298c27f6b2fbf64a02fccf6ecb5cbd5ac5a0f8208d056570f809648ec
-#+system-config-rc.06f5dc979aaa4b3c882af37e6640a15146db57e406d8a131647f801e33ed5146
+#+system-config.0ec926df3ac566f9a42fa8464f8dcb52b1d8c3cfb3ce4420fe2dad692ac43983
+#+system-config-rc.faccc2c10fb25391930a79977b6eea7f735cee38d6bbe3e13bba11fa5f66a9e7
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.28a9788f704b43d3e917e29bcfa5444dc138299914afa3259383bcdade3a9770
+#+system-config-init.a9625c9c76e6a6e50d41be4c0a6035c00afd3dfbb2e7c27421fdb6567c46361a
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/home/ccx/versions/env.4d84e19eb6da005de6df28508bab1802d31456c6a7953831fb412b3b54b522de' \
+ 'pthbs_path_containers=/home/ccx/versions/env.307daac2211da174dfb38e95b553242bd93bc951c60196d97df8421525b6f12c' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.06f5dc979aaa4b3c882af37e6640a15146db57e406d8a131647f801e33ed5146
+#+system-config-rc.faccc2c10fb25391930a79977b6eea7f735cee38d6bbe3e13bba11fa5f66a9e7
-s6rcdb=/home/ccx/versions/system-config-rc.06f5dc979aaa4b3c882af37e6640a15146db57e406d8a131647f801e33ed5146/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.faccc2c10fb25391930a79977b6eea7f735cee38d6bbe3e13bba11fa5f66a9e7/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.f2ca6f0298c27f6b2fbf64a02fccf6ecb5cbd5ac5a0f8208d056570f809648ec
+#+system-config.0ec926df3ac566f9a42fa8464f8dcb52b1d8c3cfb3ce4420fe2dad692ac43983
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.f2ca6f0298c27f6b2fbf64a02fccf6ecb5cbd5ac5a0f8208d056570f809648ec/config/s6-rc-source
+src=/home/ccx/versions/system-config.0ec926df3ac566f9a42fa8464f8dcb52b1d8c3cfb3ce4420fe2dad692ac43983/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/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a722adcd44b43cfa5c10e733b8597dd7970b8b78cfc2584d84a6f56fa47b903
+#+containers.7dde3fddc3ea441b8c1341da2d567cc37824b07ab81630b3c6cf0089bfc2e033
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -15,6 +15,7 @@ easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -o "$img/seccomp-ptrace.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_SECCOMP -d ALLOW_LANDLOCK -o "$img/seccomp-build.bpf"
easyseccomp -i default-policy.easyseccomp -d ALLOW_PTRACE -d ALLOW_SETUID_SETGID -o "$img/seccomp-xpra.bpf"
+easyseccomp -i default-policy.easyseccomp -d ALLOW_SETUID_SETGID -o "$img/seccomp-setuidgid.bpf"
cd "$img"
# first commands without argv0 aliases
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,8 +6,8 @@
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
-#+container-bin-image.c90a5287c1f288e461b632f9ad1585a7f0493000ee78bf5715c740c3f3a2960b
-#@git:c4e1a898a31fbccb5c1ccccb5e7abe655692ed5a:containers
+#+container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1
+#@git:b7cc3cd6bc8713c16e71ef855456909c7f4af26c:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
@@ -58,9 +58,9 @@ for f in '/versions/xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/versions/container-bin-image.c90a5287c1f288e461b632f9ad1585a7f0493000ee78bf5715c740c3f3a2960b/container-bin-image'
-test -f '/versions/container-bin-image.c90a5287c1f288e461b632f9ad1585a7f0493000ee78bf5715c740c3f3a2960b/container-bin-image/if'
-ln -sf '/versions/container-bin-image.c90a5287c1f288e461b632f9ad1585a7f0493000ee78bf5715c740c3f3a2960b/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image'
+test -f '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image/if'
+ln -sf '/versions/container-bin-image.73015ddb9b2445d20f56f4d7cfaa5d283773d425569c51a407495cb0493c54f1/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.efc48d6e70018f9a356461714b40db5985f3a2258a99b66232305e1887b835f0
+#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.efc48d6e70018f9a356461714b40db5985f3a2258a99b66232305e1887b835f0
+#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.70faf1f2f78c311cff83ac3f0873765e003c7f8bfe42a75f05b1f5541e4a2a9e
-#+system-config-rc.51658b79027b0b271e394ba74ee5951276aca42954df7cd898cd3e0599d0c104
+#+system-config.1134dc9f5915b42eaa1656181b4381e27aa77e27d7442f0eb1817dcc4e16f8b7
+#+system-config-rc.e1d5fe40e7b5db0cca5976db8315ba7e06197b24e7995203cc59902d5fafd6fa
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.41e9fcf4f9bfbb81cf57db8f8a4fbf0934a695a7d1eaa470975a83292625daf8
+#+system-config-init.2a323cb7dedf07818456037303348213fec2a71a0a0dd6b5e0d72615cd3de4af
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.3ec3871739de9585ad7b6991e19216d6216fde5895aa78ff92d238091426ecc4' \
+ 'pthbs_path_containers=/versions/env.d428adfd355fed0778e43b3596e3a7b3213cdec195a6f1cc835853c00a2f2efe' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.51658b79027b0b271e394ba74ee5951276aca42954df7cd898cd3e0599d0c104
+#+system-config-rc.e1d5fe40e7b5db0cca5976db8315ba7e06197b24e7995203cc59902d5fafd6fa
-s6rcdb=/versions/system-config-rc.51658b79027b0b271e394ba74ee5951276aca42954df7cd898cd3e0599d0c104/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e1d5fe40e7b5db0cca5976db8315ba7e06197b24e7995203cc59902d5fafd6fa/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.70faf1f2f78c311cff83ac3f0873765e003c7f8bfe42a75f05b1f5541e4a2a9e
+#+system-config.1134dc9f5915b42eaa1656181b4381e27aa77e27d7442f0eb1817dcc4e16f8b7
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.70faf1f2f78c311cff83ac3f0873765e003c7f8bfe42a75f05b1f5541e4a2a9e/config/s6-rc-source
+src=/versions/system-config.1134dc9f5915b42eaa1656181b4381e27aa77e27d7442f0eb1817dcc4e16f8b7/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/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.efc48d6e70018f9a356461714b40db5985f3a2258a99b66232305e1887b835f0
+#+containers.f49d873d5ac1ca183ee4067ef541ea284aa6686ab9dc538c0a4e826859ce2700
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
