From 531fc0a60e3bef6b04c61a21c1f258825e169d23 Mon Sep 17 00:00:00 2001
From: TIAN Yuanhao <tianyuanhao3@163.com>
Date: Tue, 16 Jul 2024 06:19:08 -0700
Subject: [PATCH] package/crun: bump to version 1.15

Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...ile-error-without-libseccomp-and-lib.patch | 59 -------------------
 package/crun/crun.hash                        |  2 +-
 package/crun/crun.mk                          |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch

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
deleted file mode 100644
index 81b08d34b7..0000000000
--- a/package/crun/0001-libcrun-fix-compile-error-without-libseccomp-and-lib.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001
-From: Xiangyu Chen <xiangyu.chen@windriver.com>
-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 <xiangyu.chen@windriver.com>
----
- 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 <seccomp.h>
-+#ifdef HAVE_SECCOMP
-+#  include <seccomp.h>
-+#endif
- #include "scheduler.h"
- #include "seccomp_notify.h"
- #include "custom-handler.h"
-@@ -47,7 +49,9 @@
- #include <sys/signalfd.h>
- #include <sys/epoll.h>
- #include <sys/socket.h>
--#include <sys/capability.h>
-+#ifdef HAVE_CAP
-+#  include <sys/capability.h>
-+#endif
- #include <sys/ioctl.h>
- #include <termios.h>
- #include <grp.h>
-@@ -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 c461d78d97..b111e941dd 100644
--- a/package/crun/crun.hash
+++ b/package/crun/crun.hash
@@ -1,4 +1,4 @@
 # Locally computed
-sha256  a76982ac076a5c9bf9f85bd8d25b1dc6344e252399a7e9231504357fc019f7cc  crun-1.12.tar.gz
+sha256  a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f  crun-1.15.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.libcrun
diff --git a/package/crun/crun.mk b/package/crun/crun.mk
index 005d5fb397..b48f15304b 100644
--- a/package/crun/crun.mk
+++ b/package/crun/crun.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRUN_VERSION = 1.12
+CRUN_VERSION = 1.15
 CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION)
 CRUN_DEPENDENCIES = host-pkgconf yajl