[arch-commits] Commit in docker/trunk (3 files)

[Sébastien Luttringer]

    Date: Friday, February 5, 2016 @ 21:14:53
  Author: seblu
Revision: 160427

upgpkg: docker 1:1.10.0-3

Modified:
  docker/trunk/PKGBUILD
Deleted:
  docker/trunk/01-golang15.patch
  docker/trunk/02-fix-unified-cgroup.patch

-----------------------------+
 01-golang15.patch           |   87 ------------------------------------------
 02-fix-unified-cgroup.patch |   13 ------
 PKGBUILD                    |    8 +--
 3 files changed, 3 insertions(+), 105 deletions(-)

Deleted: 01-golang15.patch
===================================================================
--- 01-golang15.patch	2016-02-05 19:51:21 UTC (rev 160426)
+++ 01-golang15.patch	2016-02-05 20:14:53 UTC (rev 160427)
@@ -1,87 +0,0 @@
-From 0a426878b52e9eaa243df117ece0608804c28d29 Mon Sep 17 00:00:00 2001
-From: Vincent Batts <vbatts at redhat.com>
-Date: Fri, 7 Aug 2015 10:18:20 -0400
-Subject: [PATCH] devicemapper: fix zero-sized field access
-
-Fixes: #15279
-
-Due to
-https://github.com/golang/go/commit/7904946eeb35faece61bbf6f5b3cc8be2f519c17
-the devices field is dropped.
-
-This solution works on go1.4 and go1.5
-
-Signed-off-by: Vincent Batts <vbatts at redhat.com>
-
-Vincent Batts <vbatts at redhat.com>
----
- daemon/graphdriver/devmapper/deviceset.go | 14 +++++++++-----
- pkg/devicemapper/devmapper_wrapper.go     | 18 +++++++++++++++---
- 2 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
-index 3c90fed..e3106fc 100644
---- a/daemon/graphdriver/devmapper/deviceset.go
-+++ b/daemon/graphdriver/devmapper/deviceset.go
-@@ -1485,12 +1485,16 @@ func (devices *DeviceSet) deactivatePool() error {
- 	if err != nil {
- 		return err
- 	}
--	if d, err := devicemapper.GetDeps(devname); err == nil {
--		// Access to more Debug output
--		logrus.Debugf("[devmapper] devicemapper.GetDeps() %s: %#v", devname, d)
-+
-+	if devinfo.Exists == 0 {
-+		return nil
- 	}
--	if devinfo.Exists != 0 {
--		return devicemapper.RemoveDevice(devname)
-+	if err := devicemapper.RemoveDevice(devname); err != nil {
-+		return err
-+	}
-+
-+	if d, err := devicemapper.GetDeps(devname); err == nil {
-+		logrus.Warnf("[devmapper] device %s still has %d active dependents", devname, d.Count)
- 	}
- 
- 	return nil
-diff --git a/pkg/devicemapper/devmapper_wrapper.go b/pkg/devicemapper/devmapper_wrapper.go
-index 87c2003..44ca772 100644
---- a/pkg/devicemapper/devmapper_wrapper.go
-+++ b/pkg/devicemapper/devmapper_wrapper.go
-@@ -38,7 +38,10 @@ static void	log_with_errno_init()
- */
- import "C"
- 
--import "unsafe"
-+import (
-+	"reflect"
-+	"unsafe"
-+)
- 
- type (
- 	CDmTask C.struct_dm_task
-@@ -184,12 +187,21 @@ func dmTaskGetDepsFct(task *CDmTask) *Deps {
- 	if Cdeps == nil {
- 		return nil
- 	}
-+
-+	// golang issue: https://github.com/golang/go/issues/11925
-+	hdr := reflect.SliceHeader{
-+		Data: uintptr(unsafe.Pointer(uintptr(unsafe.Pointer(Cdeps)) + unsafe.Sizeof(*Cdeps))),
-+		Len:  int(Cdeps.count),
-+		Cap:  int(Cdeps.count),
-+	}
-+	devices := *(*[]C.uint64_t)(unsafe.Pointer(&hdr))
-+
- 	deps := &Deps{
- 		Count:  uint32(Cdeps.count),
- 		Filler: uint32(Cdeps.filler),
- 	}
--	for _, device := range Cdeps.device {
--		deps.Device = append(deps.Device, (uint64)(device))
-+	for _, device := range devices {
-+		deps.Device = append(deps.Device, uint64(device))
- 	}
- 	return deps
- }

Deleted: 02-fix-unified-cgroup.patch
===================================================================
--- 02-fix-unified-cgroup.patch	2016-02-05 19:51:21 UTC (rev 160426)
+++ 02-fix-unified-cgroup.patch	2016-02-05 20:14:53 UTC (rev 160427)
@@ -1,13 +0,0 @@
-diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
-index f09c2d3..ab5bc8f 100644
---- a/contrib/init/systemd/docker.service
-+++ b/contrib/init/systemd/docker.service
-@@ -6,7 +6,7 @@ Requires=docker.socket
- 
- [Service]
- Type=notify
--ExecStart=/usr/bin/docker daemon -H fd://
-+ExecStart=/usr/bin/docker daemon -H fd:// --exec-opt native.cgroupdriver=cgroupfs
- MountFlags=slave
- LimitNOFILE=1048576
- LimitNPROC=1048576

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-05 19:51:21 UTC (rev 160426)
+++ PKGBUILD	2016-02-05 20:14:53 UTC (rev 160427)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=1.10.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -17,11 +17,9 @@
 options=('!strip')
 install=$pkgname.install
 source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
-        "$pkgname.sysusers"
-        '02-fix-unified-cgroup.patch')
+        "$pkgname.sysusers")
 md5sums=('SKIP'
-         '8cf9900ebada61f352a03465a088da34'
-         '7fd0504057a60e1275b8ce3e06d53c53')
+         '8cf9900ebada61f352a03465a088da34')
 
 prepare() {
   for _f in "${source[@]}"; do