diff --git a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch new file mode 100644 index 0000000000..81b08d34b7 --- /dev/null +++ b/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch @@ -0,0 +1,59 @@ +From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen +Date: Tue, 12 Dec 2023 10:47:42 +0800 +Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap + +Fixed compile error without libseccomp and libcap, running +clang-format to format the code style. + +Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b +Signed-off-by: Xiangyu Chen +--- + src/libcrun/container.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/libcrun/container.c b/src/libcrun/container.c +index 34649f8..ffcdb24 100644 +--- a/src/libcrun/container.c ++++ b/src/libcrun/container.c +@@ -23,7 +23,9 @@ + #include "container.h" + #include "utils.h" + #include "seccomp.h" +-#include ++#ifdef HAVE_SECCOMP ++# include ++#endif + #include "scheduler.h" + #include "seccomp_notify.h" + #include "custom-handler.h" +@@ -47,7 +49,9 @@ + #include + #include + #include +-#include ++#ifdef HAVE_CAP ++# include ++#endif + #include + #include + #include +@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements) + (*field)[i] = NULL; + } + ++#ifdef HAVE_CAP + static void + populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities) + { +@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_ + (*capabilities)[index] = NULL; // Terminate the array with NULL + populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities); + } ++#endif + + static void + retrieve_mount_options (struct features_info_s **info) +-- +2.34.1 + diff --git a/package/crun/crun.hash b/package/crun/crun.hash index bdffb0c6aa..c461d78d97 100644 --- a/package/crun/crun.hash +++ b/package/crun/crun.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 5b8b5adb1dff7af768b69d2b0b4f2cd785ec931e7aa10138aa29812c46ee09ff crun-1.8.4.tar.gz +sha256 a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc crun-1.12.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk index 15438a44b3..a6088c13a0 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRUN_VERSION = 1.8.4 +CRUN_VERSION = 1.12 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) CRUN_DEPENDENCIES = host-pkgconf yajl