diff --git a/.gitignore b/.gitignore index f779712..1b4f9b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.1.1.tar.gz +SOURCES/v1.1.2.tar.gz diff --git a/.oci-seccomp-bpf-hook.metadata b/.oci-seccomp-bpf-hook.metadata index 88e375f..c7ac24d 100644 --- a/.oci-seccomp-bpf-hook.metadata +++ b/.oci-seccomp-bpf-hook.metadata @@ -1 +1 @@ -f1a6515ef0620c1c9c4c43d7626cd9bec05a5faa SOURCES/v1.1.1.tar.gz +711d939ae40f9c375c2db3e64dc4aacd0032831e SOURCES/v1.1.2.tar.gz diff --git a/SPECS/oci-seccomp-bpf-hook.spec b/SPECS/oci-seccomp-bpf-hook.spec index 363f712..b240741 100644 --- a/SPECS/oci-seccomp-bpf-hook.spec +++ b/SPECS/oci-seccomp-bpf-hook.spec @@ -29,8 +29,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ExcludeArch: i686 Name: oci-seccomp-bpf-hook -Version: 1.1.1 -Release: 1%{?dist} +Version: 1.1.2 +Release: 3%{?dist} Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container License: ASL 2.0 URL: %{git0} @@ -61,6 +61,7 @@ sed -i '/$(HOOK_DIR)\/%{name}.json/d' Makefile %build export GO111MODULE=off export GOPATH=$(pwd):$(pwd)/_build +export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" mkdir _build pushd _build @@ -70,6 +71,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) +export LDFLAGS="-X main.version=%{version}" %gobuild -o bin/%{name} %{import_path} pushd docs @@ -77,16 +79,8 @@ go-md2man -in %{name}.md -out %{name}.1 popd %install -# install binary -%{__make} PREFIX=%{buildroot}%{_usr} ETCDIR=%{buildroot}%{_sysconfdir} OCI-SECCOMP-BPF_VERSION=%{version} install - -# install %%{name}.json to /usr/share/containers/oci/hooks.d -install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d -install -m 0644 %{name}.json %{buildroot}%{_datadir}/containers/oci/hooks.d - -# install manpage -install -dp %{buildroot}%{_mandir}/man1 -install -m 0644 docs/%{name}.1 %{buildroot}/%{_mandir}/man1 +%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install-nobuild +%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} GOMD2MAN=go-md2man -C docs install-nobuild %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} @@ -117,6 +111,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/%{name}.1* %changelog +* Tue Aug 11 2020 Jindrich Novy - 1.1.2-3 +- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization +- Related: #1821193 + +* Thu Jul 23 2020 Lokesh Mandvekar - 1.1.2-2 +- Resolves: #1857606 + +* Fri Jul 17 2020 Jindrich Novy - 1.1.2-1 +- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.1.2 +- Related: #1821193 + * Thu Jun 18 2020 Jindrich Novy - 1.1.1-1 - update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.1.1 - Related: #1821193