pool/runc
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to Docker 20.10.3-ce. See upstream changelog in the packaged

Browse Source 
/usr/share/doc/packages/docker/CHANGELOG.md. CVE-2021-21285 CVE-2021-21284
- Drop docker-runc, docker-test and docker-libnetwork packages. We now just use
  the upstream runc package (it's stable enough and Docker no longer pins git
  versions). docker-libnetwork is so unstable that it doesn't have any
  versioning scheme and so it really doesn't make sense to maintain the project
  as a separate package. bsc#1181641 bsc#1181677

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=100
This commit is contained in:
Aleksa Sarai 2021-02-02 22:19:53 +00:00 committed by Git OBS Bridge
parent 4aca013630
commit c589d24124
2 changed files with 33 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 2 05:53:17 UTC 2021 - Aleksa Sarai <asarai@suse.com>
- Update to handle the docker-runc removal. bsc#1181677
- Modernise go building for runc now that it has go.mod.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 28 07:38:29 UTC 2020 - Ralf Haferkamp <rhafer@suse.com> Fri Aug 28 07:38:29 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>

118
runc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package runc # spec file for package runc
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,29 +17,14 @@
# nodebuginfo # nodebuginfo
# We don't include a git_version in the "upstream" runc package, because we # MANUAL: Make sure you update this each time you update runc.
# only package released versions (unlike docker-runc). %define git_version ff819c7e9184c13b7c2607fe6c30ae19403a7aff
%define git_version %{nil}
# Package-wide golang version # Package-wide golang version
%define go_version 1.13 %define go_version 1.13
%define go_tool go
%define _version 1.0.0-rc92 %define _version 1.0.0-rc92
%define project github.com/opencontainers/runc %define project github.com/opencontainers/runc
# enable libseccomp for sle >= sle12sp2
%if 0%{?sle_version} >= 120200
%define with_libseccomp 1
%endif
# enable libseccomp for leap >= 42.2
%if 0%{?leap_version} >= 420200
%define with_libseccomp 1
%endif
# enable libseccomp for Factory
%if 0%{?suse_version} > 1320
%define with_libseccomp 1
%endif
Name: runc Name: runc
Version: 1.0.0~rc92 Version: 1.0.0~rc92
Release: 0 Release: 0
@ -56,11 +41,25 @@ BuildRequires: go-go-md2man
# Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires
# for 'golang(API) >= 1.x' here, so just require 1.x exactly. bsc#1172608 # for 'golang(API) >= 1.x' here, so just require 1.x exactly. bsc#1172608
BuildRequires: go%{go_version} BuildRequires: go%{go_version}
%if 0%{?with_libseccomp}
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
%endif
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
Recommends: criu Recommends: criu
# There used to be a docker-runc package which was specifically for Docker.
# Since Docker now tracks upstream more consistently, we use the same package
# but we need to obsolete the old one. bsc#1181677
# NOTE: We can't use the package version here because docker-runc used a
# different versioning scheme by accident (1.0.0rc92 vs 1.0.0~rc92 -- and
# GNU sort considers the former to be newer than the latter, in fact
# 1.0.0rc92 is newer than 1.0.0 according to GNU sort). So we invent a
# fake 1.0.0.1 version.
Obsoletes: docker-runc < 1.0.0.1
Provides: docker-runc = 1.0.0.1.%{version}
# KUBIC-SPECIFIC: There used to be a kubic-specific docker-runc package, but
# now it's been merged into the one package. bsc#1181677
Obsoletes: docker-runc-kubic < 1.0.0.1
Provides: docker-runc-kubic = 1.0.0.1.%{version}
Obsoletes: docker-runc = 0.1.1+gitr2819_50a19c6
Obsoletes: docker-runc_50a19c6
%description %description
runc is a CLI tool for spawning and running containers according to the OCI runc is a CLI tool for spawning and running containers according to the OCI
@ -68,85 +67,28 @@ specification. It is designed to be as minimal as possible, and is the workhorse
of Docker. It was originally designed to be a replacement for LXC within Docker, of Docker. It was originally designed to be a replacement for LXC within Docker,
and has grown to become a separate project entirely. and has grown to become a separate project entirely.
%package test
Summary: Test package for runc
Group: System/Management
BuildRequires: go%{go_version}
%if 0%{?with_libseccomp}
BuildRequires: libseccomp-devel
%endif
Requires: go-go-md2man
Requires: libapparmor-devel
Requires: libselinux-devel
Recommends: criu
BuildArch: noarch
%description test
Test package for runc. It contains the source code and the tests.
%prep %prep
%setup -q -n %{name}-%{_version} %setup -q -n %{name}-%{_version}
%build %build
# Do not use symlinks. If you want to run the unit tests for this package at # build runc
# some point during the build and you need to directly use go list directly it make BUILDTAGS="apparmor selinux seccomp" COMMIT_NO="%{git_version}" runc
# will get confused by symlinks. # build man pages
export GOPATH=${HOME}/go
mkdir -p $HOME/go/src/%project
rm -rf $HOME/go/src/%project/*
cp -a * $HOME/go/src/%project
# Additionally enable seccomp.
%if 0%{?with_libseccomp}
export EXTRA_BUILDTAGS+="seccomp"
export EXTRA_GCCFLAGS+="-lseccomp"
%endif
# Build all features.
export BUILDTAGS="apparmor selinux $EXTRA_BUILDTAGS"
export BUILDFLAGS="-buildmode=pie -gccgoflags='-Wl,--add-needed -Wl,--no-as-needed -static-libgo -ldl -lselinux -lapparmor $EXTRA_GCCFLAGS'"
(cat <<EOF
export GOPATH="$GOPATH"
export BUILDTAGS="$BUILDTAGS"
export BUILDFLAGS="$BUILDFLAGS"
EOF
) >./.runc_build_env
source ./.runc_build_env
# Build 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.
man/md2man-all.sh man/md2man-all.sh
%check
# We used to run 'go test' here, however we found that this actually didn't
# catch any issues that were caught by smoke testing, and %check would
# continually cause package builds to fail due to flaky tests. If you ever need
# to know how the testing was done, you can always look in the package history.
# boo#1095817
%install %install
source ./.runc_build_env # We install to /usr/sbin/runc as per upstream and create a symlink in /usr/bin
# We install to /usr/sbin/runc as per upstream an create a symlink in /usr/bin
# for rootless tools. # for rootless tools.
install -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name} install -D -m0755 %{name} %{buildroot}%{_sbindir}/%{name}
install -m 755 -d %{buildroot}%{_bindir} install -m0755 -d %{buildroot}%{_bindir}
ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/%{name} ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/%{name}
install -d -m755 %{buildroot}/usr/src/%{name}/
cp -av $HOME/go/src/%{project}/* %{buildroot}/usr/src/%{name}/
# Man pages. # Man pages.
install -d -m755 %{buildroot}%{_mandir}/man8 install -d -m0755 %{buildroot}%{_mandir}/man8
install -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8 install -m0644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
%fdupes %{buildroot} %fdupes %{buildroot}
%post
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README.md %doc README.md
@ -155,10 +97,4 @@ install -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man8/runc*.8.gz %{_mandir}/man8/runc*.8.gz
%files test
%defattr(-,root,root)
/usr/src/runc/
%exclude /usr/src/runc/runc
%exclude /usr/src/runc/runc/Godeps/_workspace/pkg
%changelog %changelog