commit 4c608a5529c58cbd69f08f2ceec4a574ccbceaec
parent 0df54cd5d6a626a3b29cb0a76cd535b811ef88c5
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 17:22:27 +0000
Add libseccomp dependency to easyseccomp
Diffstat:
14 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/downloadlist.sha256 b/downloadlist.sha256
@@ -50,3 +50,4 @@ f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb 189200 https://
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
248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375 642445 https://github.com/seccomp/libseccomp/releases/download/v2.5.5/libseccomp-2.5.5.tar.gz
+83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc 685655 https://github.com/seccomp/libseccomp/releases/download/v2.6.0/libseccomp-2.6.0.tar.gz
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -2,6 +2,7 @@
{%- block extra_deps %}
#+{{pkg_install_name("flex")}}
#+{{pkg_install_name("bison")}}
+#+{{pkg_install_name("libseccomp")}}
#@git:{{submodule.current[name]}}:{{name}}
#@sha256:{{files["easyseccomp-configure.tar"]}}:easyseccomp-configure.tar
{%- endblock %}
@@ -9,7 +10,7 @@
cd easyseccomp
tar -xvf ../easyseccomp-configure.tar
-autotools_static . --disable-seccomp
+autotools_static . --enable-seccomp
check_static command/easyseccomp
{% endblock %}
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
-#+easyseccomp.5953f823942db47bcbfd7fdda501cab4b76517de23e701d7c6f021d6f904e9df-
\ No newline at end of file
+#+easyseccomp.1c86442ae4953ec6d440cb8f8be686d0ce4018c9c8c8990caa8792c58c30823c+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
-#+system-config.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b
-#+system-config-rc.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0
+#+system-config.bc750387b0ca0949f79f390b9e59353a3de7b5361660397907230a93608ad722
+#+system-config-rc.97705af9a4ff36bae3d5334418130b2fa2b5de28ea15543b144f100438b43230
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.9193280086f333c2063361ad0fe56a37de7b527e04013baacaf112f1fb7caedc
+#+system-config-init.8d78094538de8c015f79cfb56d451eb9a0ab50bcc0e57b245695c97b668f4426
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -6,6 +6,7 @@
#+m4.46e121f61e0af52abf876bf2688ecfe70eeb04185028d6adde0085e865fdfe75
#+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd
#+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f
+#+libseccomp.3cd87ec8e249baee86f6ad8bfea86c571f14aa99cd42c5137d3cfef459909e3b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
@@ -62,7 +63,7 @@ check_static() {
cd easyseccomp
tar -xvf ../easyseccomp-configure.tar
-autotools_static . --disable-seccomp
+autotools_static . --enable-seccomp
check_static command/easyseccomp
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.aed8db036dcc551e13b96f0dddf181016444aa9930bbd1d5aa46e3dc107a512b' \
+ 'pthbs_path_containers=/home/ccx/versions/env.cc4b3fabbefd5fc1bf577dbf64160884001c6bf6486677d26dfd886d25620016' \
'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.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0
+#+system-config-rc.97705af9a4ff36bae3d5334418130b2fa2b5de28ea15543b144f100438b43230
-s6rcdb=/home/ccx/versions/system-config-rc.a318bcb84241ab728217492b101600aa67d7dc25b54e3d5fd1b16fa5d13625f0/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.97705af9a4ff36bae3d5334418130b2fa2b5de28ea15543b144f100438b43230/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.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b
+#+system-config.bc750387b0ca0949f79f390b9e59353a3de7b5361660397907230a93608ad722
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.dbd9ca9df610c01e6701422aa2c10b04ca52f676a2253c85c3075d4c0d9e407b/config/s6-rc-source
+src=/home/ccx/versions/system-config.bc750387b0ca0949f79f390b9e59353a3de7b5361660397907230a93608ad722/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/containers.environment b/variants/root-x86_64/containers.environment
@@ -15,4 +15,4 @@
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
-#+easyseccomp.ba88e4aa368554e5a83605e695b68121d7fb177ca69935982472ba28b2b47d22-
\ No newline at end of file
+#+easyseccomp.af04f0edc10ade70c740917e42ad9e936ee7e9a3a82325b3634d4c7510290eb6+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -36,8 +36,8 @@
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
-#+system-config.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822
-#+system-config-rc.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532
+#+system-config.dddd598297addd3393ff7feac67dc692f0fda7e2ed485e0a51bac5da0e6881f8
+#+system-config-rc.c1bb26aa758bfdb6e9c96effef13b2a9a007cb2515d1657427e0378d9bcc31ec
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.301837347f82ddf951520ed3c6671026e02739445fecad502ab844495288a1f2
+#+system-config-init.fdc59ffd3c136887d4253e91b735665b5c5bfd0bc87b8b542a1d68020d7a2058
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -6,6 +6,7 @@
#+m4.3cffaef6909a65493ddc9aba4c53f77dc594ff5ab8b58c57acaa34c654b09ff3
#+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f
#+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0
+#+libseccomp.5317500673d7e3712adc1f7c27edc436f3949f8dae2821458e28ec066fef997a
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar
@@ -62,7 +63,7 @@ check_static() {
cd easyseccomp
tar -xvf ../easyseccomp-configure.tar
-autotools_static . --disable-seccomp
+autotools_static . --enable-seccomp
check_static command/easyseccomp
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.1954cbbb732c1bc21032ff045738b204be04f96e10063768c741971e1b792f49' \
+ 'pthbs_path_containers=/versions/env.07f6f092db3d8f5b0b7242f2edaa406abfb1f9fc9ade977fcc101cfc83aee262' \
'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.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532
+#+system-config-rc.c1bb26aa758bfdb6e9c96effef13b2a9a007cb2515d1657427e0378d9bcc31ec
-s6rcdb=/versions/system-config-rc.41950a1e455bb68c5ae18bc8acaf3c10d9172a9883f0d8fbbab5e19631516532/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.c1bb26aa758bfdb6e9c96effef13b2a9a007cb2515d1657427e0378d9bcc31ec/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.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822
+#+system-config.dddd598297addd3393ff7feac67dc692f0fda7e2ed485e0a51bac5da0e6881f8
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.4c0e32ca9682b39c92254a71ffce5342809fe98e662aeba1d25abe9359b1d822/config/s6-rc-source
+src=/versions/system-config.dddd598297addd3393ff7feac67dc692f0fda7e2ed485e0a51bac5da0e6881f8/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
