import oci-seccomp-bpf-hook-1.2.3-2.module+el8.4.0+11822+6cc1e7d7

This commit is contained in:
CentOS Sources 2021-08-10 08:07:03 -04:00 committed by Andrew Lukoshko
parent ee2218e2c0
commit 3e1f3a5ae4
4 changed files with 25 additions and 4 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.2.0.tar.gz
SOURCES/v1.2.3.tar.gz

View File

@ -1 +1 @@
87e5a6bd76c56b81e779438c531f31f14a6c9b7e SOURCES/v1.2.0.tar.gz
5aa9db48e03292962a20250721a790540f96da71 SOURCES/v1.2.3.tar.gz

12
SOURCES/bcc-fix.patch Normal file
View File

@ -0,0 +1,12 @@
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))

View File

@ -25,12 +25,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
ExclusiveArch: %{go_arches}
Name: oci-seccomp-bpf-hook
Version: 1.2.0
Version: 1.2.3
Release: 2%{?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
@ -40,7 +41,7 @@ BuildRequires: git
BuildRequires: gpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: make
Requires: crun >= 0.17
Conflicts: crun < 0.17
Enhances: podman
Enhances: cri-o
@ -108,6 +109,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_mandir}/man1/%{name}.1*
%changelog
* Fri Jul 02 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-2
- fix build on 8.4.0 with older bcc in buildroot
- Related: #1954702
* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-1
- change runc dependency to conflict
- Related: #1954702
* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
- revert back to 1.2.0 - build issues
- Related: #1883490