Compare commits

...

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

2
.gitignore vendored

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

@ -1 +1 @@
1de067252084b207985bba8851104a2327dbc5e0 SOURCES/v1.2.9.tar.gz
7a40b7d0aec6ad490473ec0827913dc00295f26a SOURCES/v1.2.10.tar.gz

@ -1,18 +1,20 @@
%global with_check 0
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 7;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%global with_debug 1
%if 0%{?with_debug}
%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 %{?**};
%else
%if ! 0%{?gobuild:1}
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**};
%endif
%global debug_package %{nil}
%endif
%global provider github
@ -20,22 +22,28 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
%global project containers
%global repo oci-seccomp-bpf-hook
# https://github.com/containers/oci-seccomp-bpf-hook
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path}
%global built_tag v1.2.10
%global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
ExclusiveArch: %{go_arches}
# use the same arch definitions as present in the bcc package
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
Name: oci-seccomp-bpf-hook
Version: 1.2.9
Release: 1%{?dist}
Name: %{repo}
Version: %{gen_version}
License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT
Release: %autorelease
ExclusiveArch: %{golang_arches_future}
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
# Tarball fetched from upstream
Source0: %{url}/archive/%{built_tag}.tar.gz
BuildRequires: golang
BuildRequires: /usr/bin/go-md2man
BuildRequires: go-md2man
BuildRequires: go-rpm-macros
BuildRequires: glib2-devel
BuildRequires: glibc-devel
BuildRequires: bcc-devel
@ -43,47 +51,79 @@ BuildRequires: git
BuildRequires: gpgme-devel
BuildRequires: libseccomp-devel
BuildRequires: make
Conflicts: crun < 0.17
Requires: bcc
Enhances: podman
Enhances: cri-o
# vendored libraries
# awk '{print "Provides: bundled(golang("$1")) = "$2}' go.mod | sort | uniq | sed -e 's/-/_/g' -e '/bundled(golang())/d' -e '/bundled(golang(go\|module\|replace\|require))/d'
Provides: bundled(golang(github.com/iovisor/gobpf)) = v0.2.0
Provides: bundled(golang(github.com/opencontainers/runtime_spec)) = v1.0.3_0.20200728170252_4d89ac9fbff6
Provides: bundled(golang(github.com/seccomp/containers_golang)) = v0.6.0
Provides: bundled(golang(github.com/seccomp/libseccomp_golang)) = v0.9.1
Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.8.1
Provides: bundled(golang(github.com/stretchr/testify)) = v1.4.0
%description
%{summary}
%{repo} provides a library for applications looking to use
%{name} provides a library for applications looking to use
the Container Pod concept popularized by Kubernetes.
%package tests
Summary: Tests for %{name}
Requires: %{name} = %{version}-%{release}
Requires: bats
Requires: podman
%description tests
%{summary}
This package contains system tests for %{name}
%prep
%autosetup -Sgit
sed -i '/$(MAKE) -C docs install/d' Makefile
sed -i 's/HOOK_BIN_DIR/\%{_usr}\/libexec\/oci\/hooks.d/' %{name}.json
%autosetup -Sgit -n %{name}-%{built_tag_strip}
sed -i 's;HOOK_BIN_DIR;%{_libexecdir}/oci/hooks.d;' %{name}.json
sed -i '/$(HOOK_DIR)\/%{name}.json/d' Makefile
%build
%set_build_flags
export CGO_CFLAGS=$CFLAGS
# These extra flags present in $CFLAGS have been skipped for now as they break the build
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g')
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g')
CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g')
%ifarch x86_64
export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
%endif
export GO111MODULE=off
export GOPATH=$(pwd):$(pwd)/_build
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
mkdir _build
pushd _build
cd _build
mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path}
popd
cd ..
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd)
export LDFLAGS="-X main.version=%{version}"
%gobuild -o bin/%{name} %{import_path}
pushd docs
cd docs
go-md2man -in %{name}.md -out %{name}.1
popd
cd ..
%install
%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install-nobuild
%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} GOMD2MAN=go-md2man -C docs install-nobuild
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav test/. %{buildroot}/%{_datadir}/%{name}/test/system
%check
%if 0%{?with_check}
%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
# Since we aren't packaging up the vendor directory we need to link
# back to it somehow. Hack it up so that we can add the vendor
# directory from BUILD dir as a gopath to be searched when executing
@ -110,77 +150,163 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/containers/oci/hooks.d/%{name}.json
%{_mandir}/man1/%{name}.1*
%files tests
%license LICENSE
%{_datadir}/%{name}/test
%changelog
* Wed Apr 19 2023 Jindrich Novy <jnovy@redhat.com> - 1.2.9-1
- update to https://github.com/containers/oci-seccomp-bpf-hook/releases/tag/v1.2.9
- Related: #2176063
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.10-7
- Bump release for October 2024 mass rebuild:
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.2.10-6
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.10-6
- Bump release for June 2024 mass rebuild
* Wed May 01 2024 Jindrich Novy <jnovy@redhat.com> - 1.2.10-5
- update gating.yaml to RHEL-10 Related: RHELMISC-3908
* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 1.2.10-4
- Rebuild for golang 1.22.0
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Oct 20 2023 Lokesh Mandvekar <lsm5@redhat.com> - 1.2.10-1
- bump to v1.2.10
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Apr 18 2023 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.9-1
- auto bump to v1.2.9
* 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
* Mon Mar 06 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.8-4
- migrated to SPDX license
* 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 Feb 08 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.8-3
- ExclusiveArch: golang_arches_future
* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1.2.5-2
- BuildRequires: /usr/bin/go-md2man
- Related: #2061316
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* 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
* Mon Oct 17 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.8-1
- auto bump to v1.2.8
* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-5
- perform only sanity/installability tests for now
- Related: #2000051
* Wed Oct 12 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.7-1
- auto bump to v1.2.7
* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-4
- add gating.yaml
- Related: #2000051
* Fri Oct 07 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.6-9
- Revert "auto bump to v1.2.6"
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Oct 07 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.6-8
- auto bump to v1.2.6
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.3-2
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.6-7
- add comment about Source0 tarball source
* Mon Jun 14 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.3-1
- convert crun dependency to a conflict
- Related: #1970747
* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.6-6
- adjust macros for getting correct version
* 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
* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.6-5
- remove debbuild macros to comply with fedora guidelines
* 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
* Tue Aug 16 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.6-4
- Fix debbuild maintainer issue
* Thu Jan 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.2.0-6
- revert back to 1.2.0 due to build issues
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* 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
* Tue Jul 19 2022 Maxwell G <gotmax@e.email> - 1.2.6-2
- Rebuild for
CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-5
- use go_arches macro
* Mon Jul 11 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.6-1
- auto bump to v1.2.6
* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.2.5-3
- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327,
CVE-2022-27191, CVE-2022-29526, CVE-2022-30629
* Fri May 27 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.5-2
- build deb packages using debbuild
* Fri Mar 25 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.5-1
- bump to v1.2.5
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 29 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.4-1
- oci-seccomp-bpf-hook-1.2.4-0.10.git7a25813
- Resolves: #1987746 - FTBFS issues
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sat Jun 19 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.0.1-1
- oci-seccomp-bpf-hook-1.0.1-0.8.gitb58c502
- bump to 1.0.1
- autobuilt b58c502
* Fri Jun 11 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.4-3
- oci-seccomp-bpf-hook-1.2.4-0.7.git4f66654
- autobuilt 4f66654
* Thu May 06 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.4-2
- oci-seccomp-bpf-hook-1.2.4-0.6.git4a30d95
- autobuilt 4a30d95
* Wed Apr 28 2021 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.4-1
- oci-seccomp-bpf-hook-1.2.4-0.5.git1910bb0
- bump to 1.2.4
- autobuilt 1910bb0
* Thu Feb 04 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.2-6
- oci-seccomp-bpf-hook-1.2.2-0.4.git50e7112
- requires bcc
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.2-5
- oci-seccomp-bpf-hook-1.2.2-0.3.git50e7112
- use latest master commit to check gating tests
* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.2-4
- temp patch to fix armv7hl build
* Thu Jan 28 2021 Ed Santiago <santiago@redhat.com> - 1.2.2-3
- add gating tests
* Wed Jan 27 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.2-2
- do not build for armv7hl
* Wed Jan 27 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.2-1
- oci-seccomp-bpf-hook-1.2.2-0.1.git4e42394
- built latest master commit
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 02 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-4
- oci-seccomp-bpf-hook-1.2.0-4.fc34
- use the same arch definitions as present in the bcc package
* Fri Oct 02 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
- oci-seccomp-bpf-hook-1.2.0-3.fc34
- exclude also armv7hl arch as bcc is not built there
* Wed Sep 30 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
- oci-seccomp-bpf-hook-1.2.0-2.fc34
- 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
- oci-seccomp-bpf-hook-1.2.0-1.fc34
- 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
@ -190,34 +316,39 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
- 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
- oci-seccomp-bpf-hook-1.1.1-1.fc33
- 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
- oci-seccomp-bpf-hook-1.1.0-2.fc33
- switch to mainline releases
* Tue May 19 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-1.1.git05a82a1
* Tue May 19 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-1
- oci-seccomp-bpf-hook-1.1.0-1.1.git05a82a1
- bump version
- reuse Makefile targets
* Mon Feb 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-0.6.gitba7bbb16
- Resolves: #1799105 - solve ftbfs and build latest upstream commit
* Tue Apr 14 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-7
- remove unused remote subpackage defs
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.1-0.5.git3baa603a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Apr 14 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-6
- enhances podman and cri-o
* Tue Nov 05 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.4.git3baa603a
- limit arches to only those supported by bcc so that this can be built
* Mon Feb 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.0.1-5
- correct %%gobuild definition
* Mon Nov 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.3.git3baa603a
- fix the license - should be ASL 2.0
- use %%gobuild
* Mon Feb 17 2020 Lokesh Mandvekar <lsm5@fedoraproject.org>
- oci-seccomp-bpf-hook-0.0.1-0.6.gitba7bbb16
- Resolves: #1799105 - solve ftbfs and build latest upstream commit
* Mon Nov 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.2.git3baa603a
- pull in golang deps as BR
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 23 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-0.1.git3baa603a
- fix spec file and build
* Tue Nov 05 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-2
- oci-seccomp-bpf-hook-0.0.1-0.4.git3baa603a.fc32
- limit arches to only those supported by bcc so that this can be built
* Sun Sep 22 2019 Dan Walsh <dwalsh@redhat.com> - 0.0.1
- Initial Version
* Tue Nov 05 2019 Jindrich Novy <jnovy@redhat.com> - 0.0.1-1
- Initial import (#1768400).
## END: Generated by rpmautospec

Loading…
Cancel
Save