diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2022-03-03 01:42:33 +0200 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2022-03-02 16:31:19 -0800 |
| commit | 1d55ac917f41777ecbca614cab776c52f500140c (patch) | |
| tree | 064e9788c7d33f157fa2566a9f4be48770c55996 /utils/conmon | |
| parent | 76c311d1c50900a2afc15205641fcc190a824264 (diff) | |
conmon: update to version 2.1.0
This release contains Bug fixes
patch refreshed
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Diffstat (limited to 'utils/conmon')
| -rw-r--r-- | utils/conmon/Makefile | 4 | ||||
| -rw-r--r-- | utils/conmon/patches/010-remove-libdl-dep.patch | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile index d70832bd9..ef500a836 100644 --- a/utils/conmon/Makefile +++ b/utils/conmon/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conmon -PKG_VERSION:=2.0.32 +PKG_VERSION:=2.1.0 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:=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75 +PKG_HASH:=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85 PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com> PKG_LICENSE:=Apache-2.0 diff --git a/utils/conmon/patches/010-remove-libdl-dep.patch b/utils/conmon/patches/010-remove-libdl-dep.patch index 2375ec3a3..5a7640cdf 100644 --- a/utils/conmon/patches/010-remove-libdl-dep.patch +++ b/utils/conmon/patches/010-remove-libdl-dep.patch @@ -1,14 +1,21 @@ --- a/meson.build +++ b/meson.build -@@ -34,7 +34,6 @@ add_project_arguments('-Os', '-Wall', '- - language : 'c') +@@ -35,14 +35,6 @@ add_project_arguments('-Os', '-Wall', '- glib = dependency('glib-2.0') --libdl = cc.find_library('dl') +-cc = meson.get_compiler('c') +-null_dep = dependency('', required : false) +-if cc.has_function('dlopen') +- libdl = null_dep +-else +- libdl = cc.find_library('dl') +-endif +- executable('conmon', ['src/conmon.c', -@@ -71,7 +70,7 @@ executable('conmon', + 'src/config.h', +@@ -78,7 +70,7 @@ executable('conmon', 'src/utils.h', 'src/seccomp_notify.c', 'src/seccomp_notify.h'], |