Merge branch 'test-konflux-build' into 'c9s'

Draft: Test MR for Konflux See merge request redhat/centos-stream/rpms/conmon!65
Test MR for Konflux
2026-05-04 23:42:20 +00:00 · 2026-03-05 06:06:51 +00:00 · 2026-03-05 07:06:47 +01:00 · 2026-02-12 20:26:10 +01:00
2 changed files with 8 additions and 3 deletions
@@ -15,7 +15,7 @@

 Name: conmon
 Epoch: 3
-Version: 2.2.0
+Version: 2.2.1
 License: Apache-2.0
 Release: 2%{?dist}
 Summary: OCI container runtime monitor
@@ -45,7 +45,7 @@ Requires: libseccomp
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile

 %build
-%{__make} DEBUGFLAG="-g" bin/conmon
+%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon

 %if %{with docs}
 %{__make} GOMD2MAN=go-md2man -C docs
@@ -70,6 +70,11 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %endif

 %changelog
+* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.1-1
+- update to https://github.com/containers/conmon/releases/tag/v2.2.1
+- enable RELRO
+- Related: RHEL-111919
+
 * Thu Feb 05 2026 Jindrich Novy <jnovy@redhat.com> - 3:2.2.0-2
 - update to https://github.com/containers/conmon/releases/tag/v2.2.0
 - Resolves: RHEL-147114
@@ -1 +1 @@
-SHA512 (v2.2.0.tar.gz) = 8a14d47be06f3b768118216afc7b9cf5da65c19d896f55febe92250cf9f7aa7c9b8c58736f0a52d44c2ff9f4a6bc99fa3f9ffe22a7905d332b2fd816b3a2e2c9
+SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
Author	SHA1	Message	Date
Đorđe Todorović	32f550bb13	Merge branch 'test-konflux-build' into 'c9s' Draft: Test MR for Konflux See merge request redhat/centos-stream/rpms/conmon!65	2026-03-05 06:06:51 +00:00
Đorđe Todorović	2197708e24	Test MR for Konflux	2026-03-05 07:06:47 +01:00
Jindrich Novy	f90380454e	conmon-2.2.1-1.el9 - update to https://github.com/containers/conmon/releases/tag/v2.2.1 - enable RELRO - Related: RHEL-111919 Signed-off-by: Jindrich Novy <jnovy@redhat.com>	2026-02-12 20:26:10 +01:00