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>

conmon.spec

@@ -1,53 +1,62 @@
-%global with_check 0
+%global with_debug 1
 
-# https://github.com/containers/conmon
+%if 0%{?with_debug}
-%global import_path github.com/containers/%{name}
+%global _find_debuginfo_dwz_opts %{nil}
-%global git0 https://%{import_path}
+%global _dwz_low_mem_die_limit 0
-%global commit0 82de887596ed8ee6d9b2ee85e4f167f307bb569b
+%else
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global debug_package %{nil}
+%endif
+
+%if %{defined rhel}
+%bcond_with docs
+%else
+%bcond_without docs
+%endif
 
 Name: conmon
 Epoch: 3
-Version: 2.1.13
+Version: 2.2.1
+License: Apache-2.0
 Release: 1%{?dist}
 Summary: OCI container runtime monitor
-License: ASL 2.0
+URL: https://github.com/containers/%{name}
-URL: %{git0}
+# Tarball fetched from upstream
-%if 0%{?branch:1}
+Source0: %{url}/archive/v%{version}.tar.gz
-Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%if %{with docs}
-%else
+BuildRequires: go-md2man
-Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
 %endif
-# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
-#ExclusiveArch: %%{go_arches}
-# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
-ExcludeArch: %{ix86}
 BuildRequires: gcc
-BuildRequires: git
+BuildRequires: git-core
 BuildRequires: glib2-devel
-BuildRequires: systemd-devel
-BuildRequires: golang >= 1.12.12-4
-BuildRequires: /usr/bin/go-md2man
 BuildRequires: libseccomp-devel
+BuildRequires: pkgconfig
+BuildRequires: systemd-devel
+BuildRequires: systemd-libs
+BuildRequires: make
+Requires: glib2
+Requires: systemd-libs
+Requires: libseccomp
 
 %description
 %{summary}.
 
 %prep
-%if 0%{?branch:1}
+%autosetup -Sgit %{name}-%{version}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
-%else
-%autosetup -Sgit -n %{name}-%{commit0}
-%endif
 
 %build
-export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
-export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+
-%{__make} all
+%if %{with docs}
+%{__make} GOMD2MAN=go-md2man -C docs
+%endif
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install
+%{__make} PREFIX=%{buildroot}%{_prefix} install.bin
+
+%if %{with docs}
+%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
+%endif
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -56,9 +65,20 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
+%if %{with docs}
 %{_mandir}/man8/*
+%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
+
 * Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.13-1
 - update to https://github.com/containers/conmon/releases/tag/v2.1.13
 - Resolves: RHEL-80820

gating.yaml

@@ -1,10 +1,7 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts:
+decision_context: bodhi_update_push_stable
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
-subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
 

plans/conmon.fmf

@@ -0,0 +1,27 @@
+---
+summary: Run conmon tests
+description: Test plan for conmon
+contact: Yuhui Jiang <yujiang@redhat.com>
+
+provision:
+  how: container
+
+prepare:
+  - name: Install packages
+    how: install
+    package: [crun, podman, podman-tests, git]
+  - name: Prepare bats
+    how: shell
+    script:
+      - rm -rf /tmp/bats-core-1.11.0
+      - curl -s -L https://github.com/bats-core/bats-core/archive/refs/tags/v1.11.0.tar.gz | tar xvz -C /tmp
+      - /tmp/bats-core-1.11.0/install.sh /usr
+
+discover:
+  how: fmf
+  filter: 'tag: gate'
+  url: https://gitlab.com/yujiang1/conmon.git
+  ref: c9s
+
+execute:
+  how: tmt

plans/podman.fmf

@@ -1,43 +0,0 @@
-prepare:
-    - name: packages
-      how: install
-      package: [bats, iptables, podman-tests]
-
-adjust:
-    - when: "initiator == packit"
-      because: "We need to test with updated packages from rhcontainerbot/podman-next copr"
-      prepare+:
-        how: shell
-        script: |
-            sed -i -n '/^priority=/!p;$apriority=1' /etc/yum.repos.d/*podman-next*.repo
-            dnf -y upgrade --allowerasing
-    # FIXME: Use epel10 once bats is available there
-    - when: distro == centos-stream-10 or distro == rhel-10
-      because: "bats isn't yet available on epel10"
-      prepare+:
-        how: install
-        copr: rhcontainerbot/bats-el10
-        package: bats
-    - when: distro == centos-stream-9 or distro == rhel-9
-      because: "bats is present on EPEL on rhel9 / c9s"
-      prepare+:
-        how: feature
-        epel: enabled
-
-discover:
-    how: fmf
-    url: https://github.com/lsm5/podman
-    ref: "tmt-fedora-centos"
-
-execute:
-    how: tmt
-
-/system/local/root:
-    summary: Run podman system rootful tests
-    discover+:
-        filter: 'tag:local & tag:root'
-
-/system/local/rootless:
-    summary: Run podman system rootless tests
-    discover+:
-        filter: 'tag:local & tag:rootless'

sources

@@ -1 +1 @@
-SHA512 (conmon-2.1.13-82de887.tar.gz) = a946e64f9d628380c54a56098e0d907d14cc4890c209cd585ac47e14e1cf4d4bf2b1f63381ff069ed932f30c8edaff52a3d51012b04c358f59cb74b9307f91f0
+SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b

tests/main.fmf

@@ -0,0 +1,14 @@
+---
+summary: conmon tests
+description: Using podman system tests to test conmon
+contact: Yuhui Jiang <yujiang@redhat.com>
+framework: shell
+require: [podman,conmon]
+
+tag: 'gate'
+
+test: |
+  /usr/bin/bats -t /usr/share/podman/test/system/030-run.bats
+  /usr/bin/bats -t /usr/share/podman/test/system/075-exec.bats
+
+duration: 15m