commit b6b05245b436e976038f5b1c9156e2d0d2edfabf
parent 7a94d228ccf47491fdfc6c97727b396c6c685ea7
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 18 Mar 2025 23:11:50 +0000
Merge remote-tracking branch 'live/trunk' into trunk
Diffstat:
15 files changed, 126 insertions(+), 40 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -163,8 +163,8 @@ fd0e197d9c746faec8c8854fcfd416964440615d sources/busybox
ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
-46761773f4cb590dc89b0f80f5e9fe07399279e7 sources/containers
663fe31f8b5113450c54d0588e4b47c81cf3e108 sources/containers
+8bd902b8f50d39acbbe21357ed368fbbb9f5734f sources/containers
eb29ead3d752060a8d81442cfe3d8ae07053250d sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
02de9565862052afc290b6848b4ebd799d8f9f37 sources/execline
@@ -1388,6 +1388,8 @@ fb48b0b1e6be970d7b1dd70e9e0693de0d622a36 sources/libcap
fbdff0fb58832f57bf2fe0080490cc197cd0669b sources/libcap
fd015829ac2276721283bd0668d339f87cbd4841 sources/libcap
fd1fffbfd4053059e11ea234640d50c190bd93a7 sources/libcap
+41039418205b48bda59372fb7c49453852853e8a sources/logincaps
+4dc03fd661af2aa4f27cc03501d944007d9501a5 sources/logincaps
6c9b7c1ca9b96ab366088c4bfc50d1b0e81042eb sources/logincaps
79af0da183f068b99a69107b2764d9c8c3c3eaca sources/logincaps
28895911cdcf052b64d8f19325926a870bd457d5 sources/mdev-conf
diff --git a/filelist.sha256 b/filelist.sha256
@@ -50,4 +50,5 @@ c7d3e7ef077d7673567d2f0c34ba2ebd689dab1250286ab482a3064c73ff7d7c files/s6_clone
4c8df9ba4d6a4a7e9042ef03e3dbf893636785f42e55391c4e4cefcb632b2467 files/safelink.c
a6779ebb826c5e48d1023f113d5f370fe9f90788a6c5bdd05234efdcb2850ea7 files/spawn-pty.c
07c3c30dab68c905d5608124e729592a30b2c087f24e7b76940f5321786128b1 files/update-links
+664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df files/user-env
68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6 files/zpipe.c
diff --git a/files/user-env b/files/user-env
@@ -0,0 +1,10 @@
+#!/command/execlineb -S0
+
+backtick USER { whoami }
+importas -i USER USER
+
+backtick HOME { homeof ${USER} }
+importas -i HOME HOME
+s6-envdir ${HOME}/.config/env
+
+$@
diff --git a/packages/containers b/packages/containers
@@ -3,7 +3,7 @@
#+zsh.39cfa85c387b3d316db3206c9eaba5a10751588267adb2884d33f5fb7253b57a
#+pthbs-banginstall.cd97cc1e4d09e23947e00c4c2ed4568c9f1745a7e6ecae9587b7b6bc674b5514
#+execline.d4fee837def832332b7e642764c80bef670c35b5e473f1590c4b56f88e2ae571
-#@git:eb29ead3d752060a8d81442cfe3d8ae07053250d:containers
+#@git:8bd902b8f50d39acbbe21357ed368fbbb9f5734f:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
diff --git a/packages/containers.environment b/packages/containers.environment
@@ -6,7 +6,7 @@
#+s6-linux-utils.c293bd1d5ec27cbb02c001ce85aa79abf7c134f7ee79a00ce036de04f2379ee5
#+zsh.39cfa85c387b3d316db3206c9eaba5a10751588267adb2884d33f5fb7253b57a
#+confz.3e628417fb30d3d89077e8c0368aff7a4d975f222b08f127dc868ed09b340f4d
-#+containers.c5609c6781f85ad68201e4a87a09b347fb89d46c90c265dbcffa31daa0264d86
+#+containers.1fa9b6545e3f9fb524130e5672b735290de2dc7b08196f15e75eb7ab97e5bae0
#+xbps.7b73f74ee10f9a6cdc6eb172637b9dd9950954e450c22cfd16d4abb89d25b877
#+zstd.23993b39184b62e1b1f11ee2d7337b1c808131e9fedec765911badae185afbaf
#+apk-tools.3c5e644685924124c8d1ebdd43aa2ae96d40aa318bdae5f1210e33995ec73c67
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
-#+system-config.49b48dc06c6513b8f7c3f2750be88938126742962afe6635cad45b833fdd6964
-#+system-config-rc.5806c46a4fe59025e8422244e7d1b828f3d6b732319cd29530e89088cfc01a67
+#+system-config.08f5a14baba582aea363dc7c2f23201acac4d412ec57f7b277a11aac1021d575
+#+system-config-rc.2296db0f7f5cdaf1029f02d8c0ec1d8978602601383ac4f4f291068a5e82d24e
#+system-config-scripts.8d575cbb5a291fd5a445f185deccd866ce9a99763e42d53818e7a0a452a52057
-#+system-config-init.d2859928b910bf8b914830f267d833aa41dd551efd3d3735e12b6711aaf82598
+#+system-config-init.10af97a13e03146f713b658a6941464232065d667ca26193ea696725d3cc5129
#+system-config-zsh.76afac311c9d6373d49f888324e8e10dfccfd74b4004414803fb0e76da1eb663
#+busybox.7818e9d6df97d97317c8fcdf404811731aa0c5c3ab7eb6aec00c9652b6da511c
#+gnu-make.152d99fd58e3130b4bd4d23833643ca418555a0560e88962cd8a28ffcd9a9ab7
@@ -25,9 +25,9 @@
#+pthbs-banginstall.cd97cc1e4d09e23947e00c4c2ed4568c9f1745a7e6ecae9587b7b6bc674b5514
#+aat.b982d9b2dc812fb7b4402550c950024f2d6a9715213483e20c0fc8d57e5c56ce
#+confz.3e628417fb30d3d89077e8c0368aff7a4d975f222b08f127dc868ed09b340f4d
-#+containers.c5609c6781f85ad68201e4a87a09b347fb89d46c90c265dbcffa31daa0264d86
+#+containers.1fa9b6545e3f9fb524130e5672b735290de2dc7b08196f15e75eb7ab97e5bae0
#+fileset.49f19385f7dbd7e606422f304ecf6434ba61c23b67f54608e125c7cc591f0ea3
-#+logincaps.9552e9f7a55364f3dc866a9746b2c81df3ac8e064c9008287ba3cd8faa45d74c
+#+logincaps.4a2bfd58db6c3dbcebe917406732d5d9b964b337a3e73f93082b6ed56923f10e
#+snaprep.a3a9b823f92bf7cbd62415f59dddcf3ca2d9c59bc21180e26c002cc26f6fc2ec
#+curl.6c0999f7e80abc0e36e422e40cfd5dbbd08c0127561fad8947ab322628c8442a
#+git.703b660895ebfaaabf03872e505f70c523a444347ed5e888e44c55d616e64f7d
@@ -40,4 +40,5 @@
#+applyuidgid-caps.59719e80f0111f0029c2a339830d5e1a599835cf20d9007535289fd94ca35de2
#+nosuid.9c03aa75465c5324212e2febca7373381dc048bc89e27b1c62230e81fa47915a
#+spawn-pty.cab2cf2e59661b59501dfd9c8b111cf058eeaf9844d6f1f39da6674200b3d659
-#+safelink.1f512139a1a977c9d9f4520bca6366d4799f45ff94d34462f9928e4b24959cd5-
\ No newline at end of file
+#+safelink.1f512139a1a977c9d9f4520bca6366d4799f45ff94d34462f9928e4b24959cd5
+#+user-env.1f9111f0716e32093f0337a1141cacedaec97d72e5e960f453793c01d31b09fb+
\ No newline at end of file
diff --git a/packages/logincaps b/packages/logincaps
@@ -5,7 +5,7 @@
#+execline.d4fee837def832332b7e642764c80bef670c35b5e473f1590c4b56f88e2ae571
#+musl-cross-make.675bc960d97b88b341ba4c64ea1b10f6afd9c9f0394ed84ca848768c5e1b646c
#+safelink.1f512139a1a977c9d9f4520bca6366d4799f45ff94d34462f9928e4b24959cd5
-#@git:6c9b7c1ca9b96ab366088c4bfc50d1b0e81042eb:logincaps
+#@git:41039418205b48bda59372fb7c49453852853e8a:logincaps
: ${JOBS:=1}
prefix=/versions/$pthbs_package
@@ -31,9 +31,6 @@ fi
pthbs-banginstall etc/loginexec "$pkgdir"
-mv -v home/loginexec ./user_loginexec
-pthbs-banginstall ./user_loginexec "$pkgdir"
-
cat >"$pkgdir/command/login-keepenv" <<EOF
#!$(which execlineb) -S0
$prefix/command/login -p \$@
@@ -44,16 +41,15 @@ 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 {
- x["./command/zshaskpass_lock"]=1
- x["./command/service.X.run"]=1
- x["./command/login"]=1}
+ x["./command/check-root-password.py"]=1
+ x["./command/login"]=1
+ x["./command/login-keepenv"]=1
+ x["./command/login.capability.brightness"]=1
+ x["./command/login.capability.service"]=1
+ x["./command/logincaps"]=1}
function r1(s) {
sub("^[.]/[^/]*", ".", s)
diff --git a/packages/system-config b/packages/system-config
@@ -13,7 +13,7 @@
#+s6.716acd4be9854d2eb4b213e4852567fbd963fb905a246d0a0e30251e2153720e
#+zsh.39cfa85c387b3d316db3206c9eaba5a10751588267adb2884d33f5fb7253b57a
#+system-config-scripts.8d575cbb5a291fd5a445f185deccd866ce9a99763e42d53818e7a0a452a52057
-#+logincaps.9552e9f7a55364f3dc866a9746b2c81df3ac8e064c9008287ba3cd8faa45d74c
+#+logincaps.4a2bfd58db6c3dbcebe917406732d5d9b964b337a3e73f93082b6ed56923f10e
#@git:f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a:system-config
def_prefix() {
@@ -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.6df37b83fc635e5fc56882e37fc1237b6bb921cd5abcb1ff015aeff3988c1a18' \
+ 'pthbs_path_containers=/versions/env.5d9776aa7f3db26d9225b59a52cb3091ac7bff291c8eff977b11a3fa8a98b9aa' \
'pthbs_path_mdevd=/versions/env.3412be17980527b0be12ccfa160c74bdcd3b1d4365e6d47f970b4b46afbd428f' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/packages/system-config-init b/packages/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.abccb499c4dedc3acf3edab958ab2a8ea2ec46cc58d150df3eccdc5941365c51
#+s6-linux-init.faf055fc936ae62ffe3d20c4cd97f565caad24c9a0cd6295602fc242e139aead
#+execline.d4fee837def832332b7e642764c80bef670c35b5e473f1590c4b56f88e2ae571
-#+system-config-rc.5806c46a4fe59025e8422244e7d1b828f3d6b732319cd29530e89088cfc01a67
+#+system-config-rc.2296db0f7f5cdaf1029f02d8c0ec1d8978602601383ac4f4f291068a5e82d24e
-s6rcdb=/versions/system-config-rc.5806c46a4fe59025e8422244e7d1b828f3d6b732319cd29530e89088cfc01a67/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.2296db0f7f5cdaf1029f02d8c0ec1d8978602601383ac4f4f291068a5e82d24e/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.3579038707d7520c09339ee4fc3b67ef03caeeaf8fff3b6f93c51ace141a4393
#+s6-rc.fac398d7051e95c6de0f8cd3b5c7f4a186109a9f11ea9f4ed23b5b16803ce8fe
#+fileset.49f19385f7dbd7e606422f304ecf6434ba61c23b67f54608e125c7cc591f0ea3
-#+system-config.49b48dc06c6513b8f7c3f2750be88938126742962afe6635cad45b833fdd6964
+#+system-config.08f5a14baba582aea363dc7c2f23201acac4d412ec57f7b277a11aac1021d575
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.49b48dc06c6513b8f7c3f2750be88938126742962afe6635cad45b833fdd6964/config/s6-rc-source
+src=/versions/system-config.08f5a14baba582aea363dc7c2f23201acac4d412ec57f7b277a11aac1021d575/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/user-env b/packages/user-env
@@ -0,0 +1,63 @@
+#!/usr/bin/env pthbs-build
+#+busybox.7818e9d6df97d97317c8fcdf404811731aa0c5c3ab7eb6aec00c9652b6da511c
+#+execline.d4fee837def832332b7e642764c80bef670c35b5e473f1590c4b56f88e2ae571
+#+pthbs-banginstall.cd97cc1e4d09e23947e00c4c2ed4568c9f1745a7e6ecae9587b7b6bc674b5514
+#@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
+
+installdir="$pthbs_destdir//versions/$pthbs_package"
+mkdir -p "$installdir/command"
+chmod +x user-env
+pthbs-banginstall user-env "$installdir"
+
+cd "$pthbs_destdir/versions/$pthbs_package"
+find -type d -o -print | awk -F/ '
+BEGIN {
+ x["./command/user-env"]=1
+}
+
+function r1(s) {
+ sub("^[.]/[^/]*", ".", s)
+ return s
+}
+function s1(repl, s) {
+ sub("^[.]/[^/]*", "./"repl, s)
+ return s
+}
+function link(src) {
+ x[$0]=0
+ printf "%s\t%s\n", $0, src
+ printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr"
+}
+$1!="."{exit 1}
+
+
+$2 == "command" { link($0); next }
+$2 == "bin" { link(s1("command", $0)); next }
+
+$2 == "library.so" { link($0); next }
+$2 == "library" { link($0); next }
+$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
+$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next }
+
+$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }
+
+$2 == "man" { link($0); next }
+$2 == "info" { link($0); next }
+$2 == "doc" { link($0); next }
+$2 == "icons" { link($0); next }
+$2 == "terminfo" { link($0); next }
+$2 == "data" { link($0); next }
+$2 == "include" { link($0); next }
+
+{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
+
+END {
+ for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+ for(fname in x) {
+ if(x[fname]) {
+ printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
+ exit 3
+ }
+ }
+}' >.install-links.new
+mv .install-links.new .install-links
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -20,9 +20,9 @@
#+pthbs-banginstall.cd97cc1e4d09e23947e00c4c2ed4568c9f1745a7e6ecae9587b7b6bc674b5514
#+aat.b982d9b2dc812fb7b4402550c950024f2d6a9715213483e20c0fc8d57e5c56ce
#+confz.3e628417fb30d3d89077e8c0368aff7a4d975f222b08f127dc868ed09b340f4d
-#+containers.c5609c6781f85ad68201e4a87a09b347fb89d46c90c265dbcffa31daa0264d86
+#+containers.1fa9b6545e3f9fb524130e5672b735290de2dc7b08196f15e75eb7ab97e5bae0
#+fileset.49f19385f7dbd7e606422f304ecf6434ba61c23b67f54608e125c7cc591f0ea3
-#+logincaps.9552e9f7a55364f3dc866a9746b2c81df3ac8e064c9008287ba3cd8faa45d74c
+#+logincaps.4a2bfd58db6c3dbcebe917406732d5d9b964b337a3e73f93082b6ed56923f10e
#+snaprep.a3a9b823f92bf7cbd62415f59dddcf3ca2d9c59bc21180e26c002cc26f6fc2ec
#+curl.6c0999f7e80abc0e36e422e40cfd5dbbd08c0127561fad8947ab322628c8442a
#+git.703b660895ebfaaabf03872e505f70c523a444347ed5e888e44c55d616e64f7d
@@ -35,4 +35,5 @@
#+applyuidgid-caps.59719e80f0111f0029c2a339830d5e1a599835cf20d9007535289fd94ca35de2
#+nosuid.9c03aa75465c5324212e2febca7373381dc048bc89e27b1c62230e81fa47915a
#+spawn-pty.cab2cf2e59661b59501dfd9c8b111cf058eeaf9844d6f1f39da6674200b3d659
-#+safelink.1f512139a1a977c9d9f4520bca6366d4799f45ff94d34462f9928e4b24959cd5-
\ No newline at end of file
+#+safelink.1f512139a1a977c9d9f4520bca6366d4799f45ff94d34462f9928e4b24959cd5
+#+user-env.1f9111f0716e32093f0337a1141cacedaec97d72e5e960f453793c01d31b09fb+
\ No newline at end of file
diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps
@@ -8,9 +8,6 @@
pthbs-banginstall etc/loginexec "$pkgdir"
-mv -v home/loginexec ./user_loginexec
-pthbs-banginstall ./user_loginexec "$pkgdir"
-
cat >"$pkgdir/command/login-keepenv" <<EOF
#!$(which execlineb) -S0
$prefix/command/login -p \$@
@@ -21,13 +18,12 @@ 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
- x["./command/service.X.run"]=1
+ x["./command/check-root-password.py"]=1
x["./command/login"]=1
+ x["./command/login-keepenv"]=1
+ x["./command/login.capability.brightness"]=1
+ x["./command/login.capability.service"]=1
+ x["./command/logincaps"]=1
{%- endblock %}
diff --git a/templates/pkg/user-env b/templates/pkg/user-env
@@ -0,0 +1,15 @@
+{% extends "genlinks" %}
+{%- block script %}
+#+{{pkg_install_name("busybox")}}
+#+{{pkg_install_name("execline")}}
+#+{{pkg_install_name("pthbs-banginstall")}}
+#@sha256:{{files["user-env"]}}:user-env
+
+installdir="$pthbs_destdir/{{versions}}/$pthbs_package"
+mkdir -p "$installdir/command"
+chmod +x user-env
+pthbs-banginstall user-env "$installdir"
+{% endblock %}
+{% block genlinks_begin %}
+ x["./command/user-env"]=1
+{% endblock %}
diff --git a/templates/pkg/userspace.environment b/templates/pkg/userspace.environment
@@ -36,3 +36,4 @@
#+{{pkg_install_name("nosuid")}}
#+{{pkg_install_name("spawn-pty")}}
#+{{pkg_install_name("safelink")}}
+#+{{pkg_install_name("user-env")}}
