conmon-2.2.1-3.el10

- pass %%{optflags} and %%{build_ldflags} to enable stack protector
  and FORTIFY_SOURCE hardening flags
- Resolves: RHEL-152224

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

.fmf/version

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

conmon.spec

@@ -7,32 +7,34 @@
 %global debug_package %{nil}
 %endif
 
-%if 0%{?rhel}
+%if %{defined rhel}
 %bcond_with docs
 %else
 %bcond_without docs
 %endif
 
 Name: conmon
+%if %{defined rhel}
+Epoch: 3
+%else
 Epoch: 2
-Version: 2.1.12
+%endif
+Version: 2.2.1
 License: Apache-2.0
-Release: %autorelease
+Release: 3%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
 %if %{with docs}
-ExclusiveArch: %{golang_arches_future}
 BuildRequires: go-md2man
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
-BuildRequires: glib2-devel
-BuildRequires: libseccomp-devel
-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
@@ -41,37 +43,55 @@ Requires: libseccomp
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{built_tag_strip}
+%autosetup -Sgit %{name}-%{version}
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
-sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 
 %build
-%{__make} DEBUGFLAG="-g" bin/conmon
+%make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
 
 %if %{with docs}
-%{__make} GOMD2MAN=go-md2man -C docs
+%make_build GOMD2MAN=go-md2man -C docs
 %endif
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install.bin install.crio
+%{__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}
-
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_libexecdir}/crio/%{name}
-%dir %{_libexecdir}/crio
 
 %if %{with docs}
 %{_mandir}/man8/%{name}.8.gz
 %endif
 
 %changelog
-%autochangelog
+* 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
+- update to https://github.com/containers/conmon/releases/tag/v2.2.0
+- Related: RHEL-122178
+
+* Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 2:2.1.13-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.13
+- Resolves: RHEL-80818
+
+* Fri Jan 17 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-4
+- Fix spec file, remove crio
+- Related: RHEL-58990

plans/podman.fmf

@@ -1,43 +0,0 @@
-prepare:
-    - name: packages
-      how: install
-      package: [bats, 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 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20
+SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b

tests/test_podman.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -e
+#
+# Simple podman tests
+#
+
+# Log program and kernel versions
+echo "Important package versions:"
+(
+    uname -r
+    rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd|container-selinux' | sort
+) | sed -e 's/^/  /'
+
+# Log environment; or at least the useful bits
+echo "Environment:"
+env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
+
+bats /usr/share/podman/test/system

tests/test_podman.yml

@@ -0,0 +1,27 @@
+---
+- hosts: localhost
+  roles:
+    - role: standard-test-basic
+      tags:
+        - classic
+        - container
+      required_packages:
+        - bats
+        - conmon
+        - podman
+        - podman-tests
+      tests:
+        - root-test:
+            dir: ./
+            run: ./test_podman.sh
+            timeout: 45m
+            environment:
+              QUADLET: /usr/libexec/podman/quadlet
+        - rootless-test:
+            # running the test with su doesn't create the directory for fedora user on /run/user/
+            # so create it manually
+            dir: ./
+            run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora
+            timeout: 45m
+            environment:
+              QUADLET: /usr/libexec/podman/quadlet

tests/tests.yml

@@ -0,0 +1 @@
+- import_playbook: test_podman.yml