Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

conmon: update to 2.0.30

Browse source 
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 ab08ad2ad9)
This commit is contained in:
Oskari Rauta 2021-11-05 00:19:15 +02:00 committed by Daniel Golle
parent 6e74b5d7ba
commit 2b73497737
No known key found for this signature in database
GPG key ID: 5A8F39C31C3217CA
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
utils/conmon/Makefile
View file

@ -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

19
utils/conmon/patches/010-remove-libdl-dep.patch Normal file
View file

@ -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'),
)