Merge branch '3.2' into 3.3

docker/.md5sum

@@ -1,4 +1,5 @@
-2db317ab9811641449784fe0fb29d74f  docker-1.12.6.tar.gz
-e191cd2164f177d4ba850fc6b8580e24  docker-man-pages-1.12.6.tar.xz
+23d3875ac67d5b67dd1918c45ba98537  docker-1.13.0.tar.gz
+718efdb82ac15865f3e9291f86198117  docker-man-pages-1.13.0.tar.xz
 639d3af72199001bb612e545335a67a3  docker.conf
 493cf8e992ad384bc53ba682f88dc654  docker.rc
+c090bba7add57070eebfba7faac324ff  libnetwork-0f53435.tar.xz

docker/Pkgfile

@@ -4,15 +4,16 @@
 # Depends on: containerd runc btrfs-progs cgroupfs-mount
 
 name=docker
-version=1.12.6
+version=1.13.0
 release=1
 source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.gz \
     http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \
+    http://jaeger.morpheus.net/linux/crux/files/libnetwork-0f53435.tar.xz \
     $name.rc $name.conf)
 
 build() {
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT=6b644ec
+    export DOCKER_GITCOMMIT=49bf474
     cd $name-$version
     hack/make.sh dynbinary
 
@@ -20,8 +21,12 @@ build() {
         $PKG/usr/bin/$name
     install -D -m 0755 bundles/$version/dynbinary-daemon/dockerd-$version \
         $PKG/usr/bin/dockerd
-    install -D -m 0755 bundles/$version/dynbinary-daemon/$name-proxy-$version \
-        $PKG/usr/bin/$name-proxy
+    #install -D -m 0755 bundles/$version/dynbinary-daemon/$name-proxy-$version \
+    #  $PKG/usr/bin/$name-proxy
+
+    (cd ..; \
+        GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \
+            libnetwork-0f53435/cmd/proxy)
 
     for M in 1 5 8; do
         install -d -m 0755 $PKG/usr/share/man/man${M}