Hello community,
here is the log from the commit of package docker-runc for openSUSE:Factory
checked in at 2018-09-05 13:45:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-runc (Old)
and /work/SRC/openSUSE:Factory/.docker-runc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-runc"
Wed Sep 5 13:45:49 2018 rev:11 rq:630775 version:1.0.0rc5+gitr3562_69663f0bd4b6
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-runc/docker-runc.changes 2018-06-22
13:16:16.233063592 +0200
+++ /work/SRC/openSUSE:Factory/.docker-runc.new/docker-runc.changes
2018-09-05 13:45:54.477991690 +0200
@@ -1,0 +2,25 @@
+Thu Aug 16 02:00:31 UTC 2018 - asa...@suse.com
+
+- Merge -kubic packages back into the main Virtualization:containers packages.
+ This is done using _multibuild to add a "kubic" flavour, which is then used
+ to conditionally compile patches and other kubic-specific features.
+ bsc#1105000
+
+-------------------------------------------------------------------
+Wed Aug 1 09:40:59 UTC 2018 - asa...@suse.com
+
+- Enable seccomp support on SLE12, since libseccomp is now a new enough vintage
+ to work with Docker and containerd. fate#325877
+
+-------------------------------------------------------------------
+Wed Jul 25 08:46:05 UTC 2018 - asa...@suse.com
+
+- Upgrade to docker-runc 69663f0bd4b60df09991c08812a60108003fa340 which is
+ required for the Docker v18.06.0-ce upgrade. bsc#1102522
+- Switch to Go 1.10 for building.
+- Removed the following patches because they were merged upstream in the
+ meantime:
+ - bsc1094680-0001-Avoid-race-when-opening-exec-fifo.patch
+ - bsc1053532-0001-makefile-drop-usage-of-install.patch
+
+-------------------------------------------------------------------
@@ -18,0 +44,15 @@
+
+-------------------------------------------------------------------
+Wed May 16 09:32:26 UTC 2018 - jmassaguer...@suse.com
+
+- Fix Obsoletes to fix bsc#1080978
+
+-------------------------------------------------------------------
+Mon Feb 12 10:52:27 UTC 2018 - rbr...@suse.com
+
+- Add ${version} to equivalent non-kubic package provides
+
+-------------------------------------------------------------------
+Thu Feb 8 12:35:05 UTC 2018 - rbr...@suse.com
+
+- Add Provides for equivalent non-kubic packages
Old:
----
bsc1053532-0001-makefile-drop-usage-of-install.patch
bsc1094680-0001-Avoid-race-when-opening-exec-fifo.patch
docker-runc-git.3f2f8b84a77f73d38244dd690525642a72156c64.tar.xz
New:
----
_multibuild
docker-runc-git.69663f0bd4b60df09991c08812a60108003fa340.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-runc.spec ++++++
--- /var/tmp/diff_new_pack.R98SuH/_old 2018-09-05 13:45:54.989992454 +0200
+++ /var/tmp/diff_new_pack.R98SuH/_new 2018-09-05 13:45:55.001992472 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package docker-runc
+# spec file for package docker
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
@@ -17,59 +17,62 @@
# nodebuginfo
+# Handle _multibuild magic.
+%define flavour @BUILD_FLAVOR@%{nil}
+
+# We split the Name: into "realname" and "name_suffix".
+%define realname docker-runc
+%if "%flavour" == ""
+%define name_suffix %{nil}
+%else
+%define name_suffix -%{flavour}
+%endif
+
# MANUAL: Update the git_version, git_short, and git_revision
-%define git_version 3f2f8b84a77f73d38244dd690525642a72156c64
-%define git_short 3f2f8b84a77f
+%define git_version 69663f0bd4b60df09991c08812a60108003fa340
+%define git_short 69663f0bd4b6
# 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 r3338
+%define git_revision r3562
%define go_tool go
%define _name runc
%define project github.com/opencontainers/%{_name}
-# 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: docker-runc
-Version: 1.0.0rc4+git%{git_revision}_%{git_short}
+Name: %{realname}%{name_suffix}
+Version: 1.0.0rc5+git%{git_revision}_%{git_short}
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
-# SUSE-FIX-UPSTREAM: Backport of
https://github.com/opencontainers/runc/pull/1555. bsc#1053532
-Patch100: bsc1053532-0001-makefile-drop-usage-of-install.patch
-# SUSE-FIX-UPSTREAM: Backport of
https://github.com/opencontainers/runc/pull/1698. bsc#1094680
-Patch101: bsc1094680-0001-Avoid-race-when-opening-exec-fifo.patch
+Source: %{realname}-git.%{git_version}.tar.xz
BuildRequires: fdupes
BuildRequires: go-go-md2man
BuildRequires: libapparmor-devel
-BuildRequires: golang(API) = 1.7
-%if 0%{?with_libseccomp}
-BuildRequires: libseccomp-devel
-%endif
+BuildRequires: libseccomp-devel >= 2.2
BuildRequires: libselinux-devel
+BuildRequires: golang(API) = 1.10
Recommends: criu
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: runc <= 1.0
# We provide a git revision so that Docker can require it properly.
Provides: %{name}-git = %{git_version}
ExcludeArch: s390
+# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
+# packaging, when everything was renamed to -kubic. It also is
+# used to ensure that nothing complains too much when using
+# -kubic packages. Hopfully it can be removed one day.
+%if "%flavour" == "kubic"
+# Obsolete older package without -kubic suffix: v2 -> v3
+Obsoletes: %{_name}_50a19c6
+Obsoletes: %{realname} = 0.1.1+gitr2819_50a19c6
+# Conflict with non-kubic package, and provide equivalent
+Conflicts: %{realname}
+Provides: %{realname} = %{version}
+%endif
%description
runc is a CLI tool for spawning and running containers according to the OCI
@@ -80,26 +83,31 @@
%package test
Summary: Test package for runc
Group: System/Management
-BuildRequires: golang(API) = 1.7
+BuildRequires: golang(API) = 1.10
Requires: go-go-md2man
Requires: libapparmor-devel
-%if 0%{?with_libseccomp}
-BuildRequires: libseccomp-devel
-%endif
+BuildRequires: libseccomp-devel >= 2.3
Requires: libselinux-devel
Recommends: criu
BuildArch: noarch
Obsoletes: runc-test <= 1.0
+# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
+# packaging, when everything was renamed to -kubic. It also is
+# used to ensure that nothing complains too much when using
+# -kubic packages. Hopfully it can be removed one day.
+%if "%flavour" == "kubic"
+# Obsolete older package without -kubic suffix: v2 -> v3
+Obsoletes: %{realname}-test = 0.1.1+gitr2819_50a19c6
+# Conflict with non-kubic package, and provide equivalent
+Conflicts: %{realname}-test
+Provides: %{realname}-test = %{version}
+%endif
%description test
Test package for runc. It contains the source code and the tests.
%prep
-%setup -q -n %{name}-git.%{git_version}
-# bsc#1053532
-%patch100 -p1
-# bsc#1094680
-%patch101 -p1
+%setup -q -n %{realname}-git.%{git_version}
%build
# Do not use symlinks. If you want to run the unit tests for this package at
@@ -111,15 +119,9 @@
rm -rf $PROJECT/*
cp -av * $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'"
+export BUILDTAGS="apparmor selinux seccomp"
+export BUILDFLAGS="-buildmode=pie -gccgoflags='-Wl,--add-needed
-Wl,--no-as-needed -static-libgo -ldl -lselinux -lapparmor -lseccomp'"
(cat <<EOF
export GOPATH="$GOPATH"
@@ -131,7 +133,7 @@
# Build runc.
make -C $PROJECT EXTRA_FLAGS="-x $BUILDFLAGS" BUILDTAGS="$BUILDTAGS"
COMMIT_NO=%{git_version} runc
-cp $PROJECT/runc %{name}-%{version}
+cp $PROJECT/runc %{realname}-%{version}
# Build man pages, this can only be done on arches where we can build
go-md2man.
man/md2man-all.sh
@@ -147,9 +149,9 @@
source ./.runc_build_env
# Make sure we install in /usr/sbin/docker-runc
-install -D -m755 %{name}-%{version} %{buildroot}%{_sbindir}/%{name}
-install -d -m755 %{buildroot}/usr/src/%{name}/
-cp -av $HOME/go/src/%{project}/* %{buildroot}/usr/src/%{name}/
+install -D -m755 %{realname}-%{version} %{buildroot}%{_sbindir}/%{realname}
+install -d -m755 %{buildroot}/usr/src/%{realname}/
+cp -av $HOME/go/src/%{project}/* %{buildroot}/usr/src/%{realname}/
rm -rf %{buildroot}/usr/src/docker-runc/runc
# We have to rename the man pages to docker-runc.
++++++ _multibuild ++++++
<multibuild>
<package>kubic</package>
</multibuild>
++++++ _service ++++++
--- /var/tmp/diff_new_pack.R98SuH/_old 2018-09-05 13:45:55.053992550 +0200
+++ /var/tmp/diff_new_pack.R98SuH/_new 2018-09-05 13:45:55.053992550 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="filename">docker-runc</param>
<param name="versionformat">git.%H</param>
- <param name="revision">3f2f8b84a77f73d38244dd690525642a72156c64</param>
+ <param name="revision">69663f0bd4b60df09991c08812a60108003fa340</param>
<param name="exclude">.git</param>
</service>
<service name="recompress" mode="disabled">
++++++ docker-runc-git.3f2f8b84a77f73d38244dd690525642a72156c64.tar.xz ->
docker-runc-git.69663f0bd4b60df09991c08812a60108003fa340.tar.xz ++++++
++++ 47588 lines of diff (skipped)
