crun: update to 1.28

- remove outdated patch file
It was fixed upstream in containers/crun@9acf13d, so the patch file is no longer required.
- replace yajl with json-c
The JSON backend was switched from YAJL to json-c in containers/crun@b62cfdd, so --enable-embedded-yajl should be removed from CONFIGURE_ARGS and libjson-c should be add as a new dependency

Signed-off-by: nantayo <redacted>

diff --git a/utils/crun/Makefile b/utils/crun/Makefile
index 8b48092a751d710230ce1c5195dbd5a132f7ec25..8ff34ec07ef5be8d3edb351f2fa9dffb89fdb0ca 100644 (file)
--- a/utils/crun/Makefile
+++ b/utils/crun/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crun
-PKG_VERSION:=1.17
-PKG_RELEASE:=3
+PKG_VERSION:=1.28
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/containers/crun/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=f106f6adb752af5e0a867e226440e9ddaaf2d7400149d181f171b78ca19ad5e5
+PKG_HASH:=90284c7f097f8ee72a6447978c263e1b1355727c2f2ca0ac667e6d57788f46f5
 
 PKG_BUILD_DEPENDS:=argp-standalone
 PKG_BUILD_PARALLEL:=1
@@ -25,20 +25,20 @@ define Package/crun
   CATEGORY:=Utilities
   TITLE:=crun
   URL:=https://github.com/containers/crun
-  DEPENDS:=@!arc +libseccomp +libcap +libgcrypt
+  DEPENDS:=@!arc +libseccomp +libcap +libgcrypt +libjson-c
 endef
 
 define Package/crun/description
   A fast and low-memory footprint OCI Container Runtime fully written in C.
 endef
 
-LIBOCISPEC_COMMIT:=68211ccc41201c45ad276b04c7f67d61e80b1f7a
+LIBOCISPEC_COMMIT:=8034d0ecd27f646ba3ffae5ff24db234ce062825
 
 define Download/libocispec
   PROTO:=git
   URL:=https://github.com/containers/libocispec.git
   SOURCE_VERSION:=$(LIBOCISPEC_COMMIT)
-  MIRROR_HASH:=688d00600dbdf46d4b52acc8e43313b14471026ccff8c3cc5983e2f5dfd15571
+  MIRROR_HASH:=ac132910952d2d5c6bf3c8b891cced10d1c6113d50c78779a6b8d21851dc908a
   FILE:=libocispec-$(LIBOCISPEC_COMMIT).tar.xz
   SUBDIR:=libocispec
 endef
@@ -46,7 +46,6 @@ $(eval $(call Download,libocispec))
 
 CONFIGURE_ARGS+= \
        --disable-systemd \
-       --enable-embedded-yajl \
        --enable-caps \
        --enable-dl \
        --enable-seccomp \

diff --git a/utils/crun/patches/010-gcc15.patch b/utils/crun/patches/010-gcc15.patch
deleted file mode 100644 (file)
index e37127b..0000000
--- a/utils/crun/patches/010-gcc15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/tests_libcrun_fuzzer.c
-+++ b/tests/tests_libcrun_fuzzer.c
-@@ -463,7 +463,7 @@ LLVMFuzzerTestOneInput (uint8_t *buf, si
- }
- 
- static void
--sig_chld ()
-+sig_chld (int i)
- {
-   int status;
-   pid_t p;