diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec index 2f9761b..93854db 100644 --- a/SPECS/conmon.spec +++ b/SPECS/conmon.spec @@ -1,25 +1,16 @@ -%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.21 -Release: 1%{?dist} +Release: 3%{?dist} Summary: OCI container runtime monitor License: ASL 2.0 URL: %{git0} @@ -37,6 +28,7 @@ BuildRequires: systemd-devel %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 @@ -51,6 +43,15 @@ export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFF %{_bindir}/%{name} %changelog +* Tue Dec 08 2020 Jindrich Novy - 2:2.0.21-3 +- simplify spec +- Related: #1888571 + +* Mon Nov 09 2020 Jindrich Novy - 2:2.0.21-2 +- be sure to harden the linked binary +- compile with debuginfo enabled +- Related: #1888571 + * Thu Oct 22 2020 Jindrich Novy - 2:2.0.21-1 - synchronize with stream-container-tools-rhel8-rhel-8.4.0 - Related: #1888571