Accepting request 487318 from home:cyphar:containers

Fix up the ignore cgroupv2 patch so it is easier to track.

OBS-URL: https://build.opensuse.org/request/show/487318
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/runc?expand=0&rev=43

ignore_cgroup2_mountpoint.patch

@@ -1,6 +1,21 @@
-diff --git a/libcontainer/cgroups/utils.go.orig b/libcontainer/cgroups/utils.go
+From e7b57cb042130edf86506d189734018edc3f2c18 Mon Sep 17 00:00:00 2001
-index 8946dd5..c6db003 100644
+From: Mrunal Patel <mrunalp@gmail.com>
---- a/libcontainer/cgroups/utils.go.orig
+Date: Tue, 10 Jan 2017 15:13:28 -0800
+Subject: [PATCH] Ignore cgroup2 mountpoints
+
+Our current cgroup parsing logic assumes cgroup v1 mounts
+so we should ignore cgroup2 mounts for now
+
+Backport: https://github.com/opencontainers/runc/pull/1266
+Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
+Signed-off-by: Aleksa Sarai <asarai@suse.de>
+---
+ libcontainer/cgroups/utils.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
+index 8946dd5959e4..c6db0039e654 100644
+--- a/libcontainer/cgroups/utils.go
 +++ b/libcontainer/cgroups/utils.go
 @@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount,
  		if sepIdx == -1 {
@@ -11,3 +26,6 @@ index 8946dd5..c6db003 100644
  			continue
  		}
  		fields := strings.Split(txt, " ")
+-- 
+2.12.2
+

runc.changes

@@ -1,26 +1,27 @@
 -------------------------------------------------------------------
 Wed Mar 29 15:47:52 UTC 2017 - jmassaguerpla@suse.com
 
-- fix bsc#1028113 - runc: make sure to ignore cgroup v2 mountpoints  
+- fix bsc#1028113 - runc: make sure to ignore cgroup v2 mountpoints
-  ignore_cgroup2_mountpoint.patch: includes this fix
+  This is a backport of https://github.com/opencontainers/runc/pull/1266
+  + ignore_cgroup2_mountpoint.patch
 
 -------------------------------------------------------------------
 Fri Feb 24 18:08:10 UTC 2017 - jmassaguerpla@suse.com
 
-- update to docker-1.13.0 requirement 
+- update to docker-1.13.0 requirement
 
 -------------------------------------------------------------------
 Fri Jan 13 13:58:33 UTC 2017 - jmassaguerpla@suse.com
 
 - fix CVE-2016-9962 bsc#1012568 and applying the patch
   CVE-2016-9962.patch, because 1.12.6 partially fixes it (it contains
-  the first patch attached in bsc#1012568) 
+  the first patch attached in bsc#1012568)
 
 -------------------------------------------------------------------
 Mon Dec 19 12:49:38 UTC 2016 - jmassaguerpla@suse.com
 
 - update runc to the version used in docker 1.12.5 (bsc#1016307).
-  This fixes bsc#1015661 
+  This fixes bsc#1015661
 
 -------------------------------------------------------------------
 Mon Dec 19 12:17:07 UTC 2016 - asarai@suse.com