SHA256
1
0
forked from pool/runc

Accepting request 733530 from home:cyphar:containers:maint

Fix CVE patch.

OBS-URL: https://build.opensuse.org/request/show/733530
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=77
This commit is contained in:
2019-09-27 03:17:22 +00:00
committed by Git OBS Bridge
parent 1a94d9d340
commit c0cf07af42
2 changed files with 129 additions and 36 deletions

View File

@@ -51,7 +51,9 @@ Source0: https://github.com/opencontainers/runc/releases/download/v%{_ver
Source1: https://github.com/opencontainers/runc/releases/download/v%{_version}/runc.tar.xz.asc#/runc-%{_version}.tar.xz.asc
Source2: runc.keyring
Source3: runc-rpmlintrc
# FIX-UPSTREAM: Backport of https://github.com/opencontainers/runc/pull/2129. CVE-2019-16884
# FIX-UPSTREAM: Backport of https://github.com/opencontainers/runc/pull/2129.
# https://github.com/opencontainers/selinux/pull/59.
# https://github.com/opencontainers/runc/pull/2130. CVE-2019-16884
Patch1: CVE-2019-16884.patch
BuildRequires: fdupes
BuildRequires: go-go-md2man
@@ -95,9 +97,9 @@ Test package for runc. It contains the source code and the tests.
# some point during the build and you need to directly use go list directly it
# will get confused by symlinks.
export GOPATH=${HOME}/go
mkdir -pv $HOME/go/src/%project
mkdir -p $HOME/go/src/%project
rm -rf $HOME/go/src/%project/*
cp -av * $HOME/go/src/%project
cp -a * $HOME/go/src/%project
# Additionally enable seccomp.
%if 0%{?with_libseccomp}
@@ -118,7 +120,7 @@ EOF
source ./.runc_build_env
# Build runc.
make -C "$HOME/go/src/%project" EXTRA_FLAGS="-x $BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO="%{git_version}" runc
make -C "$HOME/go/src/%project" EXTRA_FLAGS="$BUILDFLAGS" BUILDTAGS="$BUILDTAGS" COMMIT_NO="%{git_version}" runc
mv "$HOME/go/src/%project/runc" %{name}-%{version}
# Build man pages, this can only be done on arches where we can build go-md2man.