From 89394eff0cad7aea8f3e6d962a0eb227a57b5f66 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 14 2021 08:22:00 +0000 Subject: import oci-seccomp-bpf-hook-1.2.0-2.module+el8.4.0+9425+98db097b --- diff --git a/SPECS/oci-seccomp-bpf-hook.spec b/SPECS/oci-seccomp-bpf-hook.spec index 63fbd11..08dcf39 100644 --- a/SPECS/oci-seccomp-bpf-hook.spec +++ b/SPECS/oci-seccomp-bpf-hook.spec @@ -1,19 +1,15 @@ -%global with_devel 0 -%global with_bundled 1 -%global with_debug 1 %global with_check 0 -%global with_unit_test 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} > 7 && ! 0%{?fedora} %define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; +go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; +%else +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; +%endif %endif %global provider github @@ -30,7 +26,7 @@ ExcludeArch: i686 Name: oci-seccomp-bpf-hook Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container License: ASL 2.0 URL: %{git0} @@ -83,7 +79,7 @@ popd %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} GOMD2MAN=go-md2man -C docs install-nobuild %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if 0%{?with_check} # Since we aren't packaging up the vendor directory we need to link # back to it somehow. Hack it up so that we can add the vendor # directory from BUILD dir as a gopath to be searched when executing @@ -111,9 +107,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/%{name}.1* %changelog -* Fri Oct 23 2020 Jindrich Novy - 1.2.0-1 -- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.0 -- Related: #1888571 +* Tue Dec 08 2020 Jindrich Novy - 1.2.0-2 +- sync with RHEL8 devel branch +- Related: #1883490 + +* Wed Oct 21 2020 Jindrich Novy - 1.2.0-1 +- synchronize with stream-container-tools-rhel8 +- Related: #1883490 * Tue Aug 11 2020 Jindrich Novy - 1.1.2-3 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization