From 8091e7098425b24a025b4ac9dd3088c99ad9436d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 07:19:21 -0400 Subject: [PATCH] import conmon-2.1.2-2.module+el8.7.0+16493+89f82ab8 --- .conmon.metadata | 2 +- .gitignore | 2 +- SPECS/conmon.spec | 45 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/.conmon.metadata b/.conmon.metadata index 5bafdd8..9ecaccb 100644 --- a/.conmon.metadata +++ b/.conmon.metadata @@ -1 +1 @@ -60c9b5c06138122e67fd6594166a20d9f5b17566 SOURCES/conmon-2.1.0-bdb4f6e.tar.gz +f74cb68c2aecd275fd7862dfc2d042ce1dbd69dc SOURCES/conmon-2.1.2-2bc95ee.tar.gz diff --git a/.gitignore b/.gitignore index 48a5cdb..2273488 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/conmon-2.1.0-bdb4f6e.tar.gz +SOURCES/conmon-2.1.2-2bc95ee.tar.gz diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec index 5a483a0..3054cbe 100644 --- a/SPECS/conmon.spec +++ b/SPECS/conmon.spec @@ -6,13 +6,13 @@ # https://github.com/containers/conmon %global import_path github.com/containers/%{name} %global git0 https://%{import_path} -%global commit0 bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c +%global commit0 2bc95ee697e87d5f7b77063cf83fc32739addafe %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: conmon -Epoch: 2 -Version: 2.1.0 -Release: 1%{?dist} +Epoch: 3 +Version: 2.1.2 +Release: 2%{?dist} Summary: OCI container runtime monitor License: ASL 2.0 URL: %{git0} @@ -30,8 +30,8 @@ BuildRequires: gcc BuildRequires: git BuildRequires: glib2-devel BuildRequires: systemd-devel -BuildRequires: golang >= 1.12.12-4 -BuildRequires: go-md2man +BuildRequires: golang >= 1.17.7 +BuildRequires: /usr/bin/go-md2man BuildRequires: libseccomp-devel %description @@ -62,6 +62,39 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" %{_mandir}/man8/* %changelog +* Fri Aug 26 2022 Jindrich Novy - 3:2.1.2-2 +- revert conmon to 2.1.2 +- Related: #2061390 + +* Tue Jul 26 2022 Jindrich Novy - 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 - 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 - 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 - 2:2.1.1-2 +- fix CVE-2022-1708 - thanks to Peter Hunt +- Related: #2061390 + +* Tue May 24 2022 Jindrich Novy - 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 - 2:2.1.0-3 +- BuildRequires: /usr/bin/go-md2man +- Related: #2061390 + +* Fri Apr 08 2022 Jindrich Novy - 2:2.1.0-2 +- bump golang BR to 1.17.7 +- Related: #2061390 + * Tue Jan 25 2022 Jindrich Novy - 2:2.1.0-1 - update to https://github.com/containers/conmon/releases/tag/v2.1.0 - Related: #2001445