Compare commits

...

No commits in common. "c8s-stream-4.0" and "c8-stream-3.0" have entirely different histories.

4 changed files with 23 additions and 19 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
d73e189532884c786d0074ad92a30cf11c209395 SOURCES/v1.2.5.tar.gz
87e5a6bd76c56b81e779438c531f31f14a6c9b7e SOURCES/v1.2.0.tar.gz

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

@ -0,0 +1,12 @@
diff -up oci-seccomp-bpf-hook-1.2.0/vendor/github.com/iovisor/gobpf/bcc/module.go.orig oci-seccomp-bpf-hook-1.2.0/vendor/github.com/iovisor/gobpf/bcc/module.go
--- oci-seccomp-bpf-hook-1.2.0/vendor/github.com/iovisor/gobpf/bcc/module.go.orig 2021-05-21 14:15:44.936127448 +0200
+++ oci-seccomp-bpf-hook-1.2.0/vendor/github.com/iovisor/gobpf/bcc/module.go 2021-05-21 14:16:03.459454988 +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))
+ res, err := C.bpf_attach_uprobe(C.int(fd), attachType, evNameCS, binaryPathCS, (C.uint64_t)(addr), (C.pid_t)(pid), 0)
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.5
Release: 1%{?dist}
Version: 1.2.0
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: build-fix.patch
BuildRequires: golang
BuildRequires: go-md2man
BuildRequires: glib2-devel
@ -40,7 +41,7 @@ BuildRequires: git
BuildRequires: gpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: make
Conflicts: crun < 0.17
Requires: crun >= 0.17
Enhances: podman
Enhances: cri-o
@ -108,24 +109,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_mandir}/man1/%{name}.1*
%changelog
* Wed Mar 16 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.5-1
- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.5
- Related: #2061390
* Wed May 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-3
- change runc dependency to conflict
* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
- actually apply the build fix patch
- Related: #1934415
* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-2
- remove unneeded patch
* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
- resolve build issue
- Related: #1934415
* Wed May 19 2021 Jindrich Novy <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 1.2.0-2
* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
- revert back to 1.2.0 - build issues
- Related: #1883490