commit 79a4f3d28001b272599d3c14d685ddf034fb94ce
parent bd12c248afa7cb581a1e9cc0f2d43c93c961e763
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 19:35:34 +0000
easyseccomp
Diffstat:
15 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -26,6 +26,7 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.
75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub
9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86 files/dwarf.h
2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321 files/easyseccomp-configure.tar
+ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7 files/easyseccomp_sys_types.patch
a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e files/elf.h
0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b files/gelf.h
cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888 files/lh_bootstrap-x86_64-config
diff --git a/files/easyseccomp_sys_types.patch b/files/easyseccomp_sys_types.patch
@@ -0,0 +1,15 @@
+diff --git a/src/sim/bpf.h b/src/sim/bpf.h
+index 8b95b14..1aed7cf 100644
+--- a/src/sim/bpf.h
++++ b/src/sim/bpf.h
+@@ -40,6 +40,10 @@
+ #ifndef _NET_BPF_H_
+ #define _NET_BPF_H_
+
++/* define u_int*_t types */
++#define _GNU_SOURCE 1
++#include <sys/types.h>
++
+ /* BSD style release date */
+ #define BPF_RELEASE 199606
+
diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -7,10 +7,13 @@
#+{{pkg_install_name("argp-standalone")}}
#@git:{{submodule.current[name]}}:{{name}}
#@untar::sha256:{{files["easyseccomp-configure.tar"]}}:{{name}}
+#@sha256:{{files["easyseccomp_sys_types.patch"]}}:easyseccomp_sys_types.patch
{%- endblock %}
{% block at_script %}
-autotools_static {{name}} --enable-seccomp
+cd {{name}}
+patch -p1 <../easyseccomp_sys_types.patch
+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.34393f9cfd56d733a52a0e7a91b5b3d0f2a1eccca15b9bc5632fb9198f3cabde-
\ No newline at end of file
+#+easyseccomp.4db51bfc35d5c386660c100d780d75e3ccf8fccb5a87efc785f97df4f6af2b8c+
\ 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.73f93078bc41e3084fb95791c86d1a3949a3c095f6c6ac823e88ff314e48329b
-#+system-config-rc.9eb703fb71ad969de79e7cbabdf324a24dff41be91402ef7e5d29176e4a66c1a
+#+system-config.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e
+#+system-config-rc.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.1d5f674a687416f8e1d055bba02c56fa2636df4c6c59aa6f13812e6dd435195a
+#+system-config-init.052fa48c2a7afbc7ee24b999ba1bc6cd3fef5fd3411e054a2496c7c43cb5a420
#+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,6 +11,7 @@
#+argp-standalone.67cb9dc5d68bacf213a32171dedea9b95c3651b603f91f1e757e583cb4f233c7
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
+#@sha256:ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7:easyseccomp_sys_types.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -63,7 +64,9 @@ check_static() {
}
-autotools_static easyseccomp --enable-seccomp
+cd easyseccomp
+patch -p1 <../easyseccomp_sys_types.patch
+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.31fa7243c43cec8938ca892eedd85e08cff6372ff7a23cc135b7c55819130a0c' \
+ 'pthbs_path_containers=/home/ccx/versions/env.dd15d133c17c6bc14ec7ab8f6acf08ac0d184e765592878b85bf1587447977bf' \
'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.9eb703fb71ad969de79e7cbabdf324a24dff41be91402ef7e5d29176e4a66c1a
+#+system-config-rc.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1
-s6rcdb=/home/ccx/versions/system-config-rc.9eb703fb71ad969de79e7cbabdf324a24dff41be91402ef7e5d29176e4a66c1a/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.49168925c2d9af05c8bd79829854c42d5bae6d8f24f041a3cd97581a0ef4b8c1/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.73f93078bc41e3084fb95791c86d1a3949a3c095f6c6ac823e88ff314e48329b
+#+system-config.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.73f93078bc41e3084fb95791c86d1a3949a3c095f6c6ac823e88ff314e48329b/config/s6-rc-source
+src=/home/ccx/versions/system-config.3c56257ad1250cf2aaa1bfa2e9c29f78fccb77090ae86aaaa88d48d5792b270e/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.829b48d7d27119a77c9c611ec3844cf75642193a0fc4be704dd791b07008b677-
\ No newline at end of file
+#+easyseccomp.04499687496743359212ac503af851a4ab0a1d4ddf16699cc87268047cabf944+
\ 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.30e5cae9d8303b8ffed670cf3c31ab79307d06345eff2d07acab3103fb847f7c
-#+system-config-rc.17321cc2f18bcae965f05bbd815f8e6d56e5ddab5f37fcf202f2c6c2c3fac746
+#+system-config.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85
+#+system-config-rc.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.8b514c1d02f668bb6c46ff0fdc7c53291c191e25bb709f368fa0c5f1ce7f528d
+#+system-config-init.a7b5ebc837ea3072581a68762cf24a0c2235236712429247700850a5645f87f1
#+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,6 +11,7 @@
#+argp-standalone.1704fb243241c32274e2f78dafafa0ad18e2c26456742441ebd3e5dda8bc7d0b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
+#@sha256:ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7:easyseccomp_sys_types.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
@@ -63,7 +64,9 @@ check_static() {
}
-autotools_static easyseccomp --enable-seccomp
+cd easyseccomp
+patch -p1 <../easyseccomp_sys_types.patch
+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.69ca5306474a237c2799a561f348f077f82282340158d8d50dbd63622a9c6bc6' \
+ 'pthbs_path_containers=/versions/env.b755d8c50ac427e0347fad4557cc3b8c26457f534288e9f424578caeb9f67ecd' \
'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.17321cc2f18bcae965f05bbd815f8e6d56e5ddab5f37fcf202f2c6c2c3fac746
+#+system-config-rc.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55
-s6rcdb=/versions/system-config-rc.17321cc2f18bcae965f05bbd815f8e6d56e5ddab5f37fcf202f2c6c2c3fac746/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.1a8daf9ea6593d4397c99f09967b2d5df41f99da448a3e0982e4953f75104b55/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.30e5cae9d8303b8ffed670cf3c31ab79307d06345eff2d07acab3103fb847f7c
+#+system-config.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.30e5cae9d8303b8ffed670cf3c31ab79307d06345eff2d07acab3103fb847f7c/config/s6-rc-source
+src=/versions/system-config.959c596f5697a5bfdbdd720f8cc745634524f35efd50ebce28fadf173a0b8c85/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
