commit 7f771f7c727ea60eef8e506c96aeeec608022c0d
parent c549800975b0625af032ecfd3692725b87ff8b86
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 19:59:21 +0000
easyseccomp
Diffstat:
14 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -26,7 +26,7 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.
75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub
9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86 files/dwarf.h
2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321 files/easyseccomp-configure.tar
-ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7 files/easyseccomp_sys_types.patch
+bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2 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
@@ -1,8 +1,8 @@
diff --git a/src/sim/bpf.h b/src/sim/bpf.h
-index 8b95b14..1aed7cf 100644
+index 8b95b14..1dda1ce 100644
--- a/src/sim/bpf.h
+++ b/src/sim/bpf.h
-@@ -40,6 +40,10 @@
+@@ -40,6 +40,20 @@
#ifndef _NET_BPF_H_
#define _NET_BPF_H_
@@ -10,6 +10,16 @@ index 8b95b14..1aed7cf 100644
+#define _GNU_SOURCE 1
+#include <sys/types.h>
+
++#ifndef __BEGIN_DECLS
++#ifdef __cplusplus
++#define __BEGIN_DECLS extern "C" {
++#define __END_DECLS }
++#else
++#define __BEGIN_DECLS
++#define __END_DECLS
++#endif
++#endif
++
/* BSD style release date */
#define BPF_RELEASE 199606
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.49862b3893f30b4c2d5b68f9662f13f3d568f93e39371cabbd436e2af4d1346c-
\ No newline at end of file
+#+easyseccomp.3697920e1e81e412fe0f2ecf3c6f747f09014c4a2af742c7f4541c7d59edc6cb+
\ 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.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e
-#+system-config-rc.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738
+#+system-config.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb
+#+system-config-rc.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.d96a712b1b62fa751101073ed52c423e0096604e1bf12d908904404ae54ef7b8
+#+system-config-init.d93851aab1001aaa8d6c3f5e57bad9f9960ae9e6ac7de5df1b3d7b2d23f38cf7
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -12,7 +12,7 @@
#+argp-standalone.67cb9dc5d68bacf213a32171dedea9b95c3651b603f91f1e757e583cb4f233c7
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
-#@sha256:ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7:easyseccomp_sys_types.patch
+#@sha256:bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2:easyseccomp_sys_types.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
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.b8a78f420d0c8e0eb25dd5de8582d1810d4b909a5f3b7fe90e91e6c951f06cf0' \
+ 'pthbs_path_containers=/home/ccx/versions/env.892f38b689bf280e9978837486c3b3b468564d4bda2e73b59c7ff4e9fedd0df2' \
'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.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738
+#+system-config-rc.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a
-s6rcdb=/home/ccx/versions/system-config-rc.a51e95bd26efdcc278bb538357779f4f7f20a7fb9f6b1caee356eebb204c7738/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.0b9966225c723aa09579fbee4c9ab01ef4f16a10208e25f071b7189e95170d2a/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.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e
+#+system-config.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.a4fc673b0f254ee0d62a1e990a47e88adce6a80a145a9329825c36c2fd112c2e/config/s6-rc-source
+src=/home/ccx/versions/system-config.93b9bb5193e030ce5e7d91ed2006694120edb6557612efa9ef725c0a55c757eb/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.9563e91200ae2e30a863c3fc916666e81307d020524a1e3ced38ccb85e93a0be-
\ No newline at end of file
+#+easyseccomp.979f08c28c4721505e5bd6386f5aaecf3eeaf919f5effb7e860967d24e51024a+
\ 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.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d
-#+system-config-rc.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b
+#+system-config.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3
+#+system-config-rc.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.40a740cf35a4365760111991fbec5a71926d6214d97543509f2df95fcc0979bf
+#+system-config-init.5081587a06743423b25ecc17cc37cf1691b81ca72bb7ef41dc89c5d26725fabe
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -12,7 +12,7 @@
#+argp-standalone.1704fb243241c32274e2f78dafafa0ad18e2c26456742441ebd3e5dda8bc7d0b
#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
#@untar::sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
-#@sha256:ba12216e9f38cd860eaac2d9bf66a31685d8182c5d1249f3acd809599a33b8f7:easyseccomp_sys_types.patch
+#@sha256:bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2:easyseccomp_sys_types.patch
build_env_static() {
export LD_LIBRARY_PATH="$pthbs_build_environment/library"
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.3607a2981e61caab29923f7f59abb72f256e0fcdae9edee5c67842262d48e013' \
+ 'pthbs_path_containers=/versions/env.951f9ed6cfb430c53830cc9cd1cb7d838568e251ae59504791f8bcd9d93756c2' \
'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.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b
+#+system-config-rc.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869
-s6rcdb=/versions/system-config-rc.60d44547606fe5880137792579e289f6bf4f26160a2f2de20178198b2f2fa50b/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7694f64a5232cd127a58f873e2d562e45b3116303ab13fe3e920a81f92525869/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.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d
+#+system-config.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.224820c14b313d2386c79991f95666521c19acd1a94f39559e61b22bc5c55f2d/config/s6-rc-source
+src=/versions/system-config.634e72fdd83184d96be84f5d6c55c1866a572b18e22e34fc02169419ec3d8fd3/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
