.gitignore

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

.oci-seccomp-bpf-hook.metadata

@@ -1 +1 @@
-87e5a6bd76c56b81e779438c531f31f14a6c9b7e SOURCES/v1.2.0.tar.gz
+1de067252084b207985bba8851104a2327dbc5e0 SOURCES/v1.2.9.tar.gz

SOURCES/build-fix.patch

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

SPECS/oci-seccomp-bpf-hook.spec

@@ -3,6 +3,9 @@
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
+%global _lto_cflags %%{nil}
+
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
 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 %{?**};
@@ -25,15 +28,14 @@ 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.9
-Release: 3%{?dist}
+Release: 1%{?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: /usr/bin/go-md2man
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: bcc-devel
@@ -41,7 +43,7 @@ BuildRequires: git
 BuildRequires: gpgme-devel
 BuildRequires: libseccomp-devel
 BuildRequires: make
-Requires: crun >= 0.17
+Conflicts: crun < 0.17
 Enhances: podman
 Enhances: cri-o
 
@@ -109,63 +111,113 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.2.0-3
+* Wed Apr 19 2023 Jindrich Novy <jnovy@redhat.com> - 1.2.9-1
-- Rebuilt for MSVSphere 8.8
+- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.9
+- Related: #2176063
+
+* Tue Oct 18 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.8-1
+- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.8
+- Related: #2124478
+
+* Tue Jul 12 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.6-1
+- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.6
+- Related: #2061316
+
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.5-2
+- BuildRequires: /usr/bin/go-md2man
+- Related: #2061316
+
+* 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: #2061316
+
+* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-5
+- perform only sanity/installability tests for now
+- Related: #2000051
 
-* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-4
-- actually apply the build fix patch
+- add gating.yaml
-- Related: #1934415
+- Related: #2000051
 
-* Fri May 21 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-3
-- resolve build issue
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Related: #1934415
+  Related: rhbz#1991688
 
-* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-2
-- revert back to 1.2.0 - build issues
+- Rebuilt for RHEL 9 BETA for openssl 3.0
-- Related: #1883490
+  Related: rhbz#1971065
+
+* Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-1
+- convert crun dependency to a conflict
+- Related: #1970747
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.1-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.1-1
 - update to
   https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.1
 - require crun >= 0.17
-- Related: #1883490
 
-* Thu Jan 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+* Thu Jan 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-6
 - revert back to 1.2.0 due to build issues
-- Related: #1883490
 
 * Thu Jan 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.1-1
-- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.1
+- update to
-- Related: #1883490
+  https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.1
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-5
+- use go_arches macro
+
+* Fri Oct 02 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-4
+- use the same arch definitions as present in the bcc package
+
+* Fri Oct 02 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
+- exclude also armv7hl arch as bcc is not built there
+
+* Wed Sep 30 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
+- fix spec file to accommodate the new upstream release
+
+* Wed Sep 30 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+- update to
+  https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.0
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.1-1
+- update to
+  https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.1.1
+
+* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.0-2
+- switch to mainline releases
 
-* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
+* Tue May 19 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-1.1.git05a82a1
-- sync with RHEL8 devel branch
+- bump version
-- Related: #1883490
+- reuse Makefile targets
 
-* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+* Mon Feb 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-0.6.gitba7bbb16
-- synchronize with stream-container-tools-rhel8
+- Resolves: #1799105 - solve ftbfs and build latest upstream commit
-- Related: #1883490
 
-* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-3
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.1-0.5.git3baa603a
-- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-- Related: #1821193
 
-* Thu Jul 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.2-2
+* Tue Nov 05 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.4.git3baa603a
-- Resolves: #1857606
+- limit arches to only those supported by bcc so that this can be built
 
-* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-1
+* Mon Nov 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.3.git3baa603a
-- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.1.2
+- fix the license - should be ASL 2.0
-- Related: #1821193
+- use %%gobuild
 
-* Thu Jun 18 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.1-1
+* Mon Nov 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.2.git3baa603a
-- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.1.1
+- pull in golang deps as BR
-- Related: #1821193
 
-* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.0-2
+* Mon Sep 23 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.1.git3baa603a
-- exclude i686 arch as bcc, the build dependency is not built
+- fix spec file and build
-  for it
-- Related: #1821193
 
-* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.0-1
+* Sun Sep 22 2019 Dan Walsh <dwalsh@redhat.com> - 0.0.1
-- initial build for container-tools-rhel8
+- Initial Version
-- Related: #1821193