From: Oskari Rauta <oskari.rauta@gmail.com>
Date: Sat, 16 Sep 2023 07:48:46 +0000 (+0300)
Subject: crun: update to 1.9
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7728e1eb396c38ed97e7edf390529c89f69e898b;p=feed%2Fpackages.git

crun: update to 1.9

Changes:
 - support arbitrary idmapped mounts. Now it is possible to specify a mapping for any type of mount, not only bind mounts.
 - add support for "ridmap" mount option to support recursive idmapped mounts.
 - fix check for oom_score_adj. Write the oom_score_adj file even when the new value is 0.
 - features: Support mountExtensions.
 - correctly handle unknown signal string when it doesn't start with a digit.
 - do not attempt to join again already joined namespace.
 - wasmer: use latest wasix API.
 - refresh libocispec

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
---

diff --git a/utils/crun/Makefile b/utils/crun/Makefile
index d97edb1f29..6a29b17998 100644
--- a/utils/crun/Makefile
+++ b/utils/crun/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crun
-PKG_VERSION:=1.8.5
+PKG_VERSION:=1.9
 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:=14e3d4b35767e02f2da97342e703a284738f2f0f86b4dbfb467f2b8b294ef391
+PKG_HASH:=dfe15045953f6876fde273518ac2cafbabda7c0eebd3dcdba34c4e5dc8b46661
 
 PKG_BUILD_DEPENDS:=argp-standalone
 PKG_BUILD_PARALLEL:=1
@@ -31,13 +31,13 @@ define Package/crun/description
   A fast and low-memory footprint OCI Container Runtime fully written in C.
 endef
 
-LIBOCISPEC_COMMIT:=19c05670c37a42c217caa7b141bcaada7867cc15
+LIBOCISPEC_COMMIT:=3d168261f250477061fe0eb3648bf998c70c6519
 
 define Download/libocispec
   PROTO:=git
   URL:=https://github.com/containers/libocispec.git
   VERSION:=$(LIBOCISPEC_COMMIT)
-  MIRROR_HASH:=eacd0096e4acdcdb7f5062897e336934844b45d3b1d8a306801eb39ea9fae5c0
+  MIRROR_HASH:=4e308ff6a40e38aee184abef9156fa92b1ea9f978e277be2ed7b12f9e06f717f
   FILE:=libocispec-$(LIBOCISPEC_COMMIT).tar.xz
   SUBDIR:=libocispec
 endef
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= \
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
-	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
+	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/{crun.c,libcrun/container.c}
 	xzcat $(DL_DIR)/libocispec-$(LIBOCISPEC_COMMIT).tar.xz | $(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
 endef