conmon: Update to 2.1.12

Refreshed patches.

Signed-off-by: Tianling Shen <redacted>

diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile
index 11afc5ef65f480c80a1ecf85fe8823627d098972..56467aef49cec9d47d5aa3ea305f2863a8224ba3 100644 (file)
--- a/utils/conmon/Makefile
+++ b/utils/conmon/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conmon
-PKG_VERSION:=2.1.10
+PKG_VERSION:=2.1.12
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
-PKG_HASH:=455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a
+PKG_SOURCE_URL:=https://github.com/containers/conmon/archive/v$(PKG_VERSION)
+PKG_HASH:=842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6
 
 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 bcfb4d005ec2cc0ffe1ed627782e37cdd8af854c..53ebe1b8561a1f63d3963fddecec1937ca53d8d0 100644 (file)
--- a/utils/conmon/patches/010-remove-libdl-dep.patch
+++ b/utils/conmon/patches/010-remove-libdl-dep.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -90,7 +90,7 @@ executable('conmon',
+@@ -87,7 +87,7 @@ executable('conmon',
              'src/utils.h',
              'src/seccomp_notify.c',
              'src/seccomp_notify.h'],