From: Oskari Rauta <oskari.rauta@gmail.com>
Date: Thu, 4 Nov 2021 22:19:15 +0000 (+0200)
Subject: conmon: update to 2.0.30
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2b73497737745ebf100f28b541edddd81d59d2d1;p=feed%2Fpackages.git

conmon: update to 2.0.30

bug fixes:
 - Remove unreachable code path
 - exit: report if the exit command was killed
 - exit: fix race zombie reaper
 - conn_sock: allow watchdog messages through the notify socket proxy
 - seccomp: add support for seccomp notify

misc:
 - Add seccomp to build dependency

included patch removes unnecessary dependency of libdl and also allows a succesfull build
disabled for arc where libseccomp does not seem to be available

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit ab08ad2ad966b32a7e6e478e3c7dd775492a36ff)
---

diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile
index 40c58a6499..4a03cf2977 100644
--- a/utils/conmon/Makefile
+++ b/utils/conmon/Makefile
@@ -1,18 +1,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conmon
-PKG_VERSION:=2.0.29
+PKG_VERSION:=2.0.30
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
-PKG_HASH:=eb4d5e157671a61b88786e44094775194e30e1d0ad0b9d50035532ece78dbc28
+PKG_HASH:=4b0a98fbe8a63c42f60edac25c19aa6606caa7b1e4fe7846fc7f7de0b566ba25
 
 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=golang/host meson/host
+PKG_BUILD_DEPENDS:=golang/host meson/host libseccomp
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -23,7 +23,7 @@ define Package/conmon
   CATEGORY:=Utilities
   TITLE:=Podman conmon
   URL:=https://podman.io
-  DEPENDS:=+glib2 $(INTL_DEPENDS) $(ICONV_DEPENDS)
+  DEPENDS:=@!arc +glib2 $(INTL_DEPENDS) $(ICONV_DEPENDS)
 endef
 
 define Package/conmon/description
diff --git a/utils/conmon/patches/010-remove-libdl-dep.patch b/utils/conmon/patches/010-remove-libdl-dep.patch
new file mode 100644
index 0000000000..2375ec3a3f
--- /dev/null
+++ b/utils/conmon/patches/010-remove-libdl-dep.patch
@@ -0,0 +1,19 @@
+--- a/meson.build
++++ b/meson.build
+@@ -34,7 +34,6 @@ add_project_arguments('-Os', '-Wall', '-
+                       language : 'c')
+ 
+ glib = dependency('glib-2.0')
+-libdl = cc.find_library('dl')
+ 
+ executable('conmon',
+            ['src/conmon.c',
+@@ -71,7 +70,7 @@ executable('conmon',
+             'src/utils.h',
+             'src/seccomp_notify.c',
+             'src/seccomp_notify.h'],
+-           dependencies : [glib, libdl],
++           dependencies : [glib],
+            install : true,
+            install_dir : join_paths(get_option('libexecdir'), 'podman'),
+ )