commit 11a3c3f08c9f86c850c220d49bffa84fd26d7637
parent 7e06fcbb42c2302d9073877c08174b1cf53f0219
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 3 May 2025 21:23:49 +0000
easyseccomp
Diffstat:
17 files changed, 64 insertions(+), 52 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
-2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321 files/easyseccomp-configure.tar
-bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2 files/easyseccomp_sys_types.patch
+ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c files/easyseccomp-configure.tar
+1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d 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
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index f9776ea..e968e30 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,6 +17,7 @@ libeasyseccomp_a_CFLAGS = -I $(abs_srcdir)/src -I $(abs_builddir)/src
+
+ src/libeasyseccomp_a-lexer.h: src/libeasyseccomp_a-parser.h
+ src/generator.c: src/libeasyseccomp_a-lexer.h
++src/libeasyseccomp_a-libeasyseccomp_a-lexer.o: src/libeasyseccomp_a-lexer.h
+
+ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+
+diff --git a/src/sim/bpf.h b/src/sim/bpf.h
+index 8b95b14..1dda1ce 100644
+--- a/src/sim/bpf.h
++++ b/src/sim/bpf.h
+@@ -40,6 +40,20 @@
+ #ifndef _NET_BPF_H_
+ #define _NET_BPF_H_
+
++/* define u_int*_t types */
++#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/files/easyseccomp_sys_types.patch b/files/easyseccomp_sys_types.patch
@@ -1,25 +0,0 @@
-diff --git a/src/sim/bpf.h b/src/sim/bpf.h
-index 8b95b14..1dda1ce 100644
---- a/src/sim/bpf.h
-+++ b/src/sim/bpf.h
-@@ -40,6 +40,20 @@
- #ifndef _NET_BPF_H_
- #define _NET_BPF_H_
-
-+/* define u_int*_t types */
-+#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/templates/pkg/easyseccomp b/templates/pkg/easyseccomp
@@ -8,7 +8,7 @@
#+{{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
+#@sha256:{{files["easyseccomp_fix_includes.patch"]}}:easyseccomp_fix_includes.patch
{%- endblock %}
{% block at_script %}
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.e8d467f110a22030b6b0dd949307f285c2db75e4341933e72e419c9a497bc7b0-
\ No newline at end of file
+#+easyseccomp.99ce4a2e859ca62f2b0669e5fb52f6654138604e03a40add3e5d7984eec0f1dd+
\ 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.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d
-#+system-config-rc.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a
+#+system-config.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886
+#+system-config-rc.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.21efe72d150da3a8ba035a68b8e9b974fa1647b5d0426fa157a961311451b9fb
+#+system-config-init.d8ba68f3a65489ad30ab905f4fa24e06313576f87874c4fa2c4b4cf9a5e4cafc
#+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:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
-#@sha256:bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2:easyseccomp_sys_types.patch
+#@untar::sha256:ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c:easyseccomp
+#@sha256:1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d:easyseccomp_fix_includes.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.e3753d0ff590e31f4b8f53cae718f9042eae9dce2e5e364e71b62e8d80981e57' \
+ 'pthbs_path_containers=/home/ccx/versions/env.dfab34dca2a8d028842e503205fffa5c2f86fd93ee90a531e0b51558115b828d' \
'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.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a
+#+system-config-rc.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b
-s6rcdb=/home/ccx/versions/system-config-rc.2fe0c4f2f2e4596746b7044b1aaadb2c213aa1efab8ba1bba32752bbb098511a/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.4a9084fa38a4da5d16c0bd4adb66af577779afefeaf296272b9c52922719f55b/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.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d
+#+system-config.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.5be6f6a6cc0bf33767ec753089f9acaa484054acef252b8744879b5657a6999d/config/s6-rc-source
+src=/home/ccx/versions/system-config.e911ddb9fb1005baa7ea64268aeb3008bc4327c40ff8b81f4267a11dda50e886/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.084867dc57b1f996adea10ff7c9f6ef88beba4ecaf7064d753beb5e93993dc33-
\ No newline at end of file
+#+easyseccomp.2ea0f72a5dbfd351c715e372a76221eda9c506fdecc93f873def5db5bd3de376+
\ 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.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b
-#+system-config-rc.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600
+#+system-config.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591
+#+system-config-rc.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.9f095745e1381bf4f2d1d16d7672f1cb4876faff20f0460dc535c5bedde50675
+#+system-config-init.2fd78022c867265019b3d16862b0e8a1423eba75c4fb1ef9c291b17ca35b97f2
#+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:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp
-#@sha256:bc27fe5ed29da014fccb0bb7948b49a9f104e66a59daf45823734c93c2b876c2:easyseccomp_sys_types.patch
+#@untar::sha256:ac312385c2fc5e6cdec363c1f8242a9761b2f02842da90d467906df085a0d54c:easyseccomp
+#@sha256:1ab1d7d57146e5cbe236efd85ea29d6c6e68b40d80bca93eb08c6adf3c10d10d:easyseccomp_fix_includes.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.69891650a800b75d6f5bf71c27f6f0f95f202525d11abdb4d4acb340e2d63b8e' \
+ 'pthbs_path_containers=/versions/env.5755b6dcc5b044917722a85ca3fb3dde30a9a893cfdfacc2c5f566afad2d9bfc' \
'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.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600
+#+system-config-rc.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f
-s6rcdb=/versions/system-config-rc.dfe152fa037d9422d324554e4a1ccc84eda104d69c4236998d1cc49388b06600/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.4251687bb176efaecb388934398d95c32fa180303675b3c5d757b32e97074a3f/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.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b
+#+system-config.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.46b72da78c704b314fe5cf72f2bc9ceb66cb43060843e85e58b56aee65dd408b/config/s6-rc-source
+src=/versions/system-config.238651f84e80bfe563d70d1b178b97f995c9898bb4115a76aba2e329ab9c4591/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
