From 549895ef91b086dca9326e23e5bea3f12495fb09 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 29 Jul 2021 13:56:27 -0400
Subject: [PATCH] oci-seccomp-bpf-hook-1.2.4-0.10.git7a25813

- Resolves: #1987746 - FTBFS issues

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 oci-seccomp-bpf-hook.spec | 15 ++++++++-------
 sources                   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/oci-seccomp-bpf-hook.spec b/oci-seccomp-bpf-hook.spec
index 213425d..a5d8270 100644
--- a/oci-seccomp-bpf-hook.spec
+++ b/oci-seccomp-bpf-hook.spec
@@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 # To build a random user's fork/commit, comment out above line,
 # uncomment below line and replace the placeholders and commit0 below with the right info
 #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO
-%global commit0 b58c502e92b1be74058067cf3ffda996e008e43f
+%global commit0 7a25813f29239fa2bda381cc1c31479a8f67eb18
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 # Used for comparing with latest upstream tag
@@ -41,14 +41,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 ExclusiveArch:  x86_64 %%{power64} aarch64 s390x armv7hl
 
 Name: oci-seccomp-bpf-hook
-Version: 1.0.1
-Release: 0.9.git%{shortcommit0}%{?dist}
+Version: 1.2.4
+Release: 0.10.git%{shortcommit0}%{?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/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 BuildRequires: golang
 BuildRequires: go-md2man
+BuildRequires: go-rpm-macros
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: bcc-devel
@@ -91,10 +92,7 @@ export GO111MODULE=off
 export GOPATH=$(pwd):$(pwd)/_build
 export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 %ifarch x86_64
-export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic"
-%if 0%{?fedora} || 0%{?centos} >= 8
-export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection"
-%endif
+export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection"
 %endif
 # These extra flags present in %%{optflags} have been skipped for now as they break the build
 #export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1"
@@ -154,6 +152,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Jul 29 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.4-0.10.git7a25813
+- Resolves: #1987746 - FTBFS issues
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-0.9.gitb58c502
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 6774980..64d9b7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oci-seccomp-bpf-hook-b58c502.tar.gz) = 1fd12763bd3047d0a46018152e7188eb1153c4460beabf68932199a075b9477e55f02a6217880705d27940348353929b298523bf8fa73068556ec22a83c4961c
+SHA512 (oci-seccomp-bpf-hook-7a25813.tar.gz) = 8c62e8c5e11de40ff9db7b64e5dff32901b5ad2106d5d6aee92eb066d9bd50c9a7bfea759e36c1a2ff47c634b694605cfbffc1a7477be1d71a33c7715e24db60