conmon-2.2.1-1.el10

- update to https://github.com/containers/conmon/releases/tag/v2.2.1
- enable RELRO
- Related: RHEL-122178

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

.fmf/version

@@ -1 +0,0 @@
-1

conmon.spec

@@ -21,7 +21,7 @@ Epoch: 2
 %endif
 Version: 2.2.1
 License: Apache-2.0
-Release: 4%{?dist}
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
@@ -31,10 +31,12 @@ BuildRequires: go-md2man
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
+BuildRequires: glib2-devel
+BuildRequires: libseccomp-devel
+BuildRequires: pkgconfig
+BuildRequires: systemd-devel
+BuildRequires: systemd-libs
 BuildRequires: make
-BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libseccomp)
 Requires: glib2
 Requires: systemd-libs
 Requires: libseccomp
@@ -47,10 +49,10 @@ Requires: libseccomp
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 
 %build
-%make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
+%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
 
 %if %{with docs}
-%make_build GOMD2MAN=go-md2man -C docs
+%{__make} GOMD2MAN=go-md2man -C docs
 %endif
 
 %install
@@ -60,6 +62,9 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
 %endif
 
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %files
 %license LICENSE
 %doc README.md
@@ -70,22 +75,8 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %endif
 
 %changelog
-* Fri May 29 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-4
-- Add TMT test infrastructure for tier0 gating
-- Resolves: RHEL-180349
-
-* Fri Feb 27 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-3
-- pass %%{optflags} and %%{build_ldflags} to enable stack protector
-  and FORTIFY_SOURCE hardening flags
-- Resolves: RHEL-152224
-
-* Mon Feb 16 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-2
-- use proper macros in spec file and simplify
-- Related: RHEL-111917
-
 * Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-1
 - update to https://github.com/containers/conmon/releases/tag/v2.2.1
-- enable RELRO
 - Related: RHEL-122178
 
 * Tue Feb 03 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.0-1

gating.yaml

@@ -3,5 +3,4 @@
 product_versions:
   - rhel-10
 decision_context: osci_compose_gate
-rules:
+rules: []
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/conmon.fmf

@@ -1,27 +0,0 @@
----
-summary: Run conmon tests
-description: Test plan for conmon
-contact: jnovy@redhat.com
-
-discover:
-    how: fmf
-
-provision:
-    how: artemis
-
-prepare:
-    - how: install
-      package:
-        - crun
-        - podman
-        - podman-tests
-        - git
-    - how: shell
-      script: |
-        BATS_VERSION=1.11.0
-        curl -L https://github.com/bats-core/bats-core/archive/refs/tags/v$BATS_VERSION.tar.gz | tar zx
-        cd bats-core-$BATS_VERSION
-        ./install.sh /usr
-
-execute:
-    how: tmt

tests/main.fmf

@@ -1,8 +0,0 @@
-summary: Run basic podman tests to verify conmon
-test: cd /usr/share/podman/test/system && bats 030-run.bats 075-exec.bats
-require:
-    - podman
-    - conmon
-duration: 15m
-tag:
-    - gate