conmon-2.1.8-1.el8

- update to https://github.com/containers/conmon/releases/tag/v2.1.8
- Related: #2176055

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

.gitignore

@@ -1 +1 @@
-/*.tar.*
+/*.tar.gz

README.md

@@ -1,3 +0,0 @@
-# conmon
-
-The conmon package

conmon.spec

@@ -1,62 +1,56 @@
-%global with_debug 1
+%global with_check 0
 
-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
 
-%if 0%{?rhel}
-%bcond_with docs
-%else
-%bcond_without docs
-%endif
+# https://github.com/containers/conmon
+%global import_path github.com/containers/%{name}
+%global git0 https://%{import_path}
+%global commit0 00e08f4a9ca5420de733bf542b930ad58e1a7e7d
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: conmon
-Epoch: 2
-Version: 2.1.12
-License: Apache-2.0
-Release: %autorelease
+Epoch: 3
+Version: 2.1.8
+Release: 1%{?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
+License: ASL 2.0
+URL: %{git0}
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+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-core
+BuildRequires: git
 BuildRequires: glib2-devel
-BuildRequires: libseccomp-devel
 BuildRequires: systemd-devel
-BuildRequires: systemd-libs
-BuildRequires: make
-Requires: glib2
-Requires: systemd-libs
-Requires: libseccomp
+BuildRequires: golang >= 1.17.7
+BuildRequires: /usr/bin/go-md2man
+BuildRequires: libseccomp-devel
 
 %description
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{built_tag_strip}
-sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 
 %build
-%{__make} DEBUGFLAG="-g" bin/conmon
-
-%if %{with docs}
-%{__make} GOMD2MAN=go-md2man -C docs
-%endif
+export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%{__make} all
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install.bin
-
-%if %{with docs}
-%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
-%endif
+%{__make} PREFIX=%{buildroot}%{_prefix} install
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -65,10 +59,208 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-
-%if %{with docs}
-%{_mandir}/man8/%{name}.8.gz
-%endif
+%{_mandir}/man8/*
 
 %changelog
-%autochangelog
+* Fri Aug 25 2023 Jindrich Novy <jnovy@redhat.com> - 3:2.1.8-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.8
+- Related: #2176055
+
+* Fri Mar 17 2023 Jindrich Novy <jnovy@redhat.com> - 3:2.1.7-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.7
+- Related: #2176055
+
+* Wed Mar 08 2023 Jindrich Novy <jnovy@redhat.com> - 3:2.1.6-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.6
+- Related: #2176055
+
+* Mon Nov 07 2022 Jindrich Novy <jnovy@redhat.com> - 3:2.1.5-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.5
+- Related: #2123641
+
+* Tue Aug 30 2022 Jindrich Novy <jnovy@redhat.com> - 3:2.1.4-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.4
+- Related: #2061390
+
+* Fri Aug 26 2022 Jindrich Novy <jnovy@redhat.com> - 3:2.1.2-2
+- revert conmon to 2.1.2
+- Related: #2061390
+
+* Tue Jul 26 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.3-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.3
+- Related: #2061390
+
+* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.2-2
+- update to latest content of https://github.com/containers/conmon/releases/tag/2.1.2
+  (https://github.com/containers/conmon/commit/2bc95ee697e87d5f7b77063cf83fc32739addafe)
+- Related: #2061390
+
+* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.2-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.2
+- Related: #2061390
+
+* Mon Jun 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.1-2
+- fix CVE-2022-1708 - thanks to Peter Hunt
+- Related: #2061390
+
+* Tue May 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.1-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.1
+- Related: #2061390
+
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-3
+- BuildRequires: /usr/bin/go-md2man
+- Related: #2061390
+
+* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-2
+- bump golang BR to 1.17.7
+- Related: #2061390
+
+* Tue Jan 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.1.0-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.0
+- Related: #2001445
+
+* Wed Jan 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:2.0.32-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.32
+- Related: #2001445
+
+* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.31-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.31
+- Related: #2001445
+
+* Thu Sep 23 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.30-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.30
+- Related: #2001445
+
+* Thu Jun 03 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.29-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.29
+- Related: #1934415
+
+* Thu Jun 03 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-6
+- update to the latest content of https://github.com/containers/conmon/tree/master
+  (https://github.com/containers/conmon/commit/75e067e)
+- Related: #1934415
+
+* Wed Jun 02 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-5
+- update to the latest content of https://github.com/containers/conmon/tree/master
+  (https://github.com/containers/conmon/commit/b033cb5)
+- Related: #1934415
+
+* Mon May 17 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-4
+- update to the latest content of https://github.com/containers/conmon/tree/master
+  (https://github.com/containers/conmon/commit/3161452)
+- Related: #1934415
+
+* Mon May 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-3
+- upload new source tarball
+- Related: #1934415
+
+* Mon May 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-2
+- switch to master branch to fix /dev/null ownership issues
+  (https://github.com/containers/conmon/commit/372fa19211cfeabdb2bad52a4ab8a4d1b0b0063c)
+- Related: #1934415
+
+* Tue Mar 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.27-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.27
+- Related: #1934415
+
+* Thu Feb 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.26-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.26
+- Related: #1883490
+
+* Thu Jan 21 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.25-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.25
+- Related: #1883490
+
+* Fri Jan 15 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.24-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.24
+- Related: #1883490
+
+* Mon Jan 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-3
+- exclude i686 as golang is not suppoerted there
+- Related: #1883490
+
+* Sat Dec 26 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-2
+- add BR: golang, go-md2man
+- add man pages
+- Related: #1883490
+
+* Mon Dec 21 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.22
+- Related: #1883490
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-3
+- simplify spec
+- Related: #1883490
+
+* Mon Nov 09 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-2
+- be sure to harden the linked binary
+- compile with debuginfo enabled
+- Related: #1883490
+
+* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-1
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490
+
+* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.20-2
+- use proper CFLAGS
+- Related: #1821193
+
+* Wed Jul 29 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.20-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.20
+- Related: #1821193
+
+* Wed Jul 15 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.19-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.19
+- Related: #1821193
+
+* Tue Jun 16 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.18-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.18
+- Related: #1821193
+
+* Tue May 26 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.17-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.17
+- Related: #1821193
+
+* Wed May 13 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.16-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.16
+- Related: #1821193
+
+* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.15-2
+- synchronize containter-tools 8.3.0 with 8.2.1
+- Related: #1821193
+
+* Mon Apr 06 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.15-1
+- update to 2.0.15
+- Related: #1821193
+
+* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.6-1
+- update to 2.0.6
+- Related: RHELPLAN-25139
+
+* Tue Dec 10 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.5-1
+- update to 2.0.5
+- Related: RHELPLAN-25139
+
+* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.4-1
+- update to 2.0.4 bugfix release
+- Related: RHELPLAN-25139
+
+* Mon Nov 25 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.3-2.giteb5fa88
+- BR: systemd-devel
+- Related: RHELPLAN-25139
+
+* Wed Nov 20 2019 Jindrich Novy <jnovy@redhat.com> - 2:2.0.3-1.giteb5fa88
+- update to 2.0.3
+- Related: RHELPLAN-25139
+
+* Wed Sep 25 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.2-0.1.dev.git422ce21
+- build latest upstream master
+
+* Tue Sep 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-2
+- remove BR: go-md2man since no manpages yet
+
+* Tue Sep 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-1
+- bump to v2.0.0
+
+* Fri May 31 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:0.2.0-1
+- initial package

gating.yaml

@@ -1,6 +0,0 @@
-# recipients: jnovy, lsm5, santiago
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules: []

sources

@@ -1 +1 @@
-SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20
+SHA512 (conmon-2.1.8-00e08f4.tar.gz) = 851424323d6567f012350058dffbd58b91533135edb15b5381b3d85daf154aaff6f9a2583395186129e8ac58df224504947c81c3007513cae0f9918c1bb5587e

tests/test_podman.sh

@@ -1,17 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
----
-- 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

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