Accepting request 508797 from home:thipp:branches:Virtualization:containers
- switch to opencontainers/runc master branch - remove CVE-2016-9962.patch - stop providing docker-runc OBS-URL: https://build.opensuse.org/request/show/508797 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=51
This commit is contained in:
committed by
Git OBS Bridge
parent
105b3cf4bc
commit
c311eecf47
24
runc.spec
24
runc.spec
@@ -17,29 +17,16 @@
|
||||
|
||||
|
||||
%define go_tool go
|
||||
|
||||
# MANUAL: Update the git_version and git_revision
|
||||
# FIX-OPENSUSE: This will be removed as soon as we move Docker's runC fork into
|
||||
# a separate package. This whole versioning mess is caused by
|
||||
# Docker vendoring non-releases of runC.
|
||||
%define git_version 9c2d8d1
|
||||
# How to get the git_revision
|
||||
# git clone ${url}.git runc-upstream
|
||||
# cd runc-upstream
|
||||
# git checkout $git_version
|
||||
# git_revision=r$(git rev-list HEAD | wc -l)
|
||||
%define git_revision r2947
|
||||
%define version_unconverted %{git_version}
|
||||
%define _version 1.0.0rc3+r133
|
||||
|
||||
Name: runc
|
||||
Version: 0.1.1+git%{git_revision}_%{git_version}
|
||||
Version: 1.0.0~rc3+r133
|
||||
Release: 0
|
||||
Summary: Tool for spawning and running OCI containers
|
||||
License: Apache-2.0
|
||||
Group: System/Management
|
||||
Url: https://github.com/opencontainers/runc
|
||||
Source: %{name}-git.%{git_version}.tar.xz
|
||||
Patch0: CVE-2016-9962.patch
|
||||
Source: %{name}-v%{_version}.tar.xz
|
||||
BuildRequires: fdupes
|
||||
# Make sure we require go 1.7
|
||||
BuildRequires: go-go-md2man
|
||||
@@ -78,8 +65,7 @@ BuildArch: noarch
|
||||
Test package for runc. It contains the source code and the tests.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-git.%{git_version}
|
||||
%patch0 -p1
|
||||
%setup -q -n %{name}-v%{_version}
|
||||
|
||||
%build
|
||||
# Do not use symlinks. If you want to run the unit tests for this package at
|
||||
@@ -125,7 +111,6 @@ cp -avr $HOME/go/src/github.com/opencontainers/runc/* %{buildroot}/usr/src/runc/
|
||||
|
||||
# symlink runc as docker-runc. bsc#1015661
|
||||
install -d -m755 %{buildroot}/%{_bindir}
|
||||
ln -s /usr/sbin/runc %{buildroot}/%{_bindir}/docker-runc
|
||||
|
||||
install -d -m755 %{buildroot}%{_mandir}/man8
|
||||
install -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
|
||||
@@ -138,7 +123,6 @@ install -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
|
||||
%defattr(-,root,root)
|
||||
%doc README.md LICENSE
|
||||
%{_sbindir}/%{name}
|
||||
%{_bindir}/docker-runc
|
||||
|
||||
%{_mandir}/man8/runc*.8.gz
|
||||
|
||||
|
Reference in New Issue
Block a user