diff --git a/SOURCES/bcc-fix.patch b/SOURCES/bcc-fix.patch deleted file mode 100644 index c1cb08a..0000000 --- a/SOURCES/bcc-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up oci-seccomp-bpf-hook-1.2.3/vendor/github.com/iovisor/gobpf/bcc/module.go.orig oci-seccomp-bpf-hook-1.2.3/vendor/github.com/iovisor/gobpf/bcc/module.go ---- oci-seccomp-bpf-hook-1.2.3/vendor/github.com/iovisor/gobpf/bcc/module.go.orig 2021-04-27 09:25:52.000000000 +0200 -+++ oci-seccomp-bpf-hook-1.2.3/vendor/github.com/iovisor/gobpf/bcc/module.go 2021-07-02 12:45:44.272765520 +0200 -@@ -258,7 +258,7 @@ func (bpf *Module) attachProbe(evName st - func (bpf *Module) attachUProbe(evName string, attachType uint32, path string, addr uint64, fd, pid int) error { - evNameCS := C.CString(evName) - binaryPathCS := C.CString(path) -- res, err := C.bpf_attach_uprobe(C.int(fd), attachType, evNameCS, binaryPathCS, (C.uint64_t)(addr), (C.pid_t)(pid), 0) -+ res, err := C.bpf_attach_uprobe(C.int(fd), attachType, evNameCS, binaryPathCS, (C.uint64_t)(addr), (C.pid_t)(pid)) - C.free(unsafe.Pointer(evNameCS)) - C.free(unsafe.Pointer(binaryPathCS)) - diff --git a/SPECS/oci-seccomp-bpf-hook.spec b/SPECS/oci-seccomp-bpf-hook.spec index d1c0152..3e624dd 100644 --- a/SPECS/oci-seccomp-bpf-hook.spec +++ b/SPECS/oci-seccomp-bpf-hook.spec @@ -26,12 +26,11 @@ ExclusiveArch: %{go_arches} Name: oci-seccomp-bpf-hook Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCI Hook to generate seccomp json files based on EBF syscalls used by container License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/v%{version}.tar.gz -Patch0: bcc-fix.patch BuildRequires: golang BuildRequires: go-md2man BuildRequires: glib2-devel @@ -109,13 +108,18 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_mandir}/man1/%{name}.1* %changelog -* Fri Jul 02 2021 Jindrich Novy - 1.2.3-2 -- fix build on 8.4.0 with older bcc in buildroot -- Related: #1954702 - -* Thu Jul 01 2021 Jindrich Novy - 1.2.3-1 +* Wed May 26 2021 Jindrich Novy - 1.2.3-3 - change runc dependency to conflict -- Related: #1954702 +- Related: #1934415 + +* Wed May 19 2021 Jindrich Novy - 1.2.3-2 +- remove unneeded patch +- Related: #1934415 + +* Wed May 19 2021 Jindrich Novy - 1.2.3-1 +- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.3 +- fix build +- Related: #1934415 * Mon Feb 22 2021 Jindrich Novy - 1.2.0-2 - revert back to 1.2.0 - build issues