import conmon-2.0.29-1.module+el8.4.0+11822+6cc1e7d7

.conmon.metadata

@@ -1 +1 @@
-ed12565698e4906511465d51df9914ea601e2c27 SOURCES/v2.0.26.tar.gz
+521832d18c9d5ed155a6be3d5a25e3072cdc73a3 SOURCES/conmon-2.0.29-7e6de66.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/v2.0.26.tar.gz
+SOURCES/conmon-2.0.29-7e6de66.tar.gz

SOURCES/conmon-1961682.patch

@@ -1,41 +0,0 @@
-From 096e2c1954f8b910c8cc4a4fa41f8325fd7ab84c Mon Sep 17 00:00:00 2001
-From: Giuseppe Scrivano <gscrivan@redhat.com>
-Date: Tue, 20 Apr 2021 18:46:58 +0200
-Subject: [PATCH] conmon: do not chown /dev/null
-
-skip the fchmod for the standard input files when /dev/null is used.
-
-Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
----
- src/conmon.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/conmon.c b/src/conmon.c
-index 0878ae5..2e0f23e 100644
---- a/src/conmon.c
-+++ b/src/conmon.c
-@@ -223,21 +223,21 @@ int main(int argc, char *argv[])
- 			workerfd_stdin = dev_null_r;
- 		if (dup2(workerfd_stdin, STDIN_FILENO) < 0)
- 			_pexit("Failed to dup over stdin");
--		if (fchmod(STDIN_FILENO, 0777) < 0)
-+		if (workerfd_stdin != dev_null_r && fchmod(STDIN_FILENO, 0777) < 0)
- 			nwarn("Failed to chown stdin");
- 
- 		if (workerfd_stdout < 0)
- 			workerfd_stdout = dev_null_w;
- 		if (dup2(workerfd_stdout, STDOUT_FILENO) < 0)
- 			_pexit("Failed to dup over stdout");
--		if (fchmod(STDOUT_FILENO, 0777) < 0)
-+		if (workerfd_stdout != dev_null_w && fchmod(STDOUT_FILENO, 0777) < 0)
- 			nwarn("Failed to chown stdout");
- 
- 		if (workerfd_stderr < 0)
- 			workerfd_stderr = workerfd_stdout;
- 		if (dup2(workerfd_stderr, STDERR_FILENO) < 0)
- 			_pexit("Failed to dup over stderr");
--		if (fchmod(STDERR_FILENO, 0777) < 0)
-+		if (workerfd_stderr != dev_null_w && fchmod(STDERR_FILENO, 0777) < 0)
- 			nwarn("Failed to chown stderr");
- 
- 		/* If LISTEN_PID env is set, we need to set the LISTEN_PID

SPECS/conmon.spec

@@ -6,18 +6,21 @@
 # https://github.com/containers/conmon
 %global import_path github.com/containers/%{name}
 %global git0 https://%{import_path}
+%global commit0 7e6de6678f6ed8a18661e1d5721b81ccee293b9b
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: conmon
 Epoch: 2
-Version: 2.0.26
+Version: 2.0.29
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 License: ASL 2.0
 URL: %{git0}
-Source0: %{git0}/archive/v%{version}.tar.gz
+%if 0%{?branch:1}
-# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1961682
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
-# patch:       https://github.com/containers/conmon/pull/257.patch
+%else
-Patch0: conmon-1961682.patch
+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:
@@ -29,12 +32,17 @@ BuildRequires: glib2-devel
 BuildRequires: systemd-devel
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: go-md2man
+BuildRequires: libseccomp-devel
 
 %description
 %{summary}.
 
 %prep
-%autosetup -Sgit
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 
 %build
 export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -54,6 +62,10 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.29-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.29
+- Related: #1954702
+
 * Tue May 18 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.26-3
 - fix "Permission on /dev/null are changing from 666 to 777 after running podman as root [rhel-8.4.0.z]"
 - Resolves: #1961682