From 4a6d3faa77b882e6f7891efa6e165a3b550082fe Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 12 May 2015 07:56:14 +0000
Subject: main/docker: upgrade to 1.6.1

---
 main/docker/APKBUILD                            | 20 ++++++++------------
 main/docker/docker-1.5.0-include-sys-stat.patch | 12 ------------
 2 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 main/docker/docker-1.5.0-include-sys-stat.patch

(limited to 'main/docker')

diff --git a/main/docker/APKBUILD b/main/docker/APKBUILD
index 826ec16336..99350525b6 100644
--- a/main/docker/APKBUILD
+++ b/main/docker/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eivind Uggedal <eivind@uggedal.com>
 pkgname=docker
-pkgver=1.5.0
-pkgrel=1
+pkgver=1.6.1
+pkgrel=0
 _gitcommit=a8a31ef
 pkgdesc="Pack, ship and run any application as a lightweight container"
 url="http://www.docker.io/"
@@ -19,7 +19,6 @@ subpackages="
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/docker/docker/archive/v$pkgver.tar.gz
 	openrc-fixes.patch
-	docker-1.5.0-include-sys-stat.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -86,12 +85,9 @@ vim() {
 	done
 }
 
-md5sums="a622207cd9eb21d95333501d2495ef5d  docker-1.5.0.tar.gz
-2c31dfb597ded751e566602611ddb6ae  openrc-fixes.patch
-62e02c0e0eb9727e198381a0a8de0763  docker-1.5.0-include-sys-stat.patch"
-sha256sums="cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48  docker-1.5.0.tar.gz
-ae9c3c780ef5e9ffb5666cbe343b0ecb9f498f1ab5d68373b39eea76b68a0f7c  openrc-fixes.patch
-448d4818c455e1223cc5c4ce4f6ef9a892ee6fbb4b56be2947f8d1ac7b13b329  docker-1.5.0-include-sys-stat.patch"
-sha512sums="cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9  docker-1.5.0.tar.gz
-79e78eed7eb1bfc468103fd4b171f66eabbffd3e504bfe1b8bdb40441292f316f6584fae415b93f0630d6975f888f1db4fb702886e78b6adc3a9a156a80de9b3  openrc-fixes.patch
-e1cf20314518269323b9808e65877f86be5def0366a390576eca1364de118d1dcea07878eee39ab98a2785baac3abc3619c40566c43662bd421492202294ea36  docker-1.5.0-include-sys-stat.patch"
+md5sums="acce0f944e907c248019fbbc6fda0f10  docker-1.6.1.tar.gz
+2c31dfb597ded751e566602611ddb6ae  openrc-fixes.patch"
+sha256sums="aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e  docker-1.6.1.tar.gz
+ae9c3c780ef5e9ffb5666cbe343b0ecb9f498f1ab5d68373b39eea76b68a0f7c  openrc-fixes.patch"
+sha512sums="d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2  docker-1.6.1.tar.gz
+79e78eed7eb1bfc468103fd4b171f66eabbffd3e504bfe1b8bdb40441292f316f6584fae415b93f0630d6975f888f1db4fb702886e78b6adc3a9a156a80de9b3  openrc-fixes.patch"
diff --git a/main/docker/docker-1.5.0-include-sys-stat.patch b/main/docker/docker-1.5.0-include-sys-stat.patch
deleted file mode 100644
index 156b0310d4..0000000000
--- a/main/docker/docker-1.5.0-include-sys-stat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vendor/src/github.com/docker/libcontainer/namespaces/nsenter/nsenter.c b/vendor/src/github.com/docker/libcontainer/namespaces/nsenter/nsenter.c
-index 4ab2177..b267858 100644
---- a/vendor/src/github.com/docker/libcontainer/namespaces/nsenter/nsenter.c
-+++ b/vendor/src/github.com/docker/libcontainer/namespaces/nsenter/nsenter.c
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/prctl.h>
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <getopt.h>
-- 
cgit v1.2.3