diff --git a/.conmon.metadata b/.conmon.metadata index 6a6c6cc..10f3003 100644 --- a/.conmon.metadata +++ b/.conmon.metadata @@ -1 +1 @@ -6077c3ee1cfebf187ae3c67aec5bccbc1ef14127 SOURCES/v2.0.18.tar.gz +ed12565698e4906511465d51df9914ea601e2c27 SOURCES/v2.0.26.tar.gz diff --git a/.gitignore b/.gitignore index e9a8dec..54dac9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.0.18.tar.gz +SOURCES/v2.0.26.tar.gz diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec index 2fcdac2..f92f3fb 100644 --- a/SPECS/conmon.spec +++ b/SPECS/conmon.spec @@ -1,33 +1,31 @@ -%global with_debug 0 %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 -%global provider github -%global provider_tld com -%global project containers -%global repo conmon # https://github.com/containers/conmon -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path github.com/containers/%{name} %global git0 https://%{import_path} -Name: %{repo} +Name: conmon Epoch: 2 -Version: 2.0.18 +Version: 2.0.26 Release: 1%{?dist} Summary: OCI container runtime monitor License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/v%{version}.tar.gz +# 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: glib2-devel BuildRequires: systemd-devel +BuildRequires: golang >= 1.12.12-4 +BuildRequires: go-md2man %description %{summary}. @@ -36,6 +34,8 @@ BuildRequires: systemd-devel %autosetup -Sgit %build +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 @@ -48,8 +48,59 @@ BuildRequires: systemd-devel %license LICENSE %doc README.md %{_bindir}/%{name} +%{_mandir}/man8/* %changelog +* Thu Feb 04 2021 Jindrich Novy - 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 - 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 - 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 - 2:2.0.22-3 +- exclude i686 as golang is not suppoerted there +- Related: #1883490 + +* Sat Dec 26 2020 Jindrich Novy - 2:2.0.22-2 +- add BR: golang, go-md2man +- add man pages +- Related: #1883490 + +* Mon Dec 21 2020 Jindrich Novy - 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 - 2:2.0.21-3 +- simplify spec +- Related: #1883490 + +* Mon Nov 09 2020 Jindrich Novy - 2:2.0.21-2 +- be sure to harden the linked binary +- compile with debuginfo enabled +- Related: #1883490 + +* Wed Oct 21 2020 Jindrich Novy - 2:2.0.21-1 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 + +* Tue Aug 11 2020 Jindrich Novy - 2:2.0.20-2 +- use proper CFLAGS +- Related: #1821193 + +* Wed Jul 29 2020 Jindrich Novy - 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 - 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 - 2:2.0.18-1 - update to https://github.com/containers/conmon/releases/tag/v2.0.18 - Related: #1821193