commit 54b59731cc9f696baad8495fb7beb50073bf84c2
parent c354aa11718af934659e15f104749d7b9555c6f4
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 22:13:47 +0000
easyseccomp
Diffstat:
16 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -25,8 +25,8 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.
9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2 files/busybox_bootstrap.config
75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub
9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86 files/dwarf.h
-ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c files/easyseccomp-configure.tar
-1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d files/easyseccomp_fix_includes.patch
+05b7adee85105f201da82a7bd62846d42fab9824a868a04e65a2897440696c16 files/easyseccomp-configure.tar
+54788523279ae3c1460f577fffd7b4b19fe5361918200bc2b1cd8adb27f7dc70 files/easyseccomp_fix_includes.patch
a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e files/elf.h
0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b files/gelf.h
cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888 files/lh_bootstrap-x86_64-config
diff --git a/files/easyseccomp-configure.tar b/files/easyseccomp-configure.tar
Binary files differ.
diff --git a/files/easyseccomp_fix_includes.patch b/files/easyseccomp_fix_includes.patch
@@ -1,10 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
-index f9776ea..e968e30 100644
+index f9776ea..7ce7035 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -17,6 +17,7 @@ libeasyseccomp_a_CFLAGS = -I $(abs_srcdir)/src -I $(abs_builddir)/src
+@@ -15,8 +15,9 @@ libeasyseccomp_a_LFLAGS = --header-file=$(abs_builddir)/src/libeasyseccomp_a-lex
+ libeasyseccomp_a_YFLAGS = -d -Wno-yacc
+ libeasyseccomp_a_CFLAGS = -I $(abs_srcdir)/src -I $(abs_builddir)/src
- src/libeasyseccomp_a-lexer.h: src/libeasyseccomp_a-parser.h
+-src/libeasyseccomp_a-lexer.h: src/libeasyseccomp_a-parser.h
++src/libeasyseccomp_a-lexer.h: src/libeasyseccomp_a-parser.h src/libeasyseccomp_a-lexer.c
src/generator.c: src/libeasyseccomp_a-lexer.h
+src/libeasyseccomp_a-libeasyseccomp_a-lexer.o: src/libeasyseccomp_a-lexer.h
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -17,9 +17,6 @@ patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
-n=30
-until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
check_static command/easyseccomp
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.4dce9fc41383d7962433fd773de3fe7b1cd7346bfe339fe807d3370c35bf3239-
\ No newline at end of file
+#+easyseccomp.0e45d3bb5ddba059e150df7bafecbebb8d1f0acf61d48fba2366181b4e64f607+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872
-#+system-config-rc.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451
+#+system-config.a7393756bd530681acd842178296a28b9c66005eada6cee5ee2436a3eb443305
+#+system-config-rc.5aa4bcafa602386a78450172d7aa7abf9aad346a36ddfef9da350e5aaca02b87
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.1f8db1de0cf41ee262e98f96578e4fe5ad13c85310b755ea276887e4a2faef12
+#+system-config-init.174f856609249e644220f1fe4463c8c5199fa0560345125a70d523ae09e90ad9
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -11,8 +11,8 @@
#+error-standalone.664c98067651c547ed8252fefb7237335ee7b15aa7ea4a338ff8d65dc02a6c0e
#+argp-standalone.67cb9dc5d68bacf213a32171dedea9b95c3651b603f91f1e757e583cb4f233c7
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
-#@untar::sha256:ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c:easyseccomp
-#@sha256:1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d:easyseccomp_fix_includes.patch
+#@untar::sha256:05b7adee85105f201da82a7bd62846d42fab9824a868a04e65a2897440696c16:easyseccomp
+#@sha256:54788523279ae3c1460f577fffd7b4b19fe5361918200bc2b1cd8adb27f7dc70:easyseccomp_fix_includes.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -70,9 +70,6 @@ patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
-n=30
-until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
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.6eb2b1f1787f5b4a389a70749ee343b96d25d3aa730b017410499628d701dfa7' \
+ 'pthbs_path_containers=/home/ccx/versions/env.16e46ab11fc6617f70109dec2805f95c8e2e7eadc67be40aba80a2739ccb533c' \
'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.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451
+#+system-config-rc.5aa4bcafa602386a78450172d7aa7abf9aad346a36ddfef9da350e5aaca02b87
-s6rcdb=/home/ccx/versions/system-config-rc.2673eee6a6d1ca964032017b6726c750eab3dae4ba9233a874b9411e0b4c1451/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.5aa4bcafa602386a78450172d7aa7abf9aad346a36ddfef9da350e5aaca02b87/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.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872
+#+system-config.a7393756bd530681acd842178296a28b9c66005eada6cee5ee2436a3eb443305
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.93d20d32fa2f65174dac166da5c1bfc7c735f3b63857be8ae259abc115eaa872/config/s6-rc-source
+src=/home/ccx/versions/system-config.a7393756bd530681acd842178296a28b9c66005eada6cee5ee2436a3eb443305/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.143445e3e404cc34a9a56a63d10c70ffbc59c687cfac9230b597ed2ac32386b3-
\ No newline at end of file
+#+easyseccomp.9e9b1efb000aa9009584b3f506383b7555e61784bbefd68eef97f5e3812bdedc+
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f
-#+system-config-rc.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85
+#+system-config.c352639da637d13401fb505dab0b1c08a8a693350b866651556bcdee464d9ff0
+#+system-config-rc.a68ce0c3800785459cc12c75f089880b79769943c8a00c083f29c59f82d98d38
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.baed90623f2120ed819a34520a311e13a9cded70d1b1f6e78a6f88a06a511960
+#+system-config-init.cc97f2ff58d24ccac65cc3f020feb733e935669c663d96b2e0a89c003ae9211d
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -11,8 +11,8 @@
#+error-standalone.b756d86efb93b61ab49683dd2614413fc0a0c66fed3026f238ab32a725257ab2
#+argp-standalone.1704fb243241c32274e2f78dafafa0ad18e2c26456742441ebd3e5dda8bc7d0b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
-#@untar::sha256:ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c:easyseccomp
-#@sha256:1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d:easyseccomp_fix_includes.patch
+#@untar::sha256:05b7adee85105f201da82a7bd62846d42fab9824a868a04e65a2897440696c16:easyseccomp
+#@sha256:54788523279ae3c1460f577fffd7b4b19fe5361918200bc2b1cd8adb27f7dc70:easyseccomp_fix_includes.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -70,9 +70,6 @@ patch -p1 <../easyseccomp_fix_includes.patch
touch Makefile.in configure
build_env_static
autotools_config --enable-seccomp
-make -j1 V=1 LIBS="-lseccomp -lerror -largp" src/libeasyseccomp_a-lexer.h
-n=30
-until make -j1 V=1 LIBS="-lseccomp -lerror -largp"; do n=$((n-1)); test $n -gt 0 || break; done
make -j1 V=1 LIBS="-lseccomp -lerror -largp" install
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.fcac8142f2976d09ebeccdffac7e6c2d032408ed75b6975b903928d8b8ea20eb' \
+ 'pthbs_path_containers=/versions/env.905d2c4d4433fc36fd81312e96c560e7a86aa8726d0af0bb198604f07753c2a1' \
'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.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85
+#+system-config-rc.a68ce0c3800785459cc12c75f089880b79769943c8a00c083f29c59f82d98d38
-s6rcdb=/versions/system-config-rc.d1d6cd1949d4020985633456e2f27ec351a7b39efca0e7e42d63deca49714e85/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.a68ce0c3800785459cc12c75f089880b79769943c8a00c083f29c59f82d98d38/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.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f
+#+system-config.c352639da637d13401fb505dab0b1c08a8a693350b866651556bcdee464d9ff0
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.3a1577329cba75f1c06290cfa82bb1789a99065c09130908a351224c9907194f/config/s6-rc-source
+src=/versions/system-config.c352639da637d13401fb505dab0b1c08a8a693350b866651556bcdee464d9ff0/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
